0.12.0

* Now we can handle long file names

* Refactored code a bit

.gitattributes

@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# need original files to be windows
+test/TestArchives/Original/*.txt eol=crlf

.gitignore

@@ -9,3 +9,6 @@ TestArchives/Scratch2/
 TestResults/
 *.nupkg
 packages/*/
+project.lock.json
+test/TestArchives/Scratch
+.vs

NuGet/sharpcompress.nuspec

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>sharpcompress</id>
-        <version>0.11.2</version>
-        <title>SharpCompress - Pure C# Decompression/Compression</title>
-        <authors>Adam Hathcock</authors>
-        <owners>Adam Hathcock</owners>
-        <licenseUrl>https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt</licenseUrl>
-        <projectUrl>https://github.com/adamhathcock/sharpcompress</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>SharpCompress is a compression library for .NET/Mono/Silverlight/WP7/WindowsStore that can unrar, decompress 7zip, zip/unzip, tar/untar bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</description>
-        <releaseNotes />
-        <language>en-US</language>
-        <tags>rar unrar zip unzip bzip2 gzip tar 7zip</tags>
-        <dependencies>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="..\bin\Full\SharpCompress.dll" target="lib\net40\SharpCompress.dll" />
-        <file src="..\bin\WindowsStore\SharpCompress.dll" target="lib\netcore45\SharpCompress.dll" />
-        <file src="..\bin\Portable\SharpCompress.dll" target="lib\portable-net4+sl5+wp8+win8\SharpCompress.dll" />
-    </files>
-</package>

README.md

@@ -1,62 +1,93 @@
-SharpCompress
-=============
-
-Github mirror of http://sharpcompress.codeplex.com
+# SharpCompress
 
 SharpCompress is a compression library for .NET/Mono/Silverlight/WP7 that can unrar, un7zip, unzip, untar unbzip2 and ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip are implemented.
 
 The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream). 
 
-A Simple Request
+## Need Help?
+Post Issues on Github!
+
+Check the [Supported Formats](https://github.com/adamhathcock/sharpcompress/wiki/Supported-Formats) and [basic samples.](https://github.com/adamhathcock/sharpcompress/wiki/API-Examples)
+
+## A Simple Request
 
 Hi everyone. I hope you're using SharpCompress and finding it useful. Please give me feedback on what you'd like to see changed especially as far as usability goes. New feature suggestions are always welcome as well. I would also like to know what projects SharpCompress is being used in. I like seeing how it is used to give me ideas for future versions. Thanks!
 
-Want to contribute?
+Please do not email me directly to ask for help.  If you think there is a real issue, please report it here.
+
+## Want to contribute?
 
 I'm always looking for help or ideas. Please submit code or email with ideas. Unfortunately, just letting me know you'd like to help is not enough because I really have no overall plan of what needs to be done. I'll definitely accept code submissions and add you as a member of the project!
 
-TODOs (always lots):
+## TODOs (always lots)
+
 * RAR 5 support
 * 7Zip writing
 * Zip64
 * Multi-volume Zip support.
 
-Version 0.11.1:
-==============
-- Added Cancel on IReader
-- Removed .NET 2.0 support and LinqBridge dependency
+## In-Progress
 
-Version 0.11:
-==============
-- Been over a year, contains mainly fixes from contributors!  
-- Possible breaking change: ArchiveEncoding is UTF8 by default now.
-- TAR supports writing long names using longlink
-- RAR Protect Header added
+* RAR5 support
+* DNX/NET Core support
+* xproj targeting
 
-Version 0.10.3:
-==============
-- Finally fixed Disposal issue when creating a new archive with the Archive API
+## Version Log
 
-Version 0.10.2:
-==============
-- Fixed Rar Header reading for invalid extended time headers.
-- Windows Store assembly is now strong named
-- Known issues with Long Tar names being worked on
-- Updated to VS2013
-	- Portable targets SL5 and Windows Phone 8 (up from SL4 and WP7)
+### Version 0.12.0
+* .NET Core RTM!
+* Bug fix for Tar long paths
 
-Version 0.10.1:
-==============
-- Fixed 7Zip extraction performance problem
+### Version 0.11.6
 
-Version 0.10:
-==============
-- Added support for RAR Decryption (thanks to https://github.com/hrasyid)
-- Embedded some BouncyCastle crypto classes to allow RAR Decryption and Winzip AES Decryption in Portable and Windows Store DLLs
-- Built in Release (I think)
+* Bug fix for global header in Tar
+* Writers now have a leaveOpen `bool` overload.  They won't close streams if not-requested to.
 
-Some Help/Discussion:
-https://sharpcompress.codeplex.com/discussions
+### Version 0.11.5
+
+* Bug fix in Skip method
+
+### Version 0.11.4
+
+* SharpCompress is now endian neutral (matters for Mono platforms)
+* Fix for Inflate (need to change implementation)
+* Fixes for RAR detection
+
+### Version 0.11.1
+
+* Added Cancel on IReader
+* Removed .NET 2.0 support and LinqBridge dependency
+
+### Version 0.11
+
+* Been over a year, contains mainly fixes from contributors!  
+* Possible breaking change: ArchiveEncoding is UTF8 by default now.
+* TAR supports writing long names using longlink
+* RAR Protect Header added
+
+### Version 0.10.3
+
+* Finally fixed Disposal issue when creating a new archive with the Archive API
+
+### Version 0.10.2
+
+* Fixed Rar Header reading for invalid extended time headers.
+* Windows Store assembly is now strong named
+* Known issues with Long Tar names being worked on
+* Updated to VS2013
+* Portable targets SL5 and Windows Phone 8 (up from SL4 and WP7)
+
+### Version 0.10.1
+
+* Fixed 7Zip extraction performance problem
+
+### Version 0.10:
+
+* Added support for RAR Decryption (thanks to https://github.com/hrasyid)
+* Embedded some BouncyCastle crypto classes to allow RAR Decryption and Winzip AES Decryption in Portable and Windows Store DLLs
+* Built in Release (I think)
+
+Some Help/Discussion: https://sharpcompress.codeplex.com/discussions
 
 7Zip implementation based on: https://code.google.com/p/managed-lzma/
 

SharpCompress.Test/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SharpCompress.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("SharpCompress.Test")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f01fddfb-445f-4548-9f69-88b69a8b71b0")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

SharpCompress.Test/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace SharpCompress.Test.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SharpCompress.Test.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

SharpCompress.Test/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SharpCompress.Test/Properties/Settings.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace SharpCompress.Test.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

SharpCompress.Test/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

SharpCompress.Test/RewindableStreamTest.cs

@@ -1,84 +0,0 @@
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SharpCompress.IO;
-
-namespace SharpCompress.Test
-{
-    [TestClass]
-    public class RewindableStreamTest
-    {
-        [TestMethod]
-        public void TestRewind()
-        {
-            MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
-            bw.Write(1);
-            bw.Write(2);
-            bw.Write(3);
-            bw.Write(4);
-            bw.Write(5);
-            bw.Write(6);
-            bw.Write(7);
-            bw.Flush();
-            ms.Position = 0;
-            RewindableStream stream = new RewindableStream(ms);
-            stream.StartRecording();
-            BinaryReader br = new BinaryReader(stream);
-            Assert.AreEqual(br.ReadInt32(), 1);
-            Assert.AreEqual(br.ReadInt32(), 2);
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-            stream.Rewind(true);
-            stream.StartRecording();
-            Assert.AreEqual(br.ReadInt32(), 1);
-            Assert.AreEqual(br.ReadInt32(), 2);
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-            Assert.AreEqual(br.ReadInt32(), 5);
-            Assert.AreEqual(br.ReadInt32(), 6);
-            Assert.AreEqual(br.ReadInt32(), 7);
-            stream.Rewind(true);
-            stream.StartRecording();
-            Assert.AreEqual(br.ReadInt32(), 1);
-            Assert.AreEqual(br.ReadInt32(), 2);
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-        }
-
-        [TestMethod]
-        public void TestIncompleteRewind()
-        {
-            MemoryStream ms = new MemoryStream();
-            BinaryWriter bw = new BinaryWriter(ms);
-            bw.Write(1);
-            bw.Write(2);
-            bw.Write(3);
-            bw.Write(4);
-            bw.Write(5);
-            bw.Write(6);
-            bw.Write(7);
-            bw.Flush();
-            ms.Position = 0;
-            RewindableStream stream = new RewindableStream(ms);
-            stream.StartRecording();
-            BinaryReader br = new BinaryReader(stream);
-            Assert.AreEqual(br.ReadInt32(), 1);
-            Assert.AreEqual(br.ReadInt32(), 2);
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-            stream.Rewind(true);
-            Assert.AreEqual(br.ReadInt32(), 1);
-            Assert.AreEqual(br.ReadInt32(), 2);
-            stream.StartRecording();
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-            Assert.AreEqual(br.ReadInt32(), 5);
-            stream.Rewind(true);
-            Assert.AreEqual(br.ReadInt32(), 3);
-            Assert.AreEqual(br.ReadInt32(), 4);
-            Assert.AreEqual(br.ReadInt32(), 5);
-            Assert.AreEqual(br.ReadInt32(), 6);
-            Assert.AreEqual(br.ReadInt32(), 7);
-        }
-    }
-}

SharpCompress.Test/SharpCompress.Test.Portable.csproj

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E9C3C94B-FB27-4B4F-B225-57513C254D37}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress.Test</RootNamespace>
-    <AssemblyName>SharpCompress.Test.Portable</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\DebugPortable\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\SharpCompress\SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ArchiveTests.cs" />
-    <Compile Include="GZip\GZipWriterTests.cs" />
-    <Compile Include="GZip\GZipArchiveTests.cs" />
-    <Compile Include="Rar\RarHeaderFactoryTest.cs" />
-    <Compile Include="SevenZip\SevenZipArchiveTests.cs" />
-    <Compile Include="Streams\StreamTests.cs" />
-    <Compile Include="Tar\TarWriterTests.cs" />
-    <Compile Include="Tar\TarReaderTests.cs" />
-    <Compile Include="Zip\ZipWriterTests.cs" />
-    <Compile Include="WriterTests.cs" />
-    <Compile Include="Rar\RarReaderTests.cs" />
-    <Compile Include="ReaderTests.cs" />
-    <Compile Include="Tar\TarArchiveTests.cs" />
-    <Compile Include="Zip\ZipArchiveTests.cs" />
-    <Compile Include="Rar\RarArchiveTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RewindableStreamTest.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="TestStream.cs" />
-    <Compile Include="Zip\ZipReaderTests.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="..\SharpCompress\SharpCompress.pfx">
-      <Link>SharpCompress.pfx</Link>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SharpCompress\SharpCompress.PortableTest.csproj">
-      <Project>{efdcaf57-fd4d-4e5d-a3d5-f26b875817ed}</Project>
-      <Name>SharpCompress.PortableTest</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress.Test/SharpCompress.Test.csproj

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress.Test</RootNamespace>
-    <AssemblyName>SharpCompress.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\SharpCompress\SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ArchiveTests.cs" />
-    <Compile Include="GZip\GZipWriterTests.cs" />
-    <Compile Include="GZip\GZipArchiveTests.cs" />
-    <Compile Include="Rar\RarHeaderFactoryTest.cs" />
-    <Compile Include="SevenZip\SevenZipArchiveTests.cs" />
-    <Compile Include="Streams\StreamTests.cs" />
-    <Compile Include="Tar\TarWriterTests.cs" />
-    <Compile Include="Tar\TarReaderTests.cs" />
-    <Compile Include="Zip\ZipWriterTests.cs" />
-    <Compile Include="WriterTests.cs" />
-    <Compile Include="Rar\RarReaderTests.cs" />
-    <Compile Include="ReaderTests.cs" />
-    <Compile Include="Tar\TarArchiveTests.cs" />
-    <Compile Include="Zip\ZipArchiveTests.cs" />
-    <Compile Include="Rar\RarArchiveTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RewindableStreamTest.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="TestStream.cs" />
-    <Compile Include="Zip\ZipReaderTests.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="..\SharpCompress\SharpCompress.pfx">
-      <Link>SharpCompress.pfx</Link>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SharpCompress\SharpCompress.Unsigned.csproj">
-      <Project>{27d535cb-2fd3-4621-8c9a-46161fc77a5d}</Project>
-      <Name>SharpCompress.Unsigned</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress.shfbproj

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <!-- The configuration and platform will be used to determine which
-         assemblies to include from solution and project documentation
-         sources -->
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{a226cac9-f2c4-4cc2-94f9-163b3e221817}</ProjectGuid>
-    <SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
-    <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
-         Studio adds them anyway -->
-    <AssemblyName>Documentation</AssemblyName>
-    <RootNamespace>Documentation</RootNamespace>
-    <Name>Documentation</Name>
-    <!-- SHFB properties -->
-    <OutputPath>.\Help\</OutputPath>
-    <HtmlHelpName>sharpcompress</HtmlHelpName>
-    <Language>en-US</Language>
-    <RootNamespaceTitle>SharpCompress</RootNamespaceTitle>
-    <SandcastlePath>..\..\Program Files (x86)\Sandcastle\</SandcastlePath>
-    <DocumentationSources>
-      <DocumentationSource sourceFile="bin\SharpCompress.dll" />
-      <DocumentationSource sourceFile="bin\SharpCompress.xml" />
-    </DocumentationSources>
-    <HelpTitle>SharpCompress</HelpTitle>
-    <PresentationStyle>Prototype</PresentationStyle>
-    <HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
-    <MissingTags>AutoDocumentCtors, AutoDocumentDispose</MissingTags>
-  </PropertyGroup>
-  <!-- There are no properties for these groups.  AnyCPU needs to appear in
-       order for Visual Studio to perform the build.  The others are optional
-       common platform types that may appear. -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
-  </PropertyGroup>
-  <!-- Import the SHFB build targets -->
-  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>

SharpCompress.sln

@@ -1,28 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
 	ProjectSection(SolutionItems) = preProject
-		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
+		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "SharpCompress\SharpCompress.csproj", "{10A689CF-76A2-4A4F-96E4-553C33398438}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SharpCompress", "src\SharpCompress\SharpCompress.xproj", "{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test", "SharpCompress.Test\SharpCompress.Test.csproj", "{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C5BE746-03E5-4895-9988-0B57F162F86C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Portable", "SharpCompress\SharpCompress.Portable.csproj", "{7FA7D133-1417-4F85-9998-4C618AC8FEDA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0F0901FF-E8D9-426A-B5A2-17C7F47C1529}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.WindowsStore", "SharpCompress\SharpCompress.WindowsStore.csproj", "{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.PortableTest", "SharpCompress\SharpCompress.PortableTest.csproj", "{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test.Portable", "SharpCompress.Test\SharpCompress.Test.Portable.csproj", "{E9C3C94B-FB27-4B4F-B225-57513C254D37}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Unsigned", "SharpCompress\SharpCompress.Unsigned.csproj", "{27D535CB-2FD3-4621-8C9A-46161FC77A5D}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SharpCompress.Test", "test\SharpCompress.Test\SharpCompress.Test.xproj", "{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998} = {FD19DDD8-72B2-4024-8665-0D1F7A2AA998}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,42 +25,20 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
+		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998} = {3C5BE746-03E5-4895-9988-0B57F162F86C}
+		{3B80E585-A2F3-4666-8F69-C7FFDA0DD7E5} = {0F0901FF-E8D9-426A-B5A2-17C7F47C1529}
 	EndGlobalSection
 EndGlobal

SharpCompress/Common/Rar/Headers/MarkHeader.cs

@@ -1,59 +0,0 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class MarkHeader : RarHeader
-    {
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-        }
-
-        internal bool IsValid()
-        {
-            if (!(HeadCRC == 0x6152))
-            {
-                return false;
-            }
-            if (!(HeaderType == HeaderType.MarkHeader))
-            {
-                return false;
-            }
-            if (!(Flags == 0x1a21))
-            {
-                return false;
-            }
-            if (!(HeaderSize == BaseBlockSize))
-            {
-                return false;
-            }
-            return true;
-        }
-
-        internal bool IsSignature()
-        {
-            bool valid = false;
-            /*byte[] d = new byte[BaseBlock.BaseBlockSize];
-                BinaryWriter writer = new BinaryWriter();
-                writer.Write(HeadCRC);
-                writer.Write((byte)HeaderType);
-                writer.Write(flags);
-                writer.Write(HeaderSize);
-                writer.Flush
-        
-            if (d[0] == 0x52) {
-                if (d[1]==0x45 && d[2]==0x7e && d[3]==0x5e) {
-                    oldFormat=true;
-                    valid=true;
-                }
-                else if (d[1]==0x61 && d[2]==0x72 && d[3]==0x21 && d[4]==0x1a &&
-                        d[5]==0x07 && d[6]==0x00) {
-                    oldFormat=false;
-                    valid=true;
-                }
-            }*/
-            return valid;
-        }
-
-        internal bool OldFormat { get; private set; }
-    }
-}

SharpCompress/Common/Rar/RarRijndael.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarRijndael : IDisposable
-    {
-        internal const int CRYPTO_BLOCK_SIZE = 16;
-        private readonly string password;
-        private readonly byte[] salt;
-        private byte[] aesInitializationVector;
-        private Rijndael rijndael;
-
-        private RarRijndael(string password, byte[] salt)
-        {
-            this.password = password;
-            this.salt = salt;
-        }
-
-        private void Initialize()
-        {
-
-            rijndael = new RijndaelManaged() { Padding = PaddingMode.None };
-            aesInitializationVector = new byte[CRYPTO_BLOCK_SIZE];
-            int rawLength = 2 * password.Length;
-            byte[] rawPassword = new byte[rawLength + 8];
-            byte[] passwordBytes = Encoding.Unicode.GetBytes(password);
-            for (int i = 0; i < rawLength; i++)
-            {
-                rawPassword[i] = passwordBytes[i];
-            }
-            for (int i = 0; i < salt.Length; i++)
-            {
-                rawPassword[i + rawLength] = salt[i];
-            }
-
-            SHA1 sha = new SHA1CryptoServiceProvider();
-
-            const int noOfRounds = (1 << 18);
-            IList<byte> bytes = new List<byte>();
-            byte[] digest;
-
-            //TODO slow code below, find ways to optimize
-            for (int i = 0; i < noOfRounds; i++)
-            {
-                bytes.AddRange(rawPassword);
-
-                bytes.AddRange(new[] { (byte)i, (byte)(i >> 8), (byte)(i >> CRYPTO_BLOCK_SIZE) });
-                if (i % (noOfRounds / CRYPTO_BLOCK_SIZE) == 0)
-                {
-                    digest = sha.ComputeHash(bytes.ToArray());
-                    aesInitializationVector[i / (noOfRounds / CRYPTO_BLOCK_SIZE)] = digest[19];
-                }
-            }
-
-            digest = sha.ComputeHash(bytes.ToArray());
-            //slow code ends
-
-            byte[] aesKey = new byte[CRYPTO_BLOCK_SIZE];
-            for (int i = 0; i < 4; i++)
-                for (int j = 0; j < 4; j++)
-                    aesKey[i * 4 + j] = (byte)
-                        (((digest[i * 4] * 0x1000000) & 0xff000000 |
-                        (uint)((digest[i * 4 + 1] * 0x10000) & 0xff0000) |
-                          (uint)((digest[i * 4 + 2] * 0x100) & 0xff00) |
-                          (uint)(digest[i * 4 + 3] & 0xff)) >> (j * 8));
-
-            rijndael.IV = new byte[CRYPTO_BLOCK_SIZE];
-            rijndael.Key = aesKey;
-            rijndael.BlockSize = CRYPTO_BLOCK_SIZE * 8;
-
-        }
-
-        public static RarRijndael InitializeFrom(string password, byte[] salt)
-        {
-            var rijndael = new RarRijndael(password, salt);
-            rijndael.Initialize();
-            return rijndael;
-        }
-
-        public byte[] ProcessBlock(byte[] cipherText)
-        {
-            var plainText = new byte[CRYPTO_BLOCK_SIZE];
-            var decryptedBytes = new List<byte>();
-            var decryptor = rijndael.CreateDecryptor();
-            using (var msDecrypt = new MemoryStream(cipherText))
-            {
-                using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
-                {
-                    csDecrypt.ReadFully(plainText);
-                }
-            }
-
-            for (int j = 0; j < plainText.Length; j++)
-                decryptedBytes.Add((byte)(plainText[j] ^ aesInitializationVector[j % 16])); //32:114, 33:101
-
-            for (int j = 0; j < aesInitializationVector.Length; j++)
-                aesInitializationVector[j] = cipherText[j];
-            return decryptedBytes.ToArray();
-        }
-
-        public void Dispose()
-        {
-            ((IDisposable)rijndael).Dispose();
-        }
-    }
-}

SharpCompress/Common/Zip/WinzipAesCryptoStream.Portable.cs

@@ -1,170 +0,0 @@
-using System;
-using System.IO;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class WinzipAesCryptoStream : Stream
-    {
-        private const int BLOCK_SIZE_IN_BYTES = 16;
-        private readonly IBufferedCipher rijndael;
-        private readonly byte[] counter = new byte[BLOCK_SIZE_IN_BYTES];
-        private readonly Stream stream;
-        private int nonce = 1;
-        private byte[] counterOut = new byte[BLOCK_SIZE_IN_BYTES];
-        private bool isFinalBlock;
-        private long totalBytesLeftToRead;
-        private bool isDisposed;
-
-        internal WinzipAesCryptoStream(Stream stream, WinzipAesEncryptionData winzipAesEncryptionData, long length)
-        {
-            this.stream = stream;
-            totalBytesLeftToRead = length;
-
-            rijndael = CreateRijndael(winzipAesEncryptionData);
-        }
-
-        private IBufferedCipher CreateRijndael(WinzipAesEncryptionData winzipAesEncryptionData)
-        {
-            var blockCipher = new BufferedBlockCipher(new RijndaelEngine());
-            var param = new KeyParameter(winzipAesEncryptionData.KeyBytes);
-            blockCipher.Init(true, param);
-            return blockCipher;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new NotImplementedException(); }
-            set { throw new NotImplementedException(); }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            if (disposing)
-            {
-                //read out last 10 auth bytes
-                var ten = new byte[10];
-                stream.Read(ten, 0, 10);
-                stream.Dispose();
-            }
-        }
-
-        public override void Flush()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (totalBytesLeftToRead == 0)
-            {
-                return 0;
-            }
-            int bytesToRead = count;
-            if (count > totalBytesLeftToRead)
-            {
-                bytesToRead = (int)totalBytesLeftToRead;
-            }
-            int read = stream.Read(buffer, offset, bytesToRead);
-            totalBytesLeftToRead -= read;
-
-            ReadTransformBlocks(buffer, offset, read);
-
-            return read;
-        }
-
-        private int ReadTransformOneBlock(byte[] buffer, int offset, int last)
-        {
-            if (isFinalBlock)
-            {
-                throw new InvalidOperationException();
-            }
-
-            int bytesRemaining = last - offset;
-            int bytesToRead = (bytesRemaining > BLOCK_SIZE_IN_BYTES)
-                                  ? BLOCK_SIZE_IN_BYTES
-                                  : bytesRemaining;
-
-            // update the counter
-            Array.Copy(BitConverter.GetBytes(nonce++), 0, counter, 0, 4);
-
-            // Determine if this is the final block
-            if ((bytesToRead == bytesRemaining) && (totalBytesLeftToRead == 0))
-            {
-                counterOut = rijndael.DoFinal(counter, 0, BLOCK_SIZE_IN_BYTES);
-
-                isFinalBlock = true;
-            }
-            else
-            {
-                rijndael.ProcessBytes(counter, 0, BLOCK_SIZE_IN_BYTES, counterOut, 0);
-            }
-            XorInPlace(buffer, offset, bytesToRead);
-            return bytesToRead;
-        }
-
-
-        private void XorInPlace(byte[] buffer, int offset, int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                buffer[offset + i] = (byte)(counterOut[i] ^ buffer[offset + i]);
-            }
-        }
-
-        private void ReadTransformBlocks(byte[] buffer, int offset, int count)
-        {
-            int posn = offset;
-            int last = count + offset;
-
-            while (posn < buffer.Length && posn < last)
-            {
-                int n = ReadTransformOneBlock(buffer, posn, last);
-                posn += n;
-            }
-        }
-
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

SharpCompress/Common/Zip/WinzipAesEncryptionData.Portable.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Text;
-using SharpCompress.Crypto;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class WinzipAesEncryptionData
-    {
-        private const int RFC2898_ITERATIONS = 1000;
-
-        private byte[] salt;
-        private WinzipAesKeySize keySize;
-        private byte[] passwordVerifyValue;
-        private string password;
-
-        private byte[] generatedVerifyValue;
-
-        internal WinzipAesEncryptionData(WinzipAesKeySize keySize, byte[] salt, byte[] passwordVerifyValue,
-                                         string password)
-        {
-            this.keySize = keySize;
-            this.salt = salt;
-            this.passwordVerifyValue = passwordVerifyValue;
-            this.password = password;
-            Initialize();
-        }
-
-        internal byte[] IvBytes { get; set; }
-        internal byte[] KeyBytes { get; set; }
-
-        private int KeySizeInBytes
-        {
-            get { return KeyLengthInBytes(keySize); }
-        }
-
-        internal static int KeyLengthInBytes(WinzipAesKeySize keySize)
-        {
-            switch (keySize)
-            {
-                case WinzipAesKeySize.KeySize128:
-                    return 16;
-                case WinzipAesKeySize.KeySize192:
-                    return 24;
-                case WinzipAesKeySize.KeySize256:
-                    return 32;
-            }
-            throw new InvalidOperationException();
-        }
-
-        private void Initialize()
-        {
-            var utf8 = new UTF8Encoding(false);
-            var paramz = new PBKDF2(utf8.GetBytes(password), salt, RFC2898_ITERATIONS);
-            KeyBytes = paramz.GetBytes(KeySizeInBytes);
-            IvBytes = paramz.GetBytes(KeySizeInBytes);
-            generatedVerifyValue = paramz.GetBytes(2);
-
-
-            short verify = BitConverter.ToInt16(passwordVerifyValue, 0);
-            if (password != null)
-            {
-                short generated = BitConverter.ToInt16(generatedVerifyValue, 0);
-                if (verify != generated)
-                    throw new InvalidFormatException("bad password");
-            }
-        }
-    }
-}

SharpCompress/Crypto/BufferedBlockCipher.cs

@@ -1,376 +0,0 @@
-using System;
-
-
-namespace Org.BouncyCastle.Crypto
-{
-    /**
-    * A wrapper class that allows block ciphers to be used to process data in
-    * a piecemeal fashion. The BufferedBlockCipher outputs a block only when the
-    * buffer is full and more data is being added, or on a doFinal.
-    * <p>
-    * Note: in the case where the underlying cipher is either a CFB cipher or an
-    * OFB one the last block may not be a multiple of the block size.
-    * </p>
-    */
-    public class BufferedBlockCipher
-        : BufferedCipherBase
-    {
-        internal byte[] buf;
-        internal int bufOff;
-        internal bool forEncryption;
-        internal IBlockCipher cipher;
-
-        /**
-        * constructor for subclasses
-        */
-        protected BufferedBlockCipher()
-        {
-        }
-
-        /**
-        * Create a buffered block cipher without padding.
-        *
-        * @param cipher the underlying block cipher this buffering object wraps.
-        * false otherwise.
-        */
-        public BufferedBlockCipher(
-            IBlockCipher cipher)
-        {
-            if (cipher == null)
-                throw new ArgumentNullException("cipher");
-
-            this.cipher = cipher;
-            buf = new byte[cipher.GetBlockSize()];
-            bufOff = 0;
-        }
-
-        public override string AlgorithmName
-        {
-            get { return cipher.AlgorithmName; }
-        }
-
-        /**
-        * initialise the cipher.
-        *
-        * @param forEncryption if true the cipher is initialised for
-        *  encryption, if false for decryption.
-        * @param param the key and other data required by the cipher.
-        * @exception ArgumentException if the parameters argument is
-        * inappropriate.
-        */
-        // Note: This doubles as the Init in the event that this cipher is being used as an IWrapper
-        public override void Init(
-            bool forEncryption,
-            ICipherParameters parameters)
-        {
-            this.forEncryption = forEncryption;
-
-            //if (parameters is ParametersWithRandom)
-            //{
-            //    parameters = ((ParametersWithRandom) parameters).Parameters;
-            //}
-
-            Reset();
-
-            cipher.Init(forEncryption, parameters);
-        }
-
-        /**
-        * return the blocksize for the underlying cipher.
-        *
-        * @return the blocksize for the underlying cipher.
-        */
-        public override int GetBlockSize()
-        {
-            return cipher.GetBlockSize();
-        }
-
-        /**
-        * return the size of the output buffer required for an update
-        * an input of len bytes.
-        *
-        * @param len the length of the input.
-        * @return the space required to accommodate a call to update
-        * with len bytes of input.
-        */
-        public override int GetUpdateOutputSize(
-            int length)
-        {
-            int total = length + bufOff;
-            int leftOver = total % buf.Length;
-            return total - leftOver;
-        }
-
-        /**
-        * return the size of the output buffer required for an update plus a
-        * doFinal with an input of len bytes.
-        *
-        * @param len the length of the input.
-        * @return the space required to accommodate a call to update and doFinal
-        * with len bytes of input.
-        */
-        public override int GetOutputSize(
-            int length)
-        {
-            // Note: Can assume IsPartialBlockOkay is true for purposes of this calculation
-            return length + bufOff;
-        }
-
-        /**
-        * process a single byte, producing an output block if neccessary.
-        *
-        * @param in the input byte.
-        * @param out the space for any output that might be produced.
-        * @param outOff the offset from which the output will be copied.
-        * @return the number of output bytes copied to out.
-        * @exception DataLengthException if there isn't enough space in out.
-        * @exception InvalidOperationException if the cipher isn't initialised.
-        */
-        public override int ProcessByte(
-            byte input,
-            byte[] output,
-            int outOff)
-        {
-            buf[bufOff++] = input;
-
-            if (bufOff == buf.Length)
-            {
-                if ((outOff + buf.Length) > output.Length)
-                    throw new DataLengthException("output buffer too short");
-
-                bufOff = 0;
-                return cipher.ProcessBlock(buf, 0, output, outOff);
-            }
-
-            return 0;
-        }
-
-        public override byte[] ProcessByte(
-            byte input)
-        {
-            int outLength = GetUpdateOutputSize(1);
-
-            byte[] outBytes = outLength > 0 ? new byte[outLength] : null;
-
-            int pos = ProcessByte(input, outBytes, 0);
-
-            if (outLength > 0 && pos < outLength)
-            {
-                byte[] tmp = new byte[pos];
-                Array.Copy(outBytes, 0, tmp, 0, pos);
-                outBytes = tmp;
-            }
-
-            return outBytes;
-        }
-
-        public override byte[] ProcessBytes(
-            byte[] input,
-            int inOff,
-            int length)
-        {
-            if (input == null)
-                throw new ArgumentNullException("input");
-            if (length < 1)
-                return null;
-
-            int outLength = GetUpdateOutputSize(length);
-
-            byte[] outBytes = outLength > 0 ? new byte[outLength] : null;
-
-            int pos = ProcessBytes(input, inOff, length, outBytes, 0);
-
-            if (outLength > 0 && pos < outLength)
-            {
-                byte[] tmp = new byte[pos];
-                Array.Copy(outBytes, 0, tmp, 0, pos);
-                outBytes = tmp;
-            }
-
-            return outBytes;
-        }
-
-        /**
-        * process an array of bytes, producing output if necessary.
-        *
-        * @param in the input byte array.
-        * @param inOff the offset at which the input data starts.
-        * @param len the number of bytes to be copied out of the input array.
-        * @param out the space for any output that might be produced.
-        * @param outOff the offset from which the output will be copied.
-        * @return the number of output bytes copied to out.
-        * @exception DataLengthException if there isn't enough space in out.
-        * @exception InvalidOperationException if the cipher isn't initialised.
-        */
-        public override int ProcessBytes(
-            byte[] input,
-            int inOff,
-            int length,
-            byte[] output,
-            int outOff)
-        {
-            if (length < 1)
-            {
-                if (length < 0)
-                    throw new ArgumentException("Can't have a negative input length!");
-
-                return 0;
-            }
-
-            int blockSize = GetBlockSize();
-            int outLength = GetUpdateOutputSize(length);
-
-            if (outLength > 0)
-            {
-                if ((outOff + outLength) > output.Length)
-                {
-                    throw new DataLengthException("output buffer too short");
-                }
-            }
-
-            int resultLen = 0;
-            int gapLen = buf.Length - bufOff;
-            if (length > gapLen)
-            {
-                Array.Copy(input, inOff, buf, bufOff, gapLen);
-                resultLen += cipher.ProcessBlock(buf, 0, output, outOff);
-                bufOff = 0;
-                length -= gapLen;
-                inOff += gapLen;
-                while (length > buf.Length)
-                {
-                    resultLen += cipher.ProcessBlock(input, inOff, output, outOff + resultLen);
-                    length -= blockSize;
-                    inOff += blockSize;
-                }
-            }
-            Array.Copy(input, inOff, buf, bufOff, length);
-            bufOff += length;
-            if (bufOff == buf.Length)
-            {
-                resultLen += cipher.ProcessBlock(buf, 0, output, outOff + resultLen);
-                bufOff = 0;
-            }
-            return resultLen;
-        }
-
-        public override byte[] DoFinal()
-        {
-            byte[] outBytes = EmptyBuffer;
-
-            int length = GetOutputSize(0);
-            if (length > 0)
-            {
-                outBytes = new byte[length];
-
-                int pos = DoFinal(outBytes, 0);
-                if (pos < outBytes.Length)
-                {
-                    byte[] tmp = new byte[pos];
-                    Array.Copy(outBytes, 0, tmp, 0, pos);
-                    outBytes = tmp;
-                }
-            }
-            else
-            {
-                Reset();
-            }
-
-            return outBytes;
-        }
-
-        public override byte[] DoFinal(
-            byte[] input,
-            int inOff,
-            int inLen)
-        {
-            if (input == null)
-                throw new ArgumentNullException("input");
-
-            int length = GetOutputSize(inLen);
-
-            byte[] outBytes = EmptyBuffer;
-
-            if (length > 0)
-            {
-                outBytes = new byte[length];
-
-                int pos = (inLen > 0)
-                    ? ProcessBytes(input, inOff, inLen, outBytes, 0)
-                    : 0;
-
-                pos += DoFinal(outBytes, pos);
-
-                if (pos < outBytes.Length)
-                {
-                    byte[] tmp = new byte[pos];
-                    Array.Copy(outBytes, 0, tmp, 0, pos);
-                    outBytes = tmp;
-                }
-            }
-            else
-            {
-                Reset();
-            }
-
-            return outBytes;
-        }
-
-        /**
-        * Process the last block in the buffer.
-        *
-        * @param out the array the block currently being held is copied into.
-        * @param outOff the offset at which the copying starts.
-        * @return the number of output bytes copied to out.
-        * @exception DataLengthException if there is insufficient space in out for
-        * the output, or the input is not block size aligned and should be.
-        * @exception InvalidOperationException if the underlying cipher is not
-        * initialised.
-        * @exception InvalidCipherTextException if padding is expected and not found.
-        * @exception DataLengthException if the input is not block size
-        * aligned.
-        */
-        public override int DoFinal(
-            byte[] output,
-            int outOff)
-        {
-            try
-            {
-                if (bufOff != 0)
-                {
-                    if (!cipher.IsPartialBlockOkay)
-                    {
-                        throw new DataLengthException("data not block size aligned");
-                    }
-
-                    if (outOff + bufOff > output.Length)
-                    {
-                        throw new DataLengthException("output buffer too short for DoFinal()");
-                    }
-
-                    // NB: Can't copy directly, or we may write too much output
-                    cipher.ProcessBlock(buf, 0, buf, 0);
-                    Array.Copy(buf, 0, output, outOff, bufOff);
-                }
-
-                return bufOff;
-            }
-            finally
-            {
-                Reset();
-            }
-        }
-
-        /**
-        * Reset the buffer and cipher. After resetting the object is in the same
-        * state as it was after the last init (if there was one).
-        */
-        public override void Reset()
-        {
-            Array.Clear(buf, 0, buf.Length);
-            bufOff = 0;
-
-            cipher.Reset();
-        }
-    }
-}

SharpCompress/Crypto/BufferedCipherBase.cs

@@ -1,113 +0,0 @@
-using System;
-
-namespace Org.BouncyCastle.Crypto
-{
-	public abstract class BufferedCipherBase
-		: IBufferedCipher
-	{
-		protected static readonly byte[] EmptyBuffer = new byte[0];
-
-		public abstract string AlgorithmName { get; }
-
-		public abstract void Init(bool forEncryption, ICipherParameters parameters);
-
-		public abstract int GetBlockSize();
-
-		public abstract int GetOutputSize(int inputLen);
-		public abstract int GetUpdateOutputSize(int inputLen);
-
-		public abstract byte[] ProcessByte(byte input);
-
-		public virtual int ProcessByte(
-			byte	input,
-			byte[]	output,
-			int		outOff)
-		{
-			byte[] outBytes = ProcessByte(input);
-			if (outBytes == null)
-				return 0;
-			if (outOff + outBytes.Length > output.Length)
-				throw new DataLengthException("output buffer too short");
-			outBytes.CopyTo(output, outOff);
-			return outBytes.Length;
-		}
-
-		public virtual byte[] ProcessBytes(
-			byte[] input)
-		{
-			return ProcessBytes(input, 0, input.Length);
-		}
-
-		public abstract byte[] ProcessBytes(byte[] input, int inOff, int length);
-
-		public virtual int ProcessBytes(
-			byte[]	input,
-			byte[]	output,
-			int		outOff)
-		{
-			return ProcessBytes(input, 0, input.Length, output, outOff);
-		}
-
-		public virtual int ProcessBytes(
-			byte[]	input,
-			int		inOff,
-			int		length,
-			byte[]	output,
-			int		outOff)
-		{
-			byte[] outBytes = ProcessBytes(input, inOff, length);
-			if (outBytes == null)
-				return 0;
-			if (outOff + outBytes.Length > output.Length)
-				throw new DataLengthException("output buffer too short");
-			outBytes.CopyTo(output, outOff);
-			return outBytes.Length;
-		}
-
-		public abstract byte[] DoFinal();
-
-		public virtual byte[] DoFinal(
-			byte[] input)
-		{
-			return DoFinal(input, 0, input.Length);
-		}
-
-		public abstract byte[] DoFinal(
-			byte[]	input,
-			int		inOff,
-			int		length);
-
-		public virtual int DoFinal(
-			byte[]	output,
-			int		outOff)
-		{
-			byte[] outBytes = DoFinal();
-			if (outOff + outBytes.Length > output.Length)
-				throw new DataLengthException("output buffer too short");
-			outBytes.CopyTo(output, outOff);
-			return outBytes.Length;
-		}
-
-		public virtual int DoFinal(
-			byte[]	input,
-			byte[]	output,
-			int		outOff)
-		{
-			return DoFinal(input, 0, input.Length, output, outOff);
-		}
-
-		public virtual int DoFinal(
-			byte[]	input,
-			int		inOff,
-			int		length,
-			byte[]	output,
-			int		outOff)
-		{
-			int len = ProcessBytes(input, inOff, length, output, outOff);
-			len += DoFinal(output, outOff + len);
-			return len;
-		}
-
-		public abstract void Reset();
-	}
-}

SharpCompress/Crypto/GeneralDigest.cs

@@ -1,115 +0,0 @@
-using System;
-
-namespace Org.BouncyCastle.Crypto.Digests
-{
-    public abstract class GeneralDigest
-        : IDigest
-    {
-        private const int BYTE_LENGTH = 64;
-
-        private byte[] xBuf;
-        private int xBufOff;
-
-        private long byteCount;
-
-        internal GeneralDigest()
-        {
-            xBuf = new byte[4];
-        }
-
-        internal GeneralDigest(GeneralDigest t)
-        {
-            xBuf = new byte[t.xBuf.Length];
-            Array.Copy(t.xBuf, 0, xBuf, 0, t.xBuf.Length);
-
-            xBufOff = t.xBufOff;
-            byteCount = t.byteCount;
-        }
-
-        public void Update(byte input)
-        {
-            xBuf[xBufOff++] = input;
-
-            if (xBufOff == xBuf.Length)
-            {
-                ProcessWord(xBuf, 0);
-                xBufOff = 0;
-            }
-
-            byteCount++;
-        }
-
-        public void BlockUpdate(
-            byte[] input,
-            int inOff,
-            int length)
-        {
-            //
-            // fill the current word
-            //
-            while ((xBufOff != 0) && (length > 0))
-            {
-                Update(input[inOff]);
-                inOff++;
-                length--;
-            }
-
-            //
-            // process whole words.
-            //
-            while (length > xBuf.Length)
-            {
-                ProcessWord(input, inOff);
-
-                inOff += xBuf.Length;
-                length -= xBuf.Length;
-                byteCount += xBuf.Length;
-            }
-
-            //
-            // load in the remainder.
-            //
-            while (length > 0)
-            {
-                Update(input[inOff]);
-
-                inOff++;
-                length--;
-            }
-        }
-
-        public void Finish()
-        {
-            long bitLength = (byteCount << 3);
-
-            //
-            // add the pad bytes.
-            //
-            Update((byte)128);
-
-            while (xBufOff != 0)
-                Update((byte)0);
-            ProcessLength(bitLength);
-            ProcessBlock();
-        }
-
-        public virtual void Reset()
-        {
-            byteCount = 0;
-            xBufOff = 0;
-            Array.Clear(xBuf, 0, xBuf.Length);
-        }
-
-        public int GetByteLength()
-        {
-            return BYTE_LENGTH;
-        }
-
-        internal abstract void ProcessWord(byte[] input, int inOff);
-        internal abstract void ProcessLength(long bitLength);
-        internal abstract void ProcessBlock();
-        public abstract string AlgorithmName { get; }
-        public abstract int GetDigestSize();
-        public abstract int DoFinal(byte[] output, int outOff);
-    }
-}

SharpCompress/Crypto/HMac.cs

@@ -1,134 +0,0 @@
-using System;
-using System.Collections;
-
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace Org.BouncyCastle.Crypto.Macs
-{
-    /**
-    * HMAC implementation based on RFC2104
-    *
-    * H(K XOR opad, H(K XOR ipad, text))
-    */
-    public class HMac
-		: IMac
-    {
-        private const byte IPAD = (byte)0x36;
-        private const byte OPAD = (byte)0x5C;
-
-        private readonly IDigest digest;
-        private readonly int digestSize;
-        private readonly int blockLength;
-
-		private readonly byte[] inputPad;
-        private readonly byte[] outputPad;
-
-        public HMac(
-            IDigest digest)
-        {
-            this.digest = digest;
-            this.digestSize = digest.GetDigestSize();
-            this.blockLength = digest.GetByteLength();
-            this.inputPad = new byte[blockLength];
-            this.outputPad = new byte[blockLength];
-        }
-
-        public string AlgorithmName
-        {
-            get { return digest.AlgorithmName + "/HMAC"; }
-        }
-
-		public IDigest GetUnderlyingDigest()
-        {
-            return digest;
-        }
-
-        public void Init(
-            ICipherParameters parameters)
-        {
-            digest.Reset();
-
-            byte[] key = ((KeyParameter)parameters).GetKey();
-			int keyLength = key.Length;
-
-            if (keyLength > blockLength)
-            {
-                digest.BlockUpdate(key, 0, key.Length);
-                digest.DoFinal(inputPad, 0);
-
-				keyLength = digestSize;
-            }
-            else
-            {
-				Array.Copy(key, 0, inputPad, 0, keyLength);
-            }
-
-			Array.Clear(inputPad, keyLength, blockLength - keyLength);
-            Array.Copy(inputPad, 0, outputPad, 0, blockLength);
-
-			xor(inputPad, IPAD);
-			xor(outputPad, OPAD);
-
-			// Initialise the digest
-			digest.BlockUpdate(inputPad, 0, inputPad.Length);
-        }
-
-        public int GetMacSize()
-        {
-            return digestSize;
-        }
-
-        public void Update(
-            byte input)
-        {
-            digest.Update(input);
-        }
-
-        public void BlockUpdate(
-            byte[] input,
-            int inOff,
-            int len)
-        {
-            digest.BlockUpdate(input, inOff, len);
-        }
-
-        public int DoFinal(
-            byte[] output,
-            int outOff)
-        {
-            byte[] tmp = new byte[digestSize];
-            digest.DoFinal(tmp, 0);
-
-            digest.BlockUpdate(outputPad, 0, outputPad.Length);
-            digest.BlockUpdate(tmp, 0, tmp.Length);
-
-            int len = digest.DoFinal(output, outOff);
-
-			// Initialise the digest
-            digest.BlockUpdate(inputPad, 0, inputPad.Length);
-
-            return len;
-        }
-
-        /**
-        * Reset the mac generator.
-        */
-        public void Reset()
-        {
-			// Reset underlying digest
-            digest.Reset();
-
-			// Initialise the digest
-            digest.BlockUpdate(inputPad, 0, inputPad.Length);
-        }
-
-		private static void xor(byte[] a, byte n)
-		{
-			for (int i = 0; i < a.Length; ++i)
-            {
-                a[i] ^= n;
-            }
-		}
-    }
-}

SharpCompress/Crypto/IBufferedCipher.cs

@@ -1,44 +0,0 @@
-using System;
-
-namespace Org.BouncyCastle.Crypto
-{
-	/// <remarks>Block cipher engines are expected to conform to this interface.</remarks>
-    public interface IBufferedCipher
-    {
-		/// <summary>The name of the algorithm this cipher implements.</summary>
-		string AlgorithmName { get; }
-
-		/// <summary>Initialise the cipher.</summary>
-		/// <param name="forEncryption">If true the cipher is initialised for encryption,
-		/// if false for decryption.</param>
-		/// <param name="parameters">The key and other data required by the cipher.</param>
-        void Init(bool forEncryption, ICipherParameters parameters);
-
-		int GetBlockSize();
-
-		int GetOutputSize(int inputLen);
-
-		int GetUpdateOutputSize(int inputLen);
-
-		byte[] ProcessByte(byte input);
-		int ProcessByte(byte input, byte[] output, int outOff);
-
-		byte[] ProcessBytes(byte[] input);
-		byte[] ProcessBytes(byte[] input, int inOff, int length);
-		int ProcessBytes(byte[] input, byte[] output, int outOff);
-		int ProcessBytes(byte[] input, int inOff, int length, byte[] output, int outOff);
-
-		byte[] DoFinal();
-		byte[] DoFinal(byte[] input);
-		byte[] DoFinal(byte[] input, int inOff, int length);
-		int DoFinal(byte[] output, int outOff);
-		int DoFinal(byte[] input, byte[] output, int outOff);
-		int DoFinal(byte[] input, int inOff, int length, byte[] output, int outOff);
-
-		/// <summary>
-		/// Reset the cipher. After resetting the cipher is in the same state
-		/// as it was after the last init (if there was one).
-		/// </summary>
-        void Reset();
-    }
-}

SharpCompress/Crypto/IDigest.cs

@@ -1,56 +0,0 @@
-namespace Org.BouncyCastle.Crypto
-{
-    public interface IDigest
-    {
-        /**
-         * return the algorithm name
-         *
-         * @return the algorithm name
-         */
-        string AlgorithmName { get; }
-
-        /**
-         * return the size, in bytes, of the digest produced by this message digest.
-         *
-         * @return the size, in bytes, of the digest produced by this message digest.
-         */
-        int GetDigestSize();
-
-        /**
-         * return the size, in bytes, of the internal buffer used by this digest.
-         *
-         * @return the size, in bytes, of the internal buffer used by this digest.
-         */
-        int GetByteLength();
-
-        /**
-         * update the message digest with a single byte.
-         *
-         * @param inByte the input byte to be entered.
-         */
-        void Update(byte input);
-
-        /**
-         * update the message digest with a block of bytes.
-         *
-         * @param input the byte array containing the data.
-         * @param inOff the offset into the byte array where the data starts.
-         * @param len the length of the data.
-         */
-        void BlockUpdate(byte[] input, int inOff, int length);
-
-        /**
-         * Close the digest, producing the final digest value. The doFinal
-         * call leaves the digest reset.
-         *
-         * @param output the array the digest is to be copied into.
-         * @param outOff the offset into the out array the digest is to start at.
-         */
-        int DoFinal(byte[] output, int outOff);
-
-        /**
-         * reset the digest back to it's initial state.
-         */
-        void Reset();
-    }
-}

SharpCompress/Crypto/IMac.cs

@@ -1,64 +0,0 @@
-namespace Org.BouncyCastle.Crypto
-{
-    public interface IMac
-    {
-        /**
-         * Initialise the MAC.
-         *
-         * @param param the key and other data required by the MAC.
-         * @exception ArgumentException if the parameters argument is
-         * inappropriate.
-         */
-        void Init(ICipherParameters parameters);
-
-        /**
-         * Return the name of the algorithm the MAC implements.
-         *
-         * @return the name of the algorithm the MAC implements.
-         */
-        string AlgorithmName { get; }
-
-        /**
-         * Return the block size for this MAC (in bytes).
-         *
-         * @return the block size for this MAC in bytes.
-         */
-        int GetMacSize();
-
-        /**
-         * add a single byte to the mac for processing.
-         *
-         * @param in the byte to be processed.
-         * @exception InvalidOperationException if the MAC is not initialised.
-         */
-        void Update(byte input);
-
-        /**
-         * @param in the array containing the input.
-         * @param inOff the index in the array the data begins at.
-         * @param len the length of the input starting at inOff.
-         * @exception InvalidOperationException if the MAC is not initialised.
-         * @exception DataLengthException if there isn't enough data in in.
-         */
-        void BlockUpdate(byte[] input, int inOff, int len);
-
-        /**
-         * Compute the final stage of the MAC writing the output to the out
-         * parameter.
-         * <p>
-         * doFinal leaves the MAC in the same state it was after the last init.
-         * </p>
-         * @param out the array the MAC is to be output to.
-         * @param outOff the offset into the out buffer the output is to start at.
-         * @exception DataLengthException if there isn't enough space in out.
-         * @exception InvalidOperationException if the MAC is not initialised.
-         */
-        int DoFinal(byte[] output, int outOff);
-
-        /**
-         * Reset the MAC. At the end of resetting the MAC should be in the
-         * in the same state it was after the last init (if there was one).
-         */
-        void Reset();
-    }
-}

SharpCompress/Crypto/PBKDF2.cs

@@ -1,119 +0,0 @@
-using System;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Macs;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace SharpCompress.Crypto
-{
-    //Gathered from:
-    //http://stackoverflow.com/questions/3210795/pbkdf2-in-bouncy-castle-c-sharp and Rfc2898DeriveBytes 
-    internal class PBKDF2
-    {
-        private readonly IMac hMac = new HMac(new Sha1Digest());
-        private readonly byte[] state = new byte[20];
-        private int endIndex;
-        private int startIndex;
-        private uint block = 1u;
-        private readonly byte[] password;
-        private readonly byte[] salt;
-        private readonly int iterations;
-
-
-        public PBKDF2(byte[] password, byte[] salt, int iterations)
-        {
-            this.password = password;
-            this.salt = salt;
-            this.iterations = iterations;
-        }
-
-        public byte[] GetBytes(int cb)
-        {
-            if (cb <= 0)
-            {
-                throw new ArgumentOutOfRangeException("cb");
-            }
-            byte[] array = new byte[cb];
-            int i = 0;
-            int num = endIndex - startIndex;
-            if (num > 0)
-            {
-                if (cb < num)
-                {
-                    Buffer.BlockCopy(state, startIndex, array, 0, cb);
-                    startIndex += cb;
-                    return array;
-                }
-                Buffer.BlockCopy(state, startIndex, array, 0, num);
-                startIndex = (endIndex = 0);
-                i += num;
-            }
-            while (i < cb)
-            {
-                byte[] src = Hash();
-                int num2 = cb - i;
-                if (num2 <= 20)
-                {
-                    Buffer.BlockCopy(src, 0, array, i, num2);
-                    i += num2;
-                    Buffer.BlockCopy(src, num2, state, startIndex, 20 - num2);
-                    endIndex += 20 - num2;
-                    return array;
-                }
-                Buffer.BlockCopy(src, 0, array, i, 20);
-                i += 20;
-            }
-            return array;
-        }
-
-        private byte[] Hash()
-        {
-            byte[] array = UIntToOctet(block);
-            ICipherParameters param = new KeyParameter(password);
-
-            hMac.Init(param);
-            hMac.BlockUpdate(salt, 0, salt.Length);
-
-            hMac.BlockUpdate(array, 0, array.Length);
-            byte[] array2 = new byte[20];
-            hMac.DoFinal(array2, 0);
-
-            hMac.Init(param);
-
-            byte[] array3 = new byte[20];
-            Buffer.BlockCopy(array2, 0, array3, 0, 20);
-            int num = 2;
-            while (num <= (long)((ulong)iterations))
-            {
-                hMac.BlockUpdate(array2, 0, array2.Length);
-                hMac.DoFinal(array2, 0);
-                for (int i = 0; i < 20; i++)
-                {
-                    array3[i] ^= array2[i];
-                }
-                num++;
-            }
-            block += 1u;
-            return array3;
-        }
-
-        internal static byte[] UIntToOctet(uint i)
-        {
-            byte[] bytes = BitConverter.GetBytes(i);
-            byte[] result = new[]
-                            {
-                                bytes[3],
-                                bytes[2],
-                                bytes[1],
-                                bytes[0]
-                            };
-            if (!BitConverter.IsLittleEndian)
-            {
-                return bytes;
-            }
-            return result;
-        }
-
-    }
-}
-

SharpCompress/Crypto/Pack.cs

@@ -1,129 +0,0 @@
-namespace Org.BouncyCastle.Crypto.Utilities
-{
-    internal sealed class Pack
-    {
-        private Pack()
-        {
-        }
-
-        internal static void UInt32_To_BE(uint n, byte[] bs)
-        {
-            bs[0] = (byte)(n >> 24);
-            bs[1] = (byte)(n >> 16);
-            bs[2] = (byte)(n >> 8);
-            bs[3] = (byte)(n);
-        }
-
-        internal static void UInt32_To_BE(uint n, byte[] bs, int off)
-        {
-            bs[off] = (byte)(n >> 24);
-            bs[++off] = (byte)(n >> 16);
-            bs[++off] = (byte)(n >> 8);
-            bs[++off] = (byte)(n);
-        }
-
-        internal static uint BE_To_UInt32(byte[] bs)
-        {
-            uint n = (uint)bs[0] << 24;
-            n |= (uint)bs[1] << 16;
-            n |= (uint)bs[2] << 8;
-            n |= (uint)bs[3];
-            return n;
-        }
-
-        internal static uint BE_To_UInt32(byte[] bs, int off)
-        {
-            uint n = (uint)bs[off] << 24;
-            n |= (uint)bs[++off] << 16;
-            n |= (uint)bs[++off] << 8;
-            n |= (uint)bs[++off];
-            return n;
-        }
-
-        internal static ulong BE_To_UInt64(byte[] bs)
-        {
-            uint hi = BE_To_UInt32(bs);
-            uint lo = BE_To_UInt32(bs, 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        internal static ulong BE_To_UInt64(byte[] bs, int off)
-        {
-            uint hi = BE_To_UInt32(bs, off);
-            uint lo = BE_To_UInt32(bs, off + 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        internal static void UInt64_To_BE(ulong n, byte[] bs)
-        {
-            UInt32_To_BE((uint)(n >> 32), bs);
-            UInt32_To_BE((uint)(n), bs, 4);
-        }
-
-        internal static void UInt64_To_BE(ulong n, byte[] bs, int off)
-        {
-            UInt32_To_BE((uint)(n >> 32), bs, off);
-            UInt32_To_BE((uint)(n), bs, off + 4);
-        }
-
-        internal static void UInt32_To_LE(uint n, byte[] bs)
-        {
-            bs[0] = (byte)(n);
-            bs[1] = (byte)(n >> 8);
-            bs[2] = (byte)(n >> 16);
-            bs[3] = (byte)(n >> 24);
-        }
-
-        internal static void UInt32_To_LE(uint n, byte[] bs, int off)
-        {
-            bs[off] = (byte)(n);
-            bs[++off] = (byte)(n >> 8);
-            bs[++off] = (byte)(n >> 16);
-            bs[++off] = (byte)(n >> 24);
-        }
-
-        internal static uint LE_To_UInt32(byte[] bs)
-        {
-            uint n = (uint)bs[0];
-            n |= (uint)bs[1] << 8;
-            n |= (uint)bs[2] << 16;
-            n |= (uint)bs[3] << 24;
-            return n;
-        }
-
-        internal static uint LE_To_UInt32(byte[] bs, int off)
-        {
-            uint n = (uint)bs[off];
-            n |= (uint)bs[++off] << 8;
-            n |= (uint)bs[++off] << 16;
-            n |= (uint)bs[++off] << 24;
-            return n;
-        }
-
-        internal static ulong LE_To_UInt64(byte[] bs)
-        {
-            uint lo = LE_To_UInt32(bs);
-            uint hi = LE_To_UInt32(bs, 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        internal static ulong LE_To_UInt64(byte[] bs, int off)
-        {
-            uint lo = LE_To_UInt32(bs, off);
-            uint hi = LE_To_UInt32(bs, off + 4);
-            return ((ulong)hi << 32) | (ulong)lo;
-        }
-
-        internal static void UInt64_To_LE(ulong n, byte[] bs)
-        {
-            UInt32_To_LE((uint)(n), bs);
-            UInt32_To_LE((uint)(n >> 32), bs, 4);
-        }
-
-        internal static void UInt64_To_LE(ulong n, byte[] bs, int off)
-        {
-            UInt32_To_LE((uint)(n), bs, off);
-            UInt32_To_LE((uint)(n >> 32), bs, off + 4);
-        }
-    }
-}

SharpCompress/Crypto/Sha1Digest.cs

@@ -1,255 +0,0 @@
-using System;
-using Org.BouncyCastle.Crypto.Utilities;
-
-namespace Org.BouncyCastle.Crypto.Digests
-{
-    public class Sha1Digest
-        : GeneralDigest
-    {
-        private const int DigestLength = 20;
-
-        private uint H1, H2, H3, H4, H5;
-
-        private uint[] X = new uint[80];
-        private int xOff;
-
-        public Sha1Digest()
-        {
-            Reset();
-        }
-
-        /**
-         * Copy constructor.  This will copy the state of the provided
-         * message digest.
-         */
-        public Sha1Digest(Sha1Digest t)
-            : base(t)
-        {
-            H1 = t.H1;
-            H2 = t.H2;
-            H3 = t.H3;
-            H4 = t.H4;
-            H5 = t.H5;
-
-            Array.Copy(t.X, 0, X, 0, t.X.Length);
-            xOff = t.xOff;
-        }
-
-        public override string AlgorithmName
-        {
-            get { return "SHA-1"; }
-        }
-
-        public override int GetDigestSize()
-        {
-            return DigestLength;
-        }
-
-        internal override void ProcessWord(
-            byte[] input,
-            int inOff)
-        {
-            X[xOff] = Pack.BE_To_UInt32(input, inOff);
-
-            if (++xOff == 16)
-            {
-                ProcessBlock();
-            }
-        }
-
-        internal override void ProcessLength(long bitLength)
-        {
-            if (xOff > 14)
-            {
-                ProcessBlock();
-            }
-
-            X[14] = (uint)((ulong)bitLength >> 32);
-            X[15] = (uint)((ulong)bitLength);
-        }
-
-        public override int DoFinal(
-            byte[] output,
-            int outOff)
-        {
-            Finish();
-
-            Pack.UInt32_To_BE(H1, output, outOff);
-            Pack.UInt32_To_BE(H2, output, outOff + 4);
-            Pack.UInt32_To_BE(H3, output, outOff + 8);
-            Pack.UInt32_To_BE(H4, output, outOff + 12);
-            Pack.UInt32_To_BE(H5, output, outOff + 16);
-
-            Reset();
-
-            return DigestLength;
-        }
-
-        /**
-         * reset the chaining variables
-         */
-        public override void Reset()
-        {
-            base.Reset();
-
-            H1 = 0x67452301;
-            H2 = 0xefcdab89;
-            H3 = 0x98badcfe;
-            H4 = 0x10325476;
-            H5 = 0xc3d2e1f0;
-
-            xOff = 0;
-            Array.Clear(X, 0, X.Length);
-        }
-
-        //
-        // Additive constants
-        //
-        private const uint Y1 = 0x5a827999;
-        private const uint Y2 = 0x6ed9eba1;
-        private const uint Y3 = 0x8f1bbcdc;
-        private const uint Y4 = 0xca62c1d6;
-
-        private static uint F(uint u, uint v, uint w)
-        {
-            return (u & v) | (~u & w);
-        }
-
-        private static uint H(uint u, uint v, uint w)
-        {
-            return u ^ v ^ w;
-        }
-
-        private static uint G(uint u, uint v, uint w)
-        {
-            return (u & v) | (u & w) | (v & w);
-        }
-
-        internal override void ProcessBlock()
-        {
-            //
-            // expand 16 word block into 80 word block.
-            //
-            for (int i = 16; i < 80; i++)
-            {
-                uint t = X[i - 3] ^ X[i - 8] ^ X[i - 14] ^ X[i - 16];
-                X[i] = t << 1 | t >> 31;
-            }
-
-            //
-            // set up working variables.
-            //
-            uint A = H1;
-            uint B = H2;
-            uint C = H3;
-            uint D = H4;
-            uint E = H5;
-
-            //
-            // round 1
-            //
-            int idx = 0;
-
-            for (int j = 0; j < 4; j++)
-            {
-                // E = rotateLeft(A, 5) + F(B, C, D) + E + X[idx++] + Y1
-                // B = rotateLeft(B, 30)
-                E += (A << 5 | (A >> 27)) + F(B, C, D) + X[idx++] + Y1;
-                B = B << 30 | (B >> 2);
-
-                D += (E << 5 | (E >> 27)) + F(A, B, C) + X[idx++] + Y1;
-                A = A << 30 | (A >> 2);
-
-                C += (D << 5 | (D >> 27)) + F(E, A, B) + X[idx++] + Y1;
-                E = E << 30 | (E >> 2);
-
-                B += (C << 5 | (C >> 27)) + F(D, E, A) + X[idx++] + Y1;
-                D = D << 30 | (D >> 2);
-
-                A += (B << 5 | (B >> 27)) + F(C, D, E) + X[idx++] + Y1;
-                C = C << 30 | (C >> 2);
-            }
-
-            //
-            // round 2
-            //
-            for (int j = 0; j < 4; j++)
-            {
-                // E = rotateLeft(A, 5) + H(B, C, D) + E + X[idx++] + Y2
-                // B = rotateLeft(B, 30)
-                E += (A << 5 | (A >> 27)) + H(B, C, D) + X[idx++] + Y2;
-                B = B << 30 | (B >> 2);
-
-                D += (E << 5 | (E >> 27)) + H(A, B, C) + X[idx++] + Y2;
-                A = A << 30 | (A >> 2);
-
-                C += (D << 5 | (D >> 27)) + H(E, A, B) + X[idx++] + Y2;
-                E = E << 30 | (E >> 2);
-
-                B += (C << 5 | (C >> 27)) + H(D, E, A) + X[idx++] + Y2;
-                D = D << 30 | (D >> 2);
-
-                A += (B << 5 | (B >> 27)) + H(C, D, E) + X[idx++] + Y2;
-                C = C << 30 | (C >> 2);
-            }
-
-            //
-            // round 3
-            //
-            for (int j = 0; j < 4; j++)
-            {
-                // E = rotateLeft(A, 5) + G(B, C, D) + E + X[idx++] + Y3
-                // B = rotateLeft(B, 30)
-                E += (A << 5 | (A >> 27)) + G(B, C, D) + X[idx++] + Y3;
-                B = B << 30 | (B >> 2);
-
-                D += (E << 5 | (E >> 27)) + G(A, B, C) + X[idx++] + Y3;
-                A = A << 30 | (A >> 2);
-
-                C += (D << 5 | (D >> 27)) + G(E, A, B) + X[idx++] + Y3;
-                E = E << 30 | (E >> 2);
-
-                B += (C << 5 | (C >> 27)) + G(D, E, A) + X[idx++] + Y3;
-                D = D << 30 | (D >> 2);
-
-                A += (B << 5 | (B >> 27)) + G(C, D, E) + X[idx++] + Y3;
-                C = C << 30 | (C >> 2);
-            }
-
-            //
-            // round 4
-            //
-            for (int j = 0; j < 4; j++)
-            {
-                // E = rotateLeft(A, 5) + H(B, C, D) + E + X[idx++] + Y4
-                // B = rotateLeft(B, 30)
-                E += (A << 5 | (A >> 27)) + H(B, C, D) + X[idx++] + Y4;
-                B = B << 30 | (B >> 2);
-
-                D += (E << 5 | (E >> 27)) + H(A, B, C) + X[idx++] + Y4;
-                A = A << 30 | (A >> 2);
-
-                C += (D << 5 | (D >> 27)) + H(E, A, B) + X[idx++] + Y4;
-                E = E << 30 | (E >> 2);
-
-                B += (C << 5 | (C >> 27)) + H(D, E, A) + X[idx++] + Y4;
-                D = D << 30 | (D >> 2);
-
-                A += (B << 5 | (B >> 27)) + H(C, D, E) + X[idx++] + Y4;
-                C = C << 30 | (C >> 2);
-            }
-
-            H1 += A;
-            H2 += B;
-            H3 += C;
-            H4 += D;
-            H5 += E;
-
-            //
-            // reset start of the buffer.
-            //
-            xOff = 0;
-            Array.Clear(X, 0, 16);
-        }
-    }
-}

SharpCompress/SharpCompress.Portable.csproj

@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7FA7D133-1417-4F85-9998-4C618AC8FEDA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <BaseIntermediateOutputPath>obj\Portable\</BaseIntermediateOutputPath>
-    <RestorePackages>true</RestorePackages>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Portable\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Portable\</OutputPath>
-    <DefineConstants>TRACE;PORTABLE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\EntryStream.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\RarRijndael.Portable.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.Portable.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.Portable.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\Crc32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Crypto\BufferedBlockCipher.cs" />
-    <Compile Include="Crypto\BufferedCipherBase.cs" />
-    <Compile Include="Crypto\CryptoException.cs" />
-    <Compile Include="Crypto\DataLengthException.cs" />
-    <Compile Include="Crypto\GeneralDigest.cs" />
-    <Compile Include="Crypto\HMac.cs" />
-    <Compile Include="Crypto\IBlockCipher.cs" />
-    <Compile Include="Crypto\IBufferedCipher.cs" />
-    <Compile Include="Crypto\ICipherParameters.cs" />
-    <Compile Include="Crypto\IDigest.cs" />
-    <Compile Include="Crypto\IMac.cs" />
-    <Compile Include="Crypto\KeyParameter.cs" />
-    <Compile Include="Crypto\BigInteger.cs" />
-    <Compile Include="Crypto\Pack.cs" />
-    <Compile Include="Crypto\PBKDF2.cs" />
-    <Compile Include="Crypto\RijndaelEngine.cs" />
-    <Compile Include="Crypto\Sha1Digest.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipCompressionInfo.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress/SharpCompress.PortableTest.csproj

@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress.PortableTest</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE;UNSIGNED</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>..\bin\SharpCompress.PortableTest.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\bin\SharpCompress.PortableTest.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarRijndael.Portable.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.Portable.cs" />
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.Portable.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Compressor\LZMA\AesDecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="Crypto\BigInteger.cs" />
-    <Compile Include="Crypto\BufferedBlockCipher.cs" />
-    <Compile Include="Crypto\BufferedCipherBase.cs" />
-    <Compile Include="Crypto\CryptoException.cs" />
-    <Compile Include="Crypto\DataLengthException.cs" />
-    <Compile Include="Crypto\GeneralDigest.cs" />
-    <Compile Include="Crypto\HMac.cs" />
-    <Compile Include="Crypto\IBlockCipher.cs" />
-    <Compile Include="Crypto\IBufferedCipher.cs" />
-    <Compile Include="Crypto\ICipherParameters.cs" />
-    <Compile Include="Crypto\IDigest.cs" />
-    <Compile Include="Crypto\IMac.cs" />
-    <Compile Include="Crypto\KeyParameter.cs" />
-    <Compile Include="Crypto\Pack.cs" />
-    <Compile Include="Crypto\PBKDF2.cs" />
-    <Compile Include="Crypto\RijndaelEngine.cs" />
-    <Compile Include="Crypto\Sha1Digest.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="Common\EntryStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Compressor\Deflate\CRC32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarFilePart.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarArchiveVolume.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipCompressionInfo.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress/SharpCompress.Unsigned.csproj

@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{27D535CB-2FD3-4621-8C9A-46161FC77A5D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress.Unsigned</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <BaseIntermediateOutputPath>obj\Full\</BaseIntermediateOutputPath>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE;UNSIGNED</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarFilePart.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarRijndael.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Compressor\LZMA\AesDecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="Common\EntryStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Compressor\Deflate\CRC32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarArchiveVolume.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipCompressionInfo.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress/SharpCompress.WindowsStore.csproj

@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <BaseIntermediateOutputPath>obj\WindowsStore\</BaseIntermediateOutputPath>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
-    <TargetFrameworkVersion />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\WindowsStore\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\WindowsStore\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\EntryStream.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\RarRijndael.Portable.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.Portable.cs" />
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.Portable.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\CRC32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs" />
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Crypto\BigInteger.cs" />
-    <Compile Include="Crypto\BufferedBlockCipher.cs" />
-    <Compile Include="Crypto\BufferedCipherBase.cs" />
-    <Compile Include="Crypto\CryptoException.cs" />
-    <Compile Include="Crypto\DataLengthException.cs" />
-    <Compile Include="Crypto\GeneralDigest.cs" />
-    <Compile Include="Crypto\HMac.cs" />
-    <Compile Include="Crypto\IBlockCipher.cs" />
-    <Compile Include="Crypto\IBufferedCipher.cs" />
-    <Compile Include="Crypto\ICipherParameters.cs" />
-    <Compile Include="Crypto\IDigest.cs" />
-    <Compile Include="Crypto\IMac.cs" />
-    <Compile Include="Crypto\KeyParameter.cs" />
-    <Compile Include="Crypto\PBKDF2.cs" />
-    <Compile Include="Crypto\RijndaelEngine.cs" />
-    <Compile Include="Crypto\Pack.cs" />
-    <Compile Include="Crypto\Sha1Digest.cs" />
-    <Compile Include="IO\AppendingStream.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs" />
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipCompressionInfo.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
-    <VisualStudioVersion>12.0</VisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress/SharpCompress.csproj

@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{10A689CF-76A2-4A4F-96E4-553C33398438}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <BaseIntermediateOutputPath>obj\Full\</BaseIntermediateOutputPath>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Full\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Full\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarFilePart.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarRijndael.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Compressor\LZMA\AesDecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="Common\EntryStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Compressor\Deflate\CRC32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarArchiveVolume.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipCompressionInfo.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

SharpCompress/VersionInfo.cs

@@ -1,15 +0,0 @@
-using System.Reflection;
-#if !PORTABLE
-using System.Runtime.InteropServices;
-
-[assembly: ComVisible(false)]
-#endif
-
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyCopyright("Copyright © Adam Hathcock")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("0.11.2.0")]
-[assembly: AssemblyFileVersion("0.11.2.0")]

SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs

@@ -1,60 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using SharpCompress.Common.Zip;
-using SharpCompress.Common.Zip.Headers;
-
-namespace SharpCompress.Writer.Zip
-{
-    internal class ZipCentralDirectoryEntry
-    {
-        internal string FileName { get; set; }
-        internal DateTime? ModificationTime { get; set; }
-        internal string Comment { get; set; }
-        internal uint Crc { get; set; }
-        internal uint HeaderOffset { get; set; }
-        internal uint Compressed { get; set; }
-        internal uint Decompressed { get; set; }
-
-
-        internal uint Write(Stream outputStream, ZipCompressionMethod compression)
-        {
-            byte[] encodedFilename = Encoding.UTF8.GetBytes(FileName);
-            byte[] encodedComment = Encoding.UTF8.GetBytes(Comment);
-
-            outputStream.Write(new byte[] {80, 75, 1, 2, 0x3F, 0, 0x0A, 0}, 0, 8);
-            HeaderFlags flags = HeaderFlags.UTF8;
-            if (!outputStream.CanSeek)
-            {
-                flags |= HeaderFlags.UsePostDataDescriptor;
-                if (compression == ZipCompressionMethod.LZMA)
-                {
-                    flags |= HeaderFlags.Bit1; // eos marker
-                }
-            }
-            outputStream.Write(BitConverter.GetBytes((ushort) flags), 0, 2);
-            outputStream.Write(BitConverter.GetBytes((ushort) compression), 0, 2); // zipping method
-            outputStream.Write(BitConverter.GetBytes(ModificationTime.DateTimeToDosTime()), 0, 4);
-                // zipping date and time
-            outputStream.Write(BitConverter.GetBytes(Crc), 0, 4); // file CRC
-            outputStream.Write(BitConverter.GetBytes(Compressed), 0, 4); // compressed file size
-            outputStream.Write(BitConverter.GetBytes(Decompressed), 0, 4); // uncompressed file size
-            outputStream.Write(BitConverter.GetBytes((ushort) encodedFilename.Length), 0, 2); // Filename in zip
-            outputStream.Write(BitConverter.GetBytes((ushort) 0), 0, 2); // extra length
-            outputStream.Write(BitConverter.GetBytes((ushort) encodedComment.Length), 0, 2);
-
-            outputStream.Write(BitConverter.GetBytes((ushort) 0), 0, 2); // disk=0
-            outputStream.Write(BitConverter.GetBytes((ushort) 0), 0, 2); // file type: binary
-            outputStream.Write(BitConverter.GetBytes((ushort) 0), 0, 2); // Internal file attributes
-            outputStream.Write(BitConverter.GetBytes((ushort) 0x8100), 0, 2);
-                // External file attributes (normal/readable)
-            outputStream.Write(BitConverter.GetBytes(HeaderOffset), 0, 4); // Offset of header
-
-            outputStream.Write(encodedFilename, 0, encodedFilename.Length);
-            outputStream.Write(encodedComment, 0, encodedComment.Length);
-
-            return (uint) (8 + 2 + 2 + 4 + 4 + 4 + 4 + 2 + 2 + 2
-                           + 2 + 2 + 2 + 2 + 4 + encodedFilename.Length + encodedComment.Length);
-        }
-    }
-}

SharpCompress/sharpcompress.DotSettings

@@ -1,134 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeEditing/ContextActionTable/DisabledContextActions/=JetBrains_002EReSharper_002EIntentions_002ECSharp_002EContextActions_002ECatchToCatchExceptionAction/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntellisenseEnabled/IntellisenseEnabledSettingCSharp/IntellisenseEnabled/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntellisenseEnabled/IntellisenseEnabledSettingXaml/IntellisenseEnabled/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeEditing/Localization/CSharpLocalizationOptions/DontAnalyseVerbatimStrings/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ecpp/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Eh/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022ClassCanBeSealed_002EGlobal_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022ClassCanBeSealed_002ELocal_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022ConvertIfStatementToReturnStatement_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022ConvertIfStatementToSwitchStatement_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022ConvertToAutoPropertyWithPrivateSetter_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022InvertIf_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022LoopCanBePartlyConvertedToQuery_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022MemberCanBeInternal_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022MemberCanBeMadeStatic_002EGlobal_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022MemberCanBeMadeStatic_002ELocal_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022RedundantArgumentNameForLiteralExpression_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022RedundantToStringCallForValueType_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022SimilarAnonymousTypeNearby_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022SuggestBaseTypeForParameter_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022SuggestUseVarKeywordEverywhere_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022TryStatementsCanBeMerged_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022UnknownCssVendorExtension_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CConfigurableSeverity_0020Id_003D_0022Xaml_002EBindingWithoutContextReferenceNotResolvedHighlighting_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/CodeIssueFilter/IssueTypesToHide/=_003CStaticSeverity_0020Severity_003D_00222_0022_0020Title_003D_0022Structural_0020Search_0020Hints_0022_0020GroupId_003D_0022StructuralSearch_0022_0020_002F_003E/@EntryIndexedValue">DoHide</s:String>
-	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IdentifierHighlightingEnabled/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleAssignmentToReadonlyField/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantThisQualifier/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyACultureInStringConversionExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedReadonlyField/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Adam_0020Clean/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Adam Clean"&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_IMPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=NaaS_0020Clean/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="NaaS Clean"&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">NaaS Clean</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Default: Full Cleanup</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_FIRST_ARG_BY_PAREN/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_ATTRIBUTE_STYLE/@EntryValue">SEPARATE</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_CHOP_COMPOUND_DO_EXPRESSION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_CHOP_COMPOUND_IF_EXPRESSION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_CHOP_COMPOUND_WHILE_EXPRESSION/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOR_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOREACH_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_IFELSE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_USING_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_WHILE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_ANONYMOUS_METHOD_BLOCK/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_LINQ_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">LINE_BREAK</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">WRAP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_FOR_STMT_HEADER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Constructor/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Constructor/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Global/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Global/Options/=PropertyBody/@EntryIndexedValue">Automatic property</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Implementations/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=WrapInRegion/@EntryIndexedValue">False</s:String>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Overrides/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=WrapInRegion/@EntryIndexedValue">False</s:String>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Properties/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Properties/Options/=DebuggerStepsThrough/@EntryIndexedValue">False</s:String>
-	<s:String x:Key="/Default/CodeStyle/Generate/=Properties/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/Generate/=ReadProperties/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Generate/=ReadProperties/Options/=DebuggerStepsThrough/@EntryIndexedValue">False</s:String>
-	<s:String x:Key="/Default/CodeStyle/Generate/=ReadProperties/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IIS/@EntryIndexedValue">IIS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Other/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=Other/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

global.json

@@ -0,0 +1,3 @@
+{
+    "projects": ["src","test"]
+}

src/SharpCompress/Archive/AbstractArchive.cs

@@ -1,212 +1,212 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Reader;
-
-namespace SharpCompress.Archive
-{
-    public abstract class AbstractArchive<TEntry, TVolume> : IArchive, IArchiveExtractionListener
-        where TEntry : IArchiveEntry
-        where TVolume : IVolume
-    {
-        private readonly LazyReadOnlyCollection<TVolume> lazyVolumes;
-        private readonly LazyReadOnlyCollection<TEntry> lazyEntries;
-
-        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
-        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
-
-        public event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
-        public event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
-
-        protected string Password { get; private set; }
-
-#if !PORTABLE && !NETFX_CORE
-        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, Options options, string password)
-        {
-            Type = type;
-            Password = password;
-            if (!fileInfo.Exists)
-            {
-                throw new ArgumentException("File does not exist: " + fileInfo.FullName);
-            }
-            options = (Options) FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(fileInfo, options));
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
-        }
-
-
-        protected abstract IEnumerable<TVolume> LoadVolumes(FileInfo file, Options options);
-#endif
-
-        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options, string password)
-        {
-            Type = type;
-            Password = password;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
-        }
-
-        internal AbstractArchive(ArchiveType type)
-        {
-            Type = type;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
-        }
-        public ArchiveType Type { get; private set; }
-
-        void IArchiveExtractionListener.FireEntryExtractionBegin(IArchiveEntry entry)
-        {
-            if (EntryExtractionBegin != null)
-            {
-                EntryExtractionBegin(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
-            }
-        }
-
-        void IArchiveExtractionListener.FireEntryExtractionEnd(IArchiveEntry entry)
-        {
-            if (EntryExtractionEnd != null)
-            {
-                EntryExtractionEnd(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
-            }
-        }
-
-        private static Stream CheckStreams(Stream stream)
-        {
-            if (!stream.CanSeek || !stream.CanRead)
-            {
-                throw new ArgumentException("Archive streams must be Readable and Seekable");
-            }
-            return stream;
-        }
-
-        /// <summary>
-        /// Returns an ReadOnlyCollection of all the RarArchiveEntries across the one or many parts of the RarArchive.
-        /// </summary>
-        public virtual ICollection<TEntry> Entries
-        {
-            get { return lazyEntries; }
-        }
-
-        /// <summary>
-        /// Returns an ReadOnlyCollection of all the RarArchiveVolumes across the one or many parts of the RarArchive.
-        /// </summary>
-        public ICollection<TVolume> Volumes
-        {
-            get { return lazyVolumes; }
-        }
-
-        /// <summary>
-        /// The total size of the files compressed in the archive.
-        /// </summary>
-        public virtual long TotalSize
-        {
-            get { return Entries.Aggregate(0L, (total, cf) => total + cf.CompressedSize); }
-        }
-
-        /// <summary>
-        /// The total size of the files as uncompressed in the archive.
-        /// </summary>
-        public virtual long TotalUncompressSize
-        {
-            get { return Entries.Aggregate(0L, (total, cf) => total + cf.Size); }
-        }
-
-        protected abstract IEnumerable<TVolume> LoadVolumes(IEnumerable<Stream> streams, Options options);
-        protected abstract IEnumerable<TEntry> LoadEntries(IEnumerable<TVolume> volumes);
-
-        IEnumerable<IArchiveEntry> IArchive.Entries
-        {
-            get { return Entries.Cast<IArchiveEntry>(); }
-        }
-
-        IEnumerable<IVolume> IArchive.Volumes
-        {
-            get { return lazyVolumes.Cast<IVolume>(); }
-        }
-
-        private bool disposed;
-
-        public virtual void Dispose()
-        {
-            if (!disposed)
-            {
-                lazyVolumes.ForEach(v => v.Dispose());
-                lazyEntries.GetLoaded().Cast<Entry>().ForEach(x => x.Close());
-                disposed = true;
-            }
-        }
-
-        void IArchiveExtractionListener.EnsureEntriesLoaded()
-        {
-            lazyEntries.EnsureFullyLoaded();
-            lazyVolumes.EnsureFullyLoaded();
-        }
-
-        void IExtractionListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
-        {
-            if (CompressedBytesRead != null)
-            {
-                CompressedBytesRead(this, new CompressedBytesReadEventArgs()
-                                              {
-                                                  CurrentFilePartCompressedBytesRead = currentPartCompressedBytes,
-                                                  CompressedBytesRead = compressedReadBytes
-                                              });
-            }
-        }
-
-        void IExtractionListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
-        {
-            if (FilePartExtractionBegin != null)
-            {
-                FilePartExtractionBegin(this, new FilePartExtractionBeginEventArgs()
-                                                  {
-                                                      CompressedSize = compressedSize,
-                                                      Size = size,
-                                                      Name = name,
-                                                  });
-            }
-        }
-
-        /// <summary>
-        /// Use this method to extract all entries in an archive in order.
-        /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
-        /// extracted sequentially for the best performance.
-        /// 
-        /// This method will load all entry information from the archive.
-        /// 
-        /// WARNING: this will reuse the underlying stream for the archive.  Errors may 
-        /// occur if this is used at the same time as other extraction methods on this instance.
-        /// </summary>
-        /// <returns></returns>
-        public IReader ExtractAllEntries()
-        {
-            ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
-            return CreateReaderForSolidExtraction();
-        }
-
-        protected abstract IReader CreateReaderForSolidExtraction();
-
-        /// <summary>
-        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
-        /// </summary>
-        public virtual bool IsSolid
-        {
-            get { return false; }
-        }
-
-
-        /// <summary>
-        /// The archive can find all the parts of the archive needed to fully extract the archive.  This forces the parsing of the entire archive.
-        /// </summary>
-        public bool IsComplete
-        {
-            get
-            {
-                ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
-                return Entries.All(x => x.IsComplete);
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Archive
+{
+    public abstract class AbstractArchive<TEntry, TVolume> : IArchive, IArchiveExtractionListener
+        where TEntry : IArchiveEntry
+        where TVolume : IVolume
+    {
+        private readonly LazyReadOnlyCollection<TVolume> lazyVolumes;
+        private readonly LazyReadOnlyCollection<TEntry> lazyEntries;
+
+        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
+        public event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
+
+        public event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
+        public event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
+
+        protected string Password { get; private set; }
+
+#if !NO_FILE
+        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, Options options, string password)
+        {
+            Type = type;
+            Password = password;
+            if (!fileInfo.Exists)
+            {
+                throw new ArgumentException("File does not exist: " + fileInfo.FullName);
+            }
+            options = (Options) FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(fileInfo, options));
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
+        }
+
+
+        protected abstract IEnumerable<TVolume> LoadVolumes(FileInfo file, Options options);
+#endif
+
+        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options, string password)
+        {
+            Type = type;
+            Password = password;
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
+        }
+
+        internal AbstractArchive(ArchiveType type)
+        {
+            Type = type;
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
+        }
+        public ArchiveType Type { get; private set; }
+
+        void IArchiveExtractionListener.FireEntryExtractionBegin(IArchiveEntry entry)
+        {
+            if (EntryExtractionBegin != null)
+            {
+                EntryExtractionBegin(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
+            }
+        }
+
+        void IArchiveExtractionListener.FireEntryExtractionEnd(IArchiveEntry entry)
+        {
+            if (EntryExtractionEnd != null)
+            {
+                EntryExtractionEnd(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
+            }
+        }
+
+        private static Stream CheckStreams(Stream stream)
+        {
+            if (!stream.CanSeek || !stream.CanRead)
+            {
+                throw new ArgumentException("Archive streams must be Readable and Seekable");
+            }
+            return stream;
+        }
+
+        /// <summary>
+        /// Returns an ReadOnlyCollection of all the RarArchiveEntries across the one or many parts of the RarArchive.
+        /// </summary>
+        public virtual ICollection<TEntry> Entries
+        {
+            get { return lazyEntries; }
+        }
+
+        /// <summary>
+        /// Returns an ReadOnlyCollection of all the RarArchiveVolumes across the one or many parts of the RarArchive.
+        /// </summary>
+        public ICollection<TVolume> Volumes
+        {
+            get { return lazyVolumes; }
+        }
+
+        /// <summary>
+        /// The total size of the files compressed in the archive.
+        /// </summary>
+        public virtual long TotalSize
+        {
+            get { return Entries.Aggregate(0L, (total, cf) => total + cf.CompressedSize); }
+        }
+
+        /// <summary>
+        /// The total size of the files as uncompressed in the archive.
+        /// </summary>
+        public virtual long TotalUncompressSize
+        {
+            get { return Entries.Aggregate(0L, (total, cf) => total + cf.Size); }
+        }
+
+        protected abstract IEnumerable<TVolume> LoadVolumes(IEnumerable<Stream> streams, Options options);
+        protected abstract IEnumerable<TEntry> LoadEntries(IEnumerable<TVolume> volumes);
+
+        IEnumerable<IArchiveEntry> IArchive.Entries
+        {
+            get { return Entries.Cast<IArchiveEntry>(); }
+        }
+
+        IEnumerable<IVolume> IArchive.Volumes
+        {
+            get { return lazyVolumes.Cast<IVolume>(); }
+        }
+
+        private bool disposed;
+
+        public virtual void Dispose()
+        {
+            if (!disposed)
+            {
+                lazyVolumes.ForEach(v => v.Dispose());
+                lazyEntries.GetLoaded().Cast<Entry>().ForEach(x => x.Close());
+                disposed = true;
+            }
+        }
+
+        void IArchiveExtractionListener.EnsureEntriesLoaded()
+        {
+            lazyEntries.EnsureFullyLoaded();
+            lazyVolumes.EnsureFullyLoaded();
+        }
+
+        void IExtractionListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
+        {
+            if (CompressedBytesRead != null)
+            {
+                CompressedBytesRead(this, new CompressedBytesReadEventArgs()
+                                              {
+                                                  CurrentFilePartCompressedBytesRead = currentPartCompressedBytes,
+                                                  CompressedBytesRead = compressedReadBytes
+                                              });
+            }
+        }
+
+        void IExtractionListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
+        {
+            if (FilePartExtractionBegin != null)
+            {
+                FilePartExtractionBegin(this, new FilePartExtractionBeginEventArgs()
+                                                  {
+                                                      CompressedSize = compressedSize,
+                                                      Size = size,
+                                                      Name = name,
+                                                  });
+            }
+        }
+
+        /// <summary>
+        /// Use this method to extract all entries in an archive in order.
+        /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
+        /// extracted sequentially for the best performance.
+        /// 
+        /// This method will load all entry information from the archive.
+        /// 
+        /// WARNING: this will reuse the underlying stream for the archive.  Errors may 
+        /// occur if this is used at the same time as other extraction methods on this instance.
+        /// </summary>
+        /// <returns></returns>
+        public IReader ExtractAllEntries()
+        {
+            ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+            return CreateReaderForSolidExtraction();
+        }
+
+        protected abstract IReader CreateReaderForSolidExtraction();
+
+        /// <summary>
+        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// </summary>
+        public virtual bool IsSolid
+        {
+            get { return false; }
+        }
+
+
+        /// <summary>
+        /// The archive can find all the parts of the archive needed to fully extract the archive.  This forces the parsing of the entire archive.
+        /// </summary>
+        public bool IsComplete
+        {
+            get
+            {
+                ((IArchiveExtractionListener)this).EnsureEntriesLoaded();
+                return Entries.All(x => x.IsComplete);
+            }
+        }
+    }
 }

src/SharpCompress/Archive/AbstractWritableArchive.cs

@@ -1,149 +1,149 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public abstract class AbstractWritableArchive<TEntry, TVolume> : AbstractArchive<TEntry, TVolume>, IWritableArchive
-        where TEntry : IArchiveEntry
-        where TVolume : IVolume
-    {
-        private readonly List<TEntry> newEntries = new List<TEntry>();
-        private readonly List<TEntry> removedEntries = new List<TEntry>();
-
-        private readonly List<TEntry> modifiedEntries = new List<TEntry>();
-        private bool hasModifications;
-
-        internal AbstractWritableArchive(ArchiveType type)
-            : base(type)
-        {
-        }
-
-        internal AbstractWritableArchive(ArchiveType type, Stream stream, Options options)
-            : base(type, stream.AsEnumerable(), options, null)
-        {
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        internal AbstractWritableArchive(ArchiveType type, FileInfo fileInfo, Options options)
-            : base(type, fileInfo, options, null)
-        {
-        }
-#endif
-
-        public override ICollection<TEntry> Entries
-        {
-            get
-            {
-                if (hasModifications)
-                {
-                    return modifiedEntries;
-                }
-                return base.Entries;
-            }
-        }
-
-        private void RebuildModifiedCollection()
-        {
-            hasModifications = true;
-            newEntries.RemoveAll(v => removedEntries.Contains(v));
-            modifiedEntries.Clear();
-            modifiedEntries.AddRange(OldEntries.Concat(newEntries));
-        }
-
-        private IEnumerable<TEntry> OldEntries
-        {
-            get { return base.Entries.Where(x => !removedEntries.Contains(x)); }
-        }
-
-        public void RemoveEntry(TEntry entry)
-        {
-            if (!removedEntries.Contains(entry))
-            {
-                removedEntries.Add(entry);
-                RebuildModifiedCollection();
-            }
-        }
-        void IWritableArchive.RemoveEntry(IArchiveEntry entry)
-        {
-            RemoveEntry((TEntry)entry);
-        }
-
-        public TEntry AddEntry(string key, Stream source,
-                             long size = 0, DateTime? modified = null)
-        {
-            return AddEntry(key, source, false, size, modified);
-        }
-
-
-        IArchiveEntry IWritableArchive.AddEntry(string key, Stream source, bool closeStream, long size, DateTime? modified)
-        {
-            return AddEntry(key, source, closeStream, size, modified);
-        }
-
-        public TEntry AddEntry(string key, Stream source, bool closeStream,
-                             long size = 0, DateTime? modified = null)
-        {
-            if (key.StartsWith("/")
-                || key.StartsWith("\\"))
-            {
-                key = key.Substring(1);
-            }
-            if (DoesKeyMatchExisting(key))
-            {
-                throw new ArchiveException("Cannot add entry with duplicate key: " + key);
-            }
-            var entry = CreateEntry(key, source, size, modified, closeStream);
-            newEntries.Add(entry);
-            RebuildModifiedCollection();
-            return entry;
-        }
-
-        private bool DoesKeyMatchExisting(string key)
-        {
-            foreach (var path in Entries.Select(x => x.Key))
-            {
-                var p = path.Replace('/','\\');
-                if (p.StartsWith("\\"))
-                {
-                    p = p.Substring(1);
-                }
-                return string.Equals(p, key, StringComparison.OrdinalIgnoreCase);
-            }
-            return false;
-        }
-
-        public void SaveTo(Stream stream, CompressionInfo compressionType)
-        {
-            //reset streams of new entries
-            newEntries.Cast<IWritableArchiveEntry>().ForEach(x => x.Stream.Seek(0, SeekOrigin.Begin));
-            SaveTo(stream, compressionType, OldEntries, newEntries);
-        }
-
-        protected TEntry CreateEntry(string key, Stream source, long size, DateTime? modified,
-            bool closeStream)
-        {
-            if (!source.CanRead || !source.CanSeek)
-            {
-                throw new ArgumentException("Streams must be readable and seekable to use the Writing Archive API");
-            }
-            return CreateEntryInternal(key, source, size, modified, closeStream);
-        }
-
-        protected abstract TEntry CreateEntryInternal(string key, Stream source, long size, DateTime? modified,
-                                              bool closeStream);
-
-        protected abstract void SaveTo(Stream stream, CompressionInfo compressionType,
-                                       IEnumerable<TEntry> oldEntries, IEnumerable<TEntry> newEntries);
-
-        public override void Dispose()
-        {
-            base.Dispose();
-            newEntries.Cast<Entry>().ForEach(x => x.Close());
-            removedEntries.Cast<Entry>().ForEach(x => x.Close());
-            modifiedEntries.Cast<Entry>().ForEach(x => x.Close());
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public abstract class AbstractWritableArchive<TEntry, TVolume> : AbstractArchive<TEntry, TVolume>, IWritableArchive
+        where TEntry : IArchiveEntry
+        where TVolume : IVolume
+    {
+        private readonly List<TEntry> newEntries = new List<TEntry>();
+        private readonly List<TEntry> removedEntries = new List<TEntry>();
+
+        private readonly List<TEntry> modifiedEntries = new List<TEntry>();
+        private bool hasModifications;
+
+        internal AbstractWritableArchive(ArchiveType type)
+            : base(type)
+        {
+        }
+
+        internal AbstractWritableArchive(ArchiveType type, Stream stream, Options options)
+            : base(type, stream.AsEnumerable(), options, null)
+        {
+        }
+
+#if !NO_FILE
+        internal AbstractWritableArchive(ArchiveType type, FileInfo fileInfo, Options options)
+            : base(type, fileInfo, options, null)
+        {
+        }
+#endif
+
+        public override ICollection<TEntry> Entries
+        {
+            get
+            {
+                if (hasModifications)
+                {
+                    return modifiedEntries;
+                }
+                return base.Entries;
+            }
+        }
+
+        private void RebuildModifiedCollection()
+        {
+            hasModifications = true;
+            newEntries.RemoveAll(v => removedEntries.Contains(v));
+            modifiedEntries.Clear();
+            modifiedEntries.AddRange(OldEntries.Concat(newEntries));
+        }
+
+        private IEnumerable<TEntry> OldEntries
+        {
+            get { return base.Entries.Where(x => !removedEntries.Contains(x)); }
+        }
+
+        public void RemoveEntry(TEntry entry)
+        {
+            if (!removedEntries.Contains(entry))
+            {
+                removedEntries.Add(entry);
+                RebuildModifiedCollection();
+            }
+        }
+        void IWritableArchive.RemoveEntry(IArchiveEntry entry)
+        {
+            RemoveEntry((TEntry)entry);
+        }
+
+        public TEntry AddEntry(string key, Stream source,
+                             long size = 0, DateTime? modified = null)
+        {
+            return AddEntry(key, source, false, size, modified);
+        }
+
+
+        IArchiveEntry IWritableArchive.AddEntry(string key, Stream source, bool closeStream, long size, DateTime? modified)
+        {
+            return AddEntry(key, source, closeStream, size, modified);
+        }
+
+        public TEntry AddEntry(string key, Stream source, bool closeStream,
+                             long size = 0, DateTime? modified = null)
+        {
+            if (key.StartsWith("/")
+                || key.StartsWith("\\"))
+            {
+                key = key.Substring(1);
+            }
+            if (DoesKeyMatchExisting(key))
+            {
+                throw new ArchiveException("Cannot add entry with duplicate key: " + key);
+            }
+            var entry = CreateEntry(key, source, size, modified, closeStream);
+            newEntries.Add(entry);
+            RebuildModifiedCollection();
+            return entry;
+        }
+
+        private bool DoesKeyMatchExisting(string key)
+        {
+            foreach (var path in Entries.Select(x => x.Key))
+            {
+                var p = path.Replace('/','\\');
+                if (p.StartsWith("\\"))
+                {
+                    p = p.Substring(1);
+                }
+                return string.Equals(p, key, StringComparison.OrdinalIgnoreCase);
+            }
+            return false;
+        }
+
+        public void SaveTo(Stream stream, CompressionInfo compressionType)
+        {
+            //reset streams of new entries
+            newEntries.Cast<IWritableArchiveEntry>().ForEach(x => x.Stream.Seek(0, SeekOrigin.Begin));
+            SaveTo(stream, compressionType, OldEntries, newEntries);
+        }
+
+        protected TEntry CreateEntry(string key, Stream source, long size, DateTime? modified,
+            bool closeStream)
+        {
+            if (!source.CanRead || !source.CanSeek)
+            {
+                throw new ArgumentException("Streams must be readable and seekable to use the Writing Archive API");
+            }
+            return CreateEntryInternal(key, source, size, modified, closeStream);
+        }
+
+        protected abstract TEntry CreateEntryInternal(string key, Stream source, long size, DateTime? modified,
+                                              bool closeStream);
+
+        protected abstract void SaveTo(Stream stream, CompressionInfo compressionType,
+                                       IEnumerable<TEntry> oldEntries, IEnumerable<TEntry> newEntries);
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            newEntries.Cast<Entry>().ForEach(x => x.Close());
+            removedEntries.Cast<Entry>().ForEach(x => x.Close());
+            modifiedEntries.Cast<Entry>().ForEach(x => x.Close());
+        }
+    }
 }

src/SharpCompress/Archive/ArchiveFactory.cs

@@ -1,172 +1,172 @@
-using System;
-using System.IO;
-using SharpCompress.Archive.GZip;
-using SharpCompress.Archive.Rar;
-using SharpCompress.Archive.SevenZip;
-using SharpCompress.Archive.Tar;
-using SharpCompress.Archive.Zip;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public class ArchiveFactory
-    {
-        /// <summary>
-        /// Opens an Archive for random access
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        /// <returns></returns>
-        public static IArchive Open(Stream stream, Options options = Options.KeepStreamsOpen)
-        {
-            stream.CheckNotNull("stream");
-            if (!stream.CanRead || !stream.CanSeek)
-            {
-                throw new ArgumentException("Stream should be readable and seekable");
-            }
-
-            if (ZipArchive.IsZipFile(stream, null))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return ZipArchive.Open(stream, options, null);
-            }
-            stream.Seek(0, SeekOrigin.Begin);
-            if (TarArchive.IsTarFile(stream))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return TarArchive.Open(stream, options);
-            }
-            stream.Seek(0, SeekOrigin.Begin);
-            if (SevenZipArchive.IsSevenZipFile(stream))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return SevenZipArchive.Open(stream, options);
-            }
-            stream.Seek(0, SeekOrigin.Begin);
-            if (GZipArchive.IsGZipFile(stream))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return GZipArchive.Open(stream, options);
-            }
-            stream.Seek(0, SeekOrigin.Begin);
-            if(RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
-            {
-               stream.Seek(0, SeekOrigin.Begin);
-               return RarArchive.Open(stream, options);
-            }
-            throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
-        }
-
-        public static IWritableArchive Create(ArchiveType type)
-        {
-            switch (type)
-            {
-                case ArchiveType.Zip:
-                    {
-                        return ZipArchive.Create();
-                    }
-                case ArchiveType.Tar:
-                    {
-                        return TarArchive.Create();
-                    }
-                case ArchiveType.GZip:
-                    {
-                        return GZipArchive.Create();
-                    }
-                default:
-                    {
-                        throw new NotSupportedException("Cannot create Archives of type: " + type);
-                    }
-            }
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        public static IArchive Open(string filePath)
-        {
-            return Open(filePath, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        public static IArchive Open(FileInfo fileInfo)
-        {
-            return Open(fileInfo, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        public static IArchive Open(string filePath, Options options)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        public static IArchive Open(FileInfo fileInfo, Options options)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            using (var stream = fileInfo.OpenRead())
-            {
-                if (ZipArchive.IsZipFile(stream, null))
-                {
-                    stream.Dispose();
-                    return ZipArchive.Open(fileInfo, options, null);
-                }
-                stream.Seek(0, SeekOrigin.Begin);
-                if (TarArchive.IsTarFile(stream))
-                {
-                    stream.Dispose();
-                    return TarArchive.Open(fileInfo, options);
-                }
-                stream.Seek(0, SeekOrigin.Begin);
-                if (SevenZipArchive.IsSevenZipFile(stream))
-                {
-                    stream.Dispose();
-                    return SevenZipArchive.Open(fileInfo, options);
-                }
-                stream.Seek(0, SeekOrigin.Begin);
-                if (GZipArchive.IsGZipFile(stream))
-                {
-                    stream.Dispose();
-                    return GZipArchive.Open(fileInfo, options);
-                }
-                stream.Seek(0, SeekOrigin.Begin);
-                if(RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
-                {
-                   stream.Dispose();
-                   return RarArchive.Open(fileInfo, options);
-                }
-                throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
-            }
-        }
-
-        /// <summary>
-        /// Extract to specific directory, retaining filename
-        /// </summary>
-        public static void WriteToDirectory(string sourceArchive, string destinationDirectory,
-                                            ExtractOptions options = ExtractOptions.Overwrite)
-        {
-            using (IArchive archive = Open(sourceArchive))
-            {
-                foreach (IArchiveEntry entry in archive.Entries)
-                {
-                    entry.WriteToDirectory(destinationDirectory, options);
-                }
-            }
-        }
-#endif
-    }
+using System;
+using System.IO;
+using SharpCompress.Archive.GZip;
+using SharpCompress.Archive.Rar;
+using SharpCompress.Archive.SevenZip;
+using SharpCompress.Archive.Tar;
+using SharpCompress.Archive.Zip;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public class ArchiveFactory
+    {
+        /// <summary>
+        /// Opens an Archive for random access
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IArchive Open(Stream stream, Options options = Options.KeepStreamsOpen)
+        {
+            stream.CheckNotNull("stream");
+            if (!stream.CanRead || !stream.CanSeek)
+            {
+                throw new ArgumentException("Stream should be readable and seekable");
+            }
+
+            if (ZipArchive.IsZipFile(stream, null))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return ZipArchive.Open(stream, options, null);
+            }
+            stream.Seek(0, SeekOrigin.Begin);
+            if (SevenZipArchive.IsSevenZipFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return SevenZipArchive.Open(stream, options);
+            }
+            stream.Seek(0, SeekOrigin.Begin);
+            if (GZipArchive.IsGZipFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return GZipArchive.Open(stream, options);
+            }
+            stream.Seek(0, SeekOrigin.Begin);
+            if (RarArchive.IsRarFile(stream, options))
+            {
+               stream.Seek(0, SeekOrigin.Begin);
+               return RarArchive.Open(stream, options);
+            }
+            stream.Seek(0, SeekOrigin.Begin);
+            if (TarArchive.IsTarFile(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                return TarArchive.Open(stream, options);
+            }
+            throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+        }
+
+        public static IWritableArchive Create(ArchiveType type)
+        {
+            switch (type)
+            {
+                case ArchiveType.Zip:
+                    {
+                        return ZipArchive.Create();
+                    }
+                case ArchiveType.Tar:
+                    {
+                        return TarArchive.Create();
+                    }
+                case ArchiveType.GZip:
+                    {
+                        return GZipArchive.Create();
+                    }
+                default:
+                    {
+                        throw new NotSupportedException("Cannot create Archives of type: " + type);
+                    }
+            }
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static IArchive Open(string filePath)
+        {
+            return Open(filePath, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        public static IArchive Open(FileInfo fileInfo)
+        {
+            return Open(fileInfo, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        public static IArchive Open(string filePath, Options options)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        public static IArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            using (var stream = fileInfo.OpenRead())
+            {
+                if (ZipArchive.IsZipFile(stream, null))
+                {
+                    stream.Dispose();
+                    return ZipArchive.Open(fileInfo, options, null);
+                }
+                stream.Seek(0, SeekOrigin.Begin);
+                if (SevenZipArchive.IsSevenZipFile(stream))
+                {
+                    stream.Dispose();
+                    return SevenZipArchive.Open(fileInfo, options);
+                }
+                stream.Seek(0, SeekOrigin.Begin);
+                if (GZipArchive.IsGZipFile(stream))
+                {
+                    stream.Dispose();
+                    return GZipArchive.Open(fileInfo, options);
+                }
+                stream.Seek(0, SeekOrigin.Begin);
+                if (RarArchive.IsRarFile(stream, options))
+                {
+                   stream.Dispose();
+                   return RarArchive.Open(fileInfo, options);
+                }
+                stream.Seek(0, SeekOrigin.Begin);
+                if (TarArchive.IsTarFile(stream))
+                {
+                    stream.Dispose();
+                    return TarArchive.Open(fileInfo, options);
+                }
+                throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+            }
+        }
+
+        /// <summary>
+        /// Extract to specific directory, retaining filename
+        /// </summary>
+        public static void WriteToDirectory(string sourceArchive, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            using (IArchive archive = Open(sourceArchive))
+            {
+                foreach (IArchiveEntry entry in archive.Entries)
+                {
+                    entry.WriteToDirectory(destinationDirectory, options);
+                }
+            }
+        }
+#endif
+    }
 }

src/SharpCompress/Archive/GZip/GZipArchive.cs

@@ -1,218 +1,218 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.GZip;
-using SharpCompress.Reader;
-using SharpCompress.Reader.GZip;
-using SharpCompress.Writer.GZip;
-
-namespace SharpCompress.Archive.GZip
-{
-    public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
-    {
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        public static GZipArchive Open(string filePath)
-        {
-            return Open(filePath, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        public static GZipArchive Open(FileInfo fileInfo)
-        {
-            return Open(fileInfo, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        public static GZipArchive Open(string filePath, Options options)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        public static GZipArchive Open(FileInfo fileInfo, Options options)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new GZipArchive(fileInfo, options);
-        }
-#endif
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        public static GZipArchive Open(Stream stream)
-        {
-            stream.CheckNotNull("stream");
-            return Open(stream, Options.None);
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        public static GZipArchive Open(Stream stream, Options options)
-        {
-            stream.CheckNotNull("stream");
-            return new GZipArchive(stream, options);
-        }
-
-        public static GZipArchive Create()
-        {
-            return new GZipArchive();
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        internal GZipArchive(FileInfo fileInfo, Options options)
-            : base(ArchiveType.GZip, fileInfo, options)
-        {
-        }
-
-        protected override IEnumerable<GZipVolume> LoadVolumes(FileInfo file, Options options)
-        {
-            return new GZipVolume(file, options).AsEnumerable();
-        }
-
-        public static bool IsGZipFile(string filePath)
-        {
-            return IsGZipFile(new FileInfo(filePath));
-        }
-
-        public static bool IsGZipFile(FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                return false;
-            }
-            using (Stream stream = fileInfo.OpenRead())
-            {
-                return IsGZipFile(stream);
-            }
-        }
-
-        public void SaveTo(string filePath)
-        {
-            SaveTo(new FileInfo(filePath));
-        }
-
-        public void SaveTo(FileInfo fileInfo)
-        {
-            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
-            {
-                SaveTo(stream);
-            }
-        }
-#endif
-
-        public static bool IsGZipFile(Stream stream)
-        {
-            // read the header on the first read
-            byte[] header = new byte[10];
-            int n = stream.Read(header, 0, header.Length);
-
-            // workitem 8501: handle edge case (decompress empty stream)
-            if (n == 0)
-                return false;
-
-            if (n != 10)
-                return false;
-
-            if (header[0] != 0x1F || header[1] != 0x8B || header[2] != 8)
-                return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        internal GZipArchive(Stream stream, Options options)
-            : base(ArchiveType.GZip, stream, options)
-        {
-        }
-
-        internal GZipArchive()
-            : base(ArchiveType.GZip)
-        {
-        }
-
-        public void SaveTo(Stream stream)
-        {
-            SaveTo(stream, CompressionType.GZip);
-        }
-
-        protected override GZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
-                                                        bool closeStream)
-        {
-            if (Entries.Any())
-            {
-                throw new InvalidOperationException("Only one entry is allowed in a GZip Archive");
-            }
-            return new GZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
-        }
-
-        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
-                                       IEnumerable<GZipArchiveEntry> oldEntries,
-                                       IEnumerable<GZipArchiveEntry> newEntries)
-        {
-            if (Entries.Count > 1)
-            {
-                throw new InvalidOperationException("Only one entry is allowed in a GZip Archive");
-            }
-            using (var writer = new GZipWriter(stream))
-            {
-                foreach (var entry in oldEntries.Concat(newEntries)
-                                                .Where(x => !x.IsDirectory))
-                {
-                    using (var entryStream = entry.OpenEntryStream())
-                    {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime);
-                    }
-                }
-            }
-        }
-
-        protected override IEnumerable<GZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
-        {
-            return new GZipVolume(streams.First(), options).AsEnumerable();
-        }
-
-        protected override IEnumerable<GZipArchiveEntry> LoadEntries(IEnumerable<GZipVolume> volumes)
-        {
-            Stream stream = volumes.Single().Stream;
-            yield return new GZipArchiveEntry(this, new GZipFilePart(stream));
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            var stream = Volumes.Single().Stream;
-            stream.Position = 0;
-            return GZipReader.Open(stream);
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.GZip;
+using SharpCompress.Reader;
+using SharpCompress.Reader.GZip;
+using SharpCompress.Writer.GZip;
+
+namespace SharpCompress.Archive.GZip
+{
+    public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
+    {
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static GZipArchive Open(string filePath)
+        {
+            return Open(filePath, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        public static GZipArchive Open(FileInfo fileInfo)
+        {
+            return Open(fileInfo, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        public static GZipArchive Open(string filePath, Options options)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        public static GZipArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new GZipArchive(fileInfo, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        public static GZipArchive Open(Stream stream)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream, Options.None);
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        public static GZipArchive Open(Stream stream, Options options)
+        {
+            stream.CheckNotNull("stream");
+            return new GZipArchive(stream, options);
+        }
+
+        public static GZipArchive Create()
+        {
+            return new GZipArchive();
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        internal GZipArchive(FileInfo fileInfo, Options options)
+            : base(ArchiveType.GZip, fileInfo, options)
+        {
+        }
+
+        protected override IEnumerable<GZipVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            return new GZipVolume(file, options).AsEnumerable();
+        }
+
+        public static bool IsGZipFile(string filePath)
+        {
+            return IsGZipFile(new FileInfo(filePath));
+        }
+
+        public static bool IsGZipFile(FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsGZipFile(stream);
+            }
+        }
+
+        public void SaveTo(string filePath)
+        {
+            SaveTo(new FileInfo(filePath));
+        }
+
+        public void SaveTo(FileInfo fileInfo)
+        {
+            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+            {
+                SaveTo(stream);
+            }
+        }
+#endif
+
+        public static bool IsGZipFile(Stream stream)
+        {
+            // read the header on the first read
+            byte[] header = new byte[10];
+            int n = stream.Read(header, 0, header.Length);
+
+            // workitem 8501: handle edge case (decompress empty stream)
+            if (n == 0)
+                return false;
+
+            if (n != 10)
+                return false;
+
+            if (header[0] != 0x1F || header[1] != 0x8B || header[2] != 8)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        internal GZipArchive(Stream stream, Options options)
+            : base(ArchiveType.GZip, stream, options)
+        {
+        }
+
+        internal GZipArchive()
+            : base(ArchiveType.GZip)
+        {
+        }
+
+        public void SaveTo(Stream stream)
+        {
+            SaveTo(stream, CompressionType.GZip);
+        }
+
+        protected override GZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
+                                                        bool closeStream)
+        {
+            if (Entries.Any())
+            {
+                throw new InvalidOperationException("Only one entry is allowed in a GZip Archive");
+            }
+            return new GZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
+        }
+
+        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
+                                       IEnumerable<GZipArchiveEntry> oldEntries,
+                                       IEnumerable<GZipArchiveEntry> newEntries)
+        {
+            if (Entries.Count > 1)
+            {
+                throw new InvalidOperationException("Only one entry is allowed in a GZip Archive");
+            }
+            using (var writer = new GZipWriter(stream))
+            {
+                foreach (var entry in oldEntries.Concat(newEntries)
+                                                .Where(x => !x.IsDirectory))
+                {
+                    using (var entryStream = entry.OpenEntryStream())
+                    {
+                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime);
+                    }
+                }
+            }
+        }
+
+        protected override IEnumerable<GZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            return new GZipVolume(streams.First(), options).AsEnumerable();
+        }
+
+        protected override IEnumerable<GZipArchiveEntry> LoadEntries(IEnumerable<GZipVolume> volumes)
+        {
+            Stream stream = volumes.Single().Stream;
+            yield return new GZipArchiveEntry(this, new GZipFilePart(stream));
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.Single().Stream;
+            stream.Position = 0;
+            return GZipReader.Open(stream);
+        }
+    }
 }

src/SharpCompress/Archive/GZip/GZipArchiveEntry.cs

@@ -1,31 +1,31 @@
-using System.IO;
-using System.Linq;
-using SharpCompress.Common.GZip;
-
-namespace SharpCompress.Archive.GZip
-{
-    public class GZipArchiveEntry : GZipEntry, IArchiveEntry
-    {
-
-        internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part)
-            : base(part)
-        {
-            Archive = archive;
-        }
-
-        public virtual Stream OpenEntryStream()
-        {
-            return Parts.Single().GetCompressedStream();
-        }
-
-        #region IArchiveEntry Members
-        public IArchive Archive { get; private set; }
-
-        public bool IsComplete
-        {
-            get { return true; }
-        }
-
-        #endregion
-    }
+using System.IO;
+using System.Linq;
+using SharpCompress.Common.GZip;
+
+namespace SharpCompress.Archive.GZip
+{
+    public class GZipArchiveEntry : GZipEntry, IArchiveEntry
+    {
+
+        internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part)
+            : base(part)
+        {
+            Archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+        public IArchive Archive { get; private set; }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
 }

src/SharpCompress/Archive/GZip/GZipWritableArchiveEntry.cs

@@ -1,111 +1,111 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive.GZip
-{
-    internal class GZipWritableArchiveEntry : GZipArchiveEntry, IWritableArchiveEntry
-    {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
-
-        internal GZipWritableArchiveEntry(GZipArchive archive, Stream stream,
-                                          string path, long size, DateTime? lastModified, bool closeStream)
-            : base(archive, null)
-        {
-            this.stream = stream;
-            this.path = path;
-            this.size = size;
-            this.lastModified = lastModified;
-            this.closeStream = closeStream;
-        }
-
-        public override long Crc
-        {
-            get { return 0; }
-        }
-
-        public override string Key
-        {
-            get { return path; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return 0; }
-        }
-
-        public override long Size
-        {
-            get { return size; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return lastModified; }
-        }
-
-        public override DateTime? CreatedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? LastAccessedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? ArchivedTime
-        {
-            get { return null; }
-        }
-
-        public override bool IsEncrypted
-        {
-            get { return false; }
-        }
-
-        public override bool IsDirectory
-        {
-            get { return false; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
-
-        public override Stream OpenEntryStream()
-        {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
-        }
-
-        internal override void Close()
-        {
-            if (closeStream)
-            {
-                stream.Dispose();
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.GZip
+{
+    internal class GZipWritableArchiveEntry : GZipArchiveEntry, IWritableArchiveEntry
+    {
+        private readonly string path;
+        private readonly long size;
+        private readonly DateTime? lastModified;
+        private readonly bool closeStream;
+        private readonly Stream stream;
+
+        internal GZipWritableArchiveEntry(GZipArchive archive, Stream stream,
+                                          string path, long size, DateTime? lastModified, bool closeStream)
+            : base(archive, null)
+        {
+            this.stream = stream;
+            this.path = path;
+            this.size = size;
+            this.lastModified = lastModified;
+            this.closeStream = closeStream;
+        }
+
+        public override long Crc
+        {
+            get { return 0; }
+        }
+
+        public override string Key
+        {
+            get { return path; }
+        }
+
+        public override long CompressedSize
+        {
+            get { return 0; }
+        }
+
+        public override long Size
+        {
+            get { return size; }
+        }
+
+        public override DateTime? LastModifiedTime
+        {
+            get { return lastModified; }
+        }
+
+        public override DateTime? CreatedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? LastAccessedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? ArchivedTime
+        {
+            get { return null; }
+        }
+
+        public override bool IsEncrypted
+        {
+            get { return false; }
+        }
+
+        public override bool IsDirectory
+        {
+            get { return false; }
+        }
+
+        public override bool IsSplit
+        {
+            get { return false; }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        Stream IWritableArchiveEntry.Stream
+        {
+            get
+            {
+                return stream;
+            }
+        }
+
+        public override Stream OpenEntryStream()
+        {
+            //ensure new stream is at the start, this could be reset
+            stream.Seek(0, SeekOrigin.Begin);
+            return new NonDisposingStream(stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream)
+            {
+                stream.Dispose();
+            }
+        }
+    }
 }

src/SharpCompress/Archive/IArchive.Extensions.cs

@@ -1,22 +1,22 @@
-using System.Linq;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public static class IArchiveExtensions
-    {
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Extract to specific directory, retaining filename
-        /// </summary>
-        public static void WriteToDirectory(this IArchive archive, string destinationDirectory,
-                                            ExtractOptions options = ExtractOptions.Overwrite)
-        {
-            foreach (IArchiveEntry entry in archive.Entries.Where(x => !x.IsDirectory))
-            {
-                entry.WriteToDirectory(destinationDirectory, options);
-            }
-        }
-#endif
-    }
+using System.Linq;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public static class IArchiveExtensions
+    {
+#if !NO_FILE
+        /// <summary>
+        /// Extract to specific directory, retaining filename
+        /// </summary>
+        public static void WriteToDirectory(this IArchive archive, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            foreach (IArchiveEntry entry in archive.Entries.Where(x => !x.IsDirectory))
+            {
+                entry.WriteToDirectory(destinationDirectory, options);
+            }
+        }
+#endif
+    }
 }

src/SharpCompress/Archive/IArchive.cs

@@ -1,49 +1,49 @@
-using System;
-using System.Collections.Generic;
-using SharpCompress.Common;
-using SharpCompress.Reader;
-
-namespace SharpCompress.Archive
-{
-    public interface IArchive : IDisposable
-    {
-        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
-        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
-
-        event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
-        event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
-
-        IEnumerable<IArchiveEntry> Entries { get; }
-        IEnumerable<IVolume> Volumes { get; }
-
-        ArchiveType Type { get; }
-
-        /// <summary>
-        /// Use this method to extract all entries in an archive in order.
-        /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
-        /// extracted sequentially for the best performance.
-        /// </summary>
-        IReader ExtractAllEntries();
-
-        /// <summary>
-        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
-        /// Rar Archives can be SOLID while all 7Zip archives are considered SOLID.
-        /// </summary>
-        bool IsSolid { get; }
-
-        /// <summary>
-        /// This checks to see if all the known entries have IsComplete = true
-        /// </summary>
-        bool IsComplete { get; }
-
-        /// <summary>
-        /// The total size of the files compressed in the archive.
-        /// </summary>
-        long TotalSize { get; }
-
-        /// <summary>
-        /// The total size of the files as uncompressed in the archive.
-        /// </summary>
-        long TotalUncompressSize { get; }
-    }
+using System;
+using System.Collections.Generic;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Archive
+{
+    public interface IArchive : IDisposable
+    {
+        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionBegin;
+        event EventHandler<ArchiveExtractionEventArgs<IArchiveEntry>> EntryExtractionEnd;
+
+        event EventHandler<CompressedBytesReadEventArgs> CompressedBytesRead;
+        event EventHandler<FilePartExtractionBeginEventArgs> FilePartExtractionBegin;
+
+        IEnumerable<IArchiveEntry> Entries { get; }
+        IEnumerable<IVolume> Volumes { get; }
+
+        ArchiveType Type { get; }
+
+        /// <summary>
+        /// Use this method to extract all entries in an archive in order.
+        /// This is primarily for SOLID Rar Archives or 7Zip Archives as they need to be 
+        /// extracted sequentially for the best performance.
+        /// </summary>
+        IReader ExtractAllEntries();
+
+        /// <summary>
+        /// Archive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// Rar Archives can be SOLID while all 7Zip archives are considered SOLID.
+        /// </summary>
+        bool IsSolid { get; }
+
+        /// <summary>
+        /// This checks to see if all the known entries have IsComplete = true
+        /// </summary>
+        bool IsComplete { get; }
+
+        /// <summary>
+        /// The total size of the files compressed in the archive.
+        /// </summary>
+        long TotalSize { get; }
+
+        /// <summary>
+        /// The total size of the files as uncompressed in the archive.
+        /// </summary>
+        long TotalUncompressSize { get; }
+    }
 }

src/SharpCompress/Archive/IArchiveEntry.Extensions.cs

@@ -1,123 +1,90 @@
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive
-{
-    public static class IArchiveEntryExtensions
-    {
-        public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWriteTo)
-        {
-            if (archiveEntry.Archive.Type == ArchiveType.Rar && archiveEntry.Archive.IsSolid)
-            {
-                throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
-            }
-
-            if (archiveEntry.IsDirectory)
-            {
-                throw new ExtractionException("Entry is a file directory and cannot be extracted.");
-            }
-
-            var streamListener = archiveEntry.Archive as IArchiveExtractionListener;
-            streamListener.EnsureEntriesLoaded();
-            streamListener.FireEntryExtractionBegin(archiveEntry);
-            streamListener.FireFilePartExtractionBegin(archiveEntry.Key, archiveEntry.Size, archiveEntry.CompressedSize);
-            var entryStream = archiveEntry.OpenEntryStream();
-            if (entryStream == null)
-            {
-                return;
-            }
-            using(entryStream)
-            using (Stream s = new ListeningStream(streamListener, entryStream))
-            {
-                s.TransferTo(streamToWriteTo);
-            }
-            streamListener.FireEntryExtractionEnd(archiveEntry);
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Extract to specific directory, retaining filename
-        /// </summary>
-        public static void WriteToDirectory(this IArchiveEntry entry, string destinationDirectory,
-                                            ExtractOptions options = ExtractOptions.Overwrite)
-        {
-            string destinationFileName;
-            string file = Path.GetFileName(entry.Key);
-
-
-            if (options.HasFlag(ExtractOptions.ExtractFullPath))
-            {
-                string folder = Path.GetDirectoryName(entry.Key);
-                string destdir = Path.Combine(destinationDirectory, folder);
-                if (!Directory.Exists(destdir))
-                {
-                    Directory.CreateDirectory(destdir);
-                }
-                destinationFileName = Path.Combine(destdir, file);
-            }
-            else
-            {
-                destinationFileName = Path.Combine(destinationDirectory, file);
-            }
-            entry.WriteToFile(destinationFileName, options);
-        }
-
-        /// <summary>
-        /// Extract to specific file
-        /// </summary>
-        public static void WriteToFile(this IArchiveEntry entry, string destinationFileName,
-                                       ExtractOptions options = ExtractOptions.Overwrite)
-        {
-            if (entry.IsDirectory)
-            {
-                return;
-            }
-            FileMode fm = FileMode.Create;
-
-            if (!options.HasFlag(ExtractOptions.Overwrite))
-            {
-                fm = FileMode.CreateNew;
-            }
-            using (FileStream fs = File.Open(destinationFileName, fm))
-            {
-                entry.WriteTo(fs);
-            }
-
-            if (options.HasFlag(ExtractOptions.PreserveFileTime) || options.HasFlag(ExtractOptions.PreserveAttributes))
-            {
-                // update file time to original packed time
-                FileInfo nf = new FileInfo(destinationFileName);
-                if (nf.Exists)
-                {
-                    if (options.HasFlag(ExtractOptions.PreserveFileTime))
-                    {
-                        if (entry.CreatedTime.HasValue)
-                        {
-                            nf.CreationTime = entry.CreatedTime.Value;
-                        }
-
-                        if (entry.LastModifiedTime.HasValue)
-                        {
-                            nf.LastWriteTime = entry.LastModifiedTime.Value;
-                        }
-
-                        if (entry.LastAccessedTime.HasValue)
-                        {
-                            nf.LastAccessTime = entry.CreatedTime.Value;
-                        }
-                    }
-
-                    if (options.HasFlag(ExtractOptions.PreserveAttributes))
-                    {
-                        if (entry.Attrib.HasValue)
-                        {
-                            nf.Attributes = (FileAttributes)System.Enum.ToObject(typeof(FileAttributes), entry.Attrib.Value);
-                        }
-                    }
-                }
-            }
-        }
-#endif
-    }
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive
+{
+    public static class IArchiveEntryExtensions
+    {
+        public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWriteTo)
+        {
+            if (archiveEntry.Archive.Type == ArchiveType.Rar && archiveEntry.Archive.IsSolid)
+            {
+                throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
+            }
+
+            if (archiveEntry.IsDirectory)
+            {
+                throw new ExtractionException("Entry is a file directory and cannot be extracted.");
+            }
+
+            var streamListener = archiveEntry.Archive as IArchiveExtractionListener;
+            streamListener.EnsureEntriesLoaded();
+            streamListener.FireEntryExtractionBegin(archiveEntry);
+            streamListener.FireFilePartExtractionBegin(archiveEntry.Key, archiveEntry.Size, archiveEntry.CompressedSize);
+            var entryStream = archiveEntry.OpenEntryStream();
+            if (entryStream == null)
+            {
+                return;
+            }
+            using (entryStream)
+            using (Stream s = new ListeningStream(streamListener, entryStream))
+            {
+                s.TransferTo(streamToWriteTo);
+            }
+            streamListener.FireEntryExtractionEnd(archiveEntry);
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Extract to specific directory, retaining filename
+        /// </summary>
+        public static void WriteToDirectory(this IArchiveEntry entry, string destinationDirectory,
+                                            ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            string destinationFileName;
+            string file = Path.GetFileName(entry.Key);
+
+
+            if (options.HasFlag(ExtractOptions.ExtractFullPath))
+            {
+                string folder = Path.GetDirectoryName(entry.Key);
+                string destdir = Path.Combine(destinationDirectory, folder);
+                if (!Directory.Exists(destdir))
+                {
+                    Directory.CreateDirectory(destdir);
+                }
+                destinationFileName = Path.Combine(destdir, file);
+            }
+            else
+            {
+                destinationFileName = Path.Combine(destinationDirectory, file);
+            }
+            if (!entry.IsDirectory)
+            {
+                entry.WriteToFile(destinationFileName, options);
+            }
+        }
+
+        /// <summary>
+        /// Extract to specific file
+        /// </summary>
+        public static void WriteToFile(this IArchiveEntry entry, string destinationFileName,
+                                       ExtractOptions options = ExtractOptions.Overwrite)
+        {
+            FileMode fm = FileMode.Create;
+
+            if (!options.HasFlag(ExtractOptions.Overwrite))
+            {
+                fm = FileMode.CreateNew;
+            }
+            using (FileStream fs = File.Open(destinationFileName, fm))
+            {
+                entry.WriteTo(fs);
+            }
+
+            entry.PreserveExtractionOptions(destinationFileName, options);
+        }
+#endif
+    }
 }

src/SharpCompress/Archive/IArchiveEntry.cs

@@ -1,24 +1,24 @@
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public interface IArchiveEntry : IEntry
-    {
-        /// <summary>
-        /// Opens the current entry as a stream that will decompress as it is read.
-        /// Read the entire stream or use SkipEntry on EntryStream.
-        /// </summary>
-        Stream OpenEntryStream();
-
-        /// <summary>
-        /// The archive can find all the parts of the archive needed to extract this entry.
-        /// </summary>
-        bool IsComplete { get; }
-
-        /// <summary>
-        /// The archive instance this entry belongs to
-        /// </summary>
-        IArchive Archive { get; }
-    }
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public interface IArchiveEntry : IEntry
+    {
+        /// <summary>
+        /// Opens the current entry as a stream that will decompress as it is read.
+        /// Read the entire stream or use SkipEntry on EntryStream.
+        /// </summary>
+        Stream OpenEntryStream();
+
+        /// <summary>
+        /// The archive can find all the parts of the archive needed to extract this entry.
+        /// </summary>
+        bool IsComplete { get; }
+
+        /// <summary>
+        /// The archive instance this entry belongs to
+        /// </summary>
+        IArchive Archive { get; }
+    }
 }

src/SharpCompress/Archive/IArchiveExtractionListener.cs

@@ -1,11 +1,11 @@
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    internal interface IArchiveExtractionListener : IExtractionListener
-    {
-        void EnsureEntriesLoaded();
-        void FireEntryExtractionBegin(IArchiveEntry entry);
-        void FireEntryExtractionEnd(IArchiveEntry entry);
-    }
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    internal interface IArchiveExtractionListener : IExtractionListener
+    {
+        void EnsureEntriesLoaded();
+        void FireEntryExtractionBegin(IArchiveEntry entry);
+        void FireEntryExtractionEnd(IArchiveEntry entry);
+    }
 }

src/SharpCompress/Archive/IWritableArchive.Extensions.cs

@@ -12,7 +12,7 @@ namespace SharpCompress.Archive
             writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
         }
 
-#if !PORTABLE && !NETFX_CORE
+#if !NO_FILE
 
         public static void AddEntry(this IWritableArchive writableArchive,
                                                      string entryPath, string filePath)
@@ -60,7 +60,7 @@ namespace SharpCompress.Archive
             this IWritableArchive writableArchive,
             string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
         {
-#if NET2
+#if NET35
             foreach (var path in Directory.GetFiles(filePath, searchPattern, searchOption))
 #else
             foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))

src/SharpCompress/Archive/IWritableArchiveEntry.cs

@@ -1,9 +1,9 @@
-using System.IO;
-
-namespace SharpCompress.Archive
-{
-    internal interface IWritableArchiveEntry
-    {
-        Stream Stream { get; }
-    }
+using System.IO;
+
+namespace SharpCompress.Archive
+{
+    internal interface IWritableArchiveEntry
+    {
+        Stream Stream { get; }
+    }
 }

src/SharpCompress/Archive/Rar/FileInfoRarArchiveVolume.cs

@@ -1,46 +1,48 @@
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive.Rar
-{
-    /// <summary>
-    /// A rar part based on a FileInfo object
-    /// </summary>
-    internal class FileInfoRarArchiveVolume : RarVolume
-    {
-        internal FileInfoRarArchiveVolume(FileInfo fileInfo, string password, Options options)
-            : base(StreamingMode.Seekable, fileInfo.OpenRead(), password, FixOptions(options))
-        {
-            FileInfo = fileInfo;
-            FileParts = base.GetVolumeFileParts().ToReadOnly();
-        }
-
-        private static Options FixOptions(Options options)
-        {
-            //make sure we're closing streams with fileinfo
-            if (options.HasFlag(Options.KeepStreamsOpen))
-            {
-                options = (Options) FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return options;
-        }
-
-        internal ReadOnlyCollection<RarFilePart> FileParts { get; private set; }
-
-        internal FileInfo FileInfo { get; private set; }
-
-        internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
-        {
-            return new FileInfoRarFilePart(this, markHeader, fileHeader, FileInfo);
-        }
-
-        internal override IEnumerable<RarFilePart> ReadFileParts()
-        {
-            return FileParts;
-        }
-    }
-}
+#if !NO_FILE
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Rar
+{
+    /// <summary>
+    /// A rar part based on a FileInfo object
+    /// </summary>
+    internal class FileInfoRarArchiveVolume : RarVolume
+    {
+        internal FileInfoRarArchiveVolume(FileInfo fileInfo, string password, Options options)
+            : base(StreamingMode.Seekable, fileInfo.OpenRead(), password, FixOptions(options))
+        {
+            FileInfo = fileInfo;
+            FileParts = base.GetVolumeFileParts().ToReadOnly();
+        }
+
+        private static Options FixOptions(Options options)
+        {
+            //make sure we're closing streams with fileinfo
+            if (options.HasFlag(Options.KeepStreamsOpen))
+            {
+                options = (Options) FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            }
+            return options;
+        }
+
+        internal ReadOnlyCollection<RarFilePart> FileParts { get; private set; }
+
+        internal FileInfo FileInfo { get; private set; }
+
+        internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
+        {
+            return new FileInfoRarFilePart(this, markHeader, fileHeader, FileInfo);
+        }
+
+        internal override IEnumerable<RarFilePart> ReadFileParts()
+        {
+            return FileParts;
+        }
+    }
+}
+#endif

src/SharpCompress/Archive/Rar/FileInfoRarFilePart.cs

@@ -1,29 +1,28 @@
-using System.IO;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal class FileInfoRarFilePart : SeekableFilePart
-    {
-        private readonly FileInfoRarArchiveVolume volume;
-
-        internal FileInfoRarFilePart(FileInfoRarArchiveVolume volume, MarkHeader mh, FileHeader fh, FileInfo fi)
-            : base(mh, fh, volume.Stream, volume.Password)
-        {
-            this.volume = volume;
-            FileInfo = fi;
-        }
-
-        internal FileInfo FileInfo { get; private set; }
-
-        internal override string FilePartName
-        {
-            get
-            {
-                return "Rar File: " + FileInfo.FullName
-                       + " File Entry: " + FileHeader.FileName;
-            }
-        }
-    }
-}
+#if !NO_FILE
+using System.IO;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class FileInfoRarFilePart : SeekableFilePart
+    {
+        internal FileInfoRarFilePart(FileInfoRarArchiveVolume volume, MarkHeader mh, FileHeader fh, FileInfo fi)
+            : base(mh, fh, volume.Stream, volume.Password)
+        {
+            FileInfo = fi;
+        }
+
+        internal FileInfo FileInfo { get; private set; }
+
+        internal override string FilePartName
+        {
+            get
+            {
+                return "Rar File: " + FileInfo.FullName
+                       + " File Entry: " + FileHeader.FileName;
+            }
+        }
+    }
+}
+#endif

src/SharpCompress/Archive/Rar/RarArchive.Extensions.cs

@@ -1,23 +1,23 @@
-using System.Linq;
-
-namespace SharpCompress.Archive.Rar
-{
-    public static class RarArchiveExtensions
-    {
-        /// <summary>
-        /// RarArchive is the first volume of a multi-part archive.  If MultipartVolume is true and IsFirstVolume is false then the first volume file must be missing.
-        /// </summary>
-        public static bool IsFirstVolume(this RarArchive archive)
-        {
-            return archive.Volumes.First().IsFirstVolume;
-        }
-
-        /// <summary>
-        /// RarArchive is part of a multi-part archive.
-        /// </summary>
-        public static bool IsMultipartVolume(this RarArchive archive)
-        {
-            return archive.Volumes.First().IsMultiVolume;
-        }
-    }
+using System.Linq;
+
+namespace SharpCompress.Archive.Rar
+{
+    public static class RarArchiveExtensions
+    {
+        /// <summary>
+        /// RarArchive is the first volume of a multi-part archive.  If MultipartVolume is true and IsFirstVolume is false then the first volume file must be missing.
+        /// </summary>
+        public static bool IsFirstVolume(this RarArchive archive)
+        {
+            return archive.Volumes.First().IsFirstVolume;
+        }
+
+        /// <summary>
+        /// RarArchive is part of a multi-part archive.
+        /// </summary>
+        public static bool IsMultipartVolume(this RarArchive archive)
+        {
+            return archive.Volumes.First().IsMultiVolume;
+        }
+    }
 }

src/SharpCompress/Archive/Rar/RarArchive.cs

@@ -1,170 +1,166 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-using SharpCompress.Compressor.Rar;
-using SharpCompress.IO;
-using SharpCompress.Reader;
-using SharpCompress.Reader.Rar;
-
-namespace SharpCompress.Archive.Rar
-{
-    public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
-    {
-        private readonly Unpack unpack = new Unpack();
-
-        internal Unpack Unpack
-        {
-            get { return unpack; }
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal RarArchive(FileInfo fileInfo, Options options, string password)
-            : base(ArchiveType.Rar, fileInfo, options, password)
-        {
-        }
-
-        protected override IEnumerable<RarVolume> LoadVolumes(FileInfo file, Options options)
-        {
-            return RarArchiveVolumeFactory.GetParts(file, Password, options);
-        }
-#endif
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="streams"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal RarArchive(IEnumerable<Stream> streams, Options options, string password)
-            : base(ArchiveType.Rar, streams, options, password)
-        {
-        }
-
-        protected override IEnumerable<RarArchiveEntry> LoadEntries(IEnumerable<RarVolume> volumes)
-        {
-            return RarArchiveEntryFactory.GetEntries(this, volumes);
-        }
-
-        protected override IEnumerable<RarVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
-        {
-            return RarArchiveVolumeFactory.GetParts(streams, Password, options);
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            var stream = Volumes.First().Stream;
-            stream.Position = 0;
-            return RarReader.Open(stream);
-        }
-
-        public override bool IsSolid
-        {
-            get { return Volumes.First().IsSolidArchive; }
-        }
-
-        #region Creation
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(string filePath, Options options = Options.None, string password = null)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options, password);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(FileInfo fileInfo, Options options = Options.None, string password = null)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new RarArchive(fileInfo, options, password);
-        }
-#endif
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(Stream stream, Options options = Options.KeepStreamsOpen, string password = null)
-        {
-            stream.CheckNotNull("stream");
-            return Open(stream.AsEnumerable(), options, password);
-        }
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="streams"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static RarArchive Open(IEnumerable<Stream> streams, Options options = Options.KeepStreamsOpen, string password = null)
-        {
-            streams.CheckNotNull("streams");
-            return new RarArchive(streams, options, password);
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        public static bool IsRarFile(string filePath)
-        {
-            return IsRarFile(new FileInfo(filePath));
-        }
-
-        public static bool IsRarFile(FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                return false;
-            }
-            using (Stream stream = fileInfo.OpenRead())
-            {
-                return IsRarFile(stream);
-            }
-        }
-#endif
-
-        public static bool IsRarFile(Stream stream)
-        {
-            return IsRarFile(stream, Options.None);
-        }
-
-        public static bool IsRarFile(Stream stream, Options options)
-        {
-            try
-            {
-                var headerFactory = new RarHeaderFactory(StreamingMode.Seekable, options);
-                RarHeader header = headerFactory.ReadHeaders(stream).FirstOrDefault();
-                if (header == null)
-                {
-                    return false;
-                }
-                return Enum.IsDefined(typeof (HeaderType), header.HeaderType);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        #endregion
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.Compressor.Rar;
+using SharpCompress.IO;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Rar;
+
+namespace SharpCompress.Archive.Rar
+{
+    public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
+    {
+        private readonly Unpack unpack = new Unpack();
+
+        internal Unpack Unpack
+        {
+            get { return unpack; }
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal RarArchive(FileInfo fileInfo, Options options, string password)
+            : base(ArchiveType.Rar, fileInfo, options, password)
+        {
+        }
+
+        protected override IEnumerable<RarVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            return RarArchiveVolumeFactory.GetParts(file, Password, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal RarArchive(IEnumerable<Stream> streams, Options options, string password)
+            : base(ArchiveType.Rar, streams, options, password)
+        {
+        }
+
+        protected override IEnumerable<RarArchiveEntry> LoadEntries(IEnumerable<RarVolume> volumes)
+        {
+            return RarArchiveEntryFactory.GetEntries(this, volumes);
+        }
+
+        protected override IEnumerable<RarVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            return RarArchiveVolumeFactory.GetParts(streams, Password, options);
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.First().Stream;
+            stream.Position = 0;
+            return RarReader.Open(stream, Password);
+        }
+
+        public override bool IsSolid
+        {
+            get { return Volumes.First().IsSolidArchive; }
+        }
+
+        #region Creation
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static RarArchive Open(string filePath, Options options = Options.None, string password = null)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options, password);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static RarArchive Open(FileInfo fileInfo, Options options = Options.None, string password = null)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new RarArchive(fileInfo, options, password);
+        }
+#endif
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static RarArchive Open(Stream stream, Options options = Options.KeepStreamsOpen, string password = null)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream.AsEnumerable(), options, password);
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static RarArchive Open(IEnumerable<Stream> streams, Options options = Options.KeepStreamsOpen, string password = null)
+        {
+            streams.CheckNotNull("streams");
+            return new RarArchive(streams, options, password);
+        }
+
+#if !NO_FILE
+        public static bool IsRarFile(string filePath)
+        {
+            return IsRarFile(new FileInfo(filePath));
+        }
+
+        public static bool IsRarFile(FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsRarFile(stream);
+            }
+        }
+#endif
+
+        public static bool IsRarFile(Stream stream)
+        {
+            return IsRarFile(stream, Options.None);
+        }
+
+        public static bool IsRarFile(Stream stream, Options options)
+        {
+            try
+            {
+                var headerFactory = new RarHeaderFactory(StreamingMode.Seekable, options);
+                var markHeader = headerFactory.ReadHeaders(stream).FirstOrDefault() as MarkHeader;
+                return markHeader != null && markHeader.IsValid();
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        #endregion
+    }
 }

src/SharpCompress/Archive/Rar/RarArchiveEntry.cs

@@ -1,93 +1,97 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-using SharpCompress.Compressor.Rar;
-
-namespace SharpCompress.Archive.Rar
-{
-    public class RarArchiveEntry : RarEntry, IArchiveEntry
-    {
-        private readonly ICollection<RarFilePart> parts;
-        private readonly RarArchive archive;
-
-        internal RarArchiveEntry(RarArchive archive, IEnumerable<RarFilePart> parts)
-        {
-            this.parts = parts.ToList();
-            this.archive = archive;
-        }
-
-        public override CompressionType CompressionType
-        {
-            get { return CompressionType.Rar; }
-        }
-
-        public IArchive Archive
-        {
-            get
-            {
-                return archive;
-            }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { return parts.Cast<FilePart>(); }
-        }
-
-        internal override FileHeader FileHeader
-        {
-            get { return parts.First().FileHeader; }
-        }
-
-        public override long Crc
-        {
-            get
-            {
-                CheckIncomplete();
-                return parts.Select(fp => fp.FileHeader)
-                    .Single(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER)).FileCRC;
-            }
-        }
-
-
-        public override long Size
-        {
-            get
-            {
-                CheckIncomplete();
-                return parts.First().FileHeader.UncompressedSize;
-            }
-        }
-
-        public override long CompressedSize
-        {
-            get
-            {
-                CheckIncomplete();
-                return parts.Aggregate(0L, (total, fp) => { return total + fp.FileHeader.CompressedSize; });
-            }
-        }
-
-        public Stream OpenEntryStream()
-        {
-            return new RarStream(archive.Unpack, FileHeader,
-                                 new MultiVolumeReadOnlyStream(Parts.Cast<RarFilePart>(), archive));
-        }
-
-        public bool IsComplete
-        {
-            get { return parts.Select(fp => fp.FileHeader).Any(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER)); }
-        }
-
-        private void CheckIncomplete()
-        {
-            if (!IsComplete)
-            {
-                throw new IncompleteArchiveException("ArchiveEntry is incomplete and cannot perform this operation.");
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.Compressor.Rar;
+
+namespace SharpCompress.Archive.Rar
+{
+    public class RarArchiveEntry : RarEntry, IArchiveEntry
+    {
+        private readonly ICollection<RarFilePart> parts;
+        private readonly RarArchive archive;
+
+        internal RarArchiveEntry(RarArchive archive, IEnumerable<RarFilePart> parts)
+        {
+            this.parts = parts.ToList();
+            this.archive = archive;
+        }
+
+        public override CompressionType CompressionType
+        {
+            get { return CompressionType.Rar; }
+        }
+
+        public IArchive Archive
+        {
+            get
+            {
+                return archive;
+            }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { return parts.Cast<FilePart>(); }
+        }
+
+        internal override FileHeader FileHeader
+        {
+            get { return parts.First().FileHeader; }
+        }
+
+        public override long Crc
+        {
+            get
+            {
+                CheckIncomplete();
+                return parts.Select(fp => fp.FileHeader)
+                    .Single(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER)).FileCRC;
+            }
+        }
+
+
+        public override long Size
+        {
+            get
+            {
+                CheckIncomplete();
+                return parts.First().FileHeader.UncompressedSize;
+            }
+        }
+
+        public override long CompressedSize
+        {
+            get
+            {
+                CheckIncomplete();
+                return parts.Aggregate(0L, (total, fp) => { return total + fp.FileHeader.CompressedSize; });
+            }
+        }
+
+        public Stream OpenEntryStream()
+        {
+            if (archive.IsSolid)
+            {
+                throw new InvalidOperationException("Use ExtractAllEntries to extract SOLID archives.");
+            }
+            return new RarStream(archive.Unpack, FileHeader, new MultiVolumeReadOnlyStream(Parts.Cast<RarFilePart>(), archive));
+        }
+
+        public bool IsComplete
+        {
+            get { return parts.Select(fp => fp.FileHeader).Any(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER)); }
+        }
+
+        private void CheckIncomplete()
+        {
+            if (!IsComplete)
+            {
+                throw new IncompleteArchiveException("ArchiveEntry is incomplete and cannot perform this operation.");
+            }
+        }
+    }
 }

src/SharpCompress/Archive/Rar/RarArchiveEntryFactory.cs

@@ -1,49 +1,49 @@
-using System.Collections.Generic;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal static class RarArchiveEntryFactory
-    {
-        private static IEnumerable<RarFilePart> GetFileParts(IEnumerable<RarVolume> parts)
-        {
-            foreach (RarVolume rarPart in parts)
-            {
-                foreach (RarFilePart fp in rarPart.ReadFileParts())
-                {
-                    yield return fp;
-                }
-            }
-        }
-
-        private static IEnumerable<IEnumerable<RarFilePart>> GetMatchedFileParts(IEnumerable<RarVolume> parts)
-        {
-            var groupedParts = new List<RarFilePart>();
-            foreach (RarFilePart fp in GetFileParts(parts))
-            {
-                groupedParts.Add(fp);
-
-                if (!FlagUtility.HasFlag((long) fp.FileHeader.FileFlags, (long) FileFlags.SPLIT_AFTER))
-                {
-                    yield return groupedParts;
-                    groupedParts = new List<RarFilePart>();
-                }
-            }
-            if (groupedParts.Count > 0)
-            {
-                yield return groupedParts;
-            }
-        }
-
-        internal static IEnumerable<RarArchiveEntry> GetEntries(RarArchive archive,
-                                                                IEnumerable<RarVolume> rarParts)
-        {
-            foreach (var groupedParts in GetMatchedFileParts(rarParts))
-            {
-                yield return new RarArchiveEntry(archive, groupedParts);
-            }
-        }
-    }
+using System.Collections.Generic;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal static class RarArchiveEntryFactory
+    {
+        private static IEnumerable<RarFilePart> GetFileParts(IEnumerable<RarVolume> parts)
+        {
+            foreach (RarVolume rarPart in parts)
+            {
+                foreach (RarFilePart fp in rarPart.ReadFileParts())
+                {
+                    yield return fp;
+                }
+            }
+        }
+
+        private static IEnumerable<IEnumerable<RarFilePart>> GetMatchedFileParts(IEnumerable<RarVolume> parts)
+        {
+            var groupedParts = new List<RarFilePart>();
+            foreach (RarFilePart fp in GetFileParts(parts))
+            {
+                groupedParts.Add(fp);
+
+                if (!FlagUtility.HasFlag((long) fp.FileHeader.FileFlags, (long) FileFlags.SPLIT_AFTER))
+                {
+                    yield return groupedParts;
+                    groupedParts = new List<RarFilePart>();
+                }
+            }
+            if (groupedParts.Count > 0)
+            {
+                yield return groupedParts;
+            }
+        }
+
+        internal static IEnumerable<RarArchiveEntry> GetEntries(RarArchive archive,
+                                                                IEnumerable<RarVolume> rarParts)
+        {
+            foreach (var groupedParts in GetMatchedFileParts(rarParts))
+            {
+                yield return new RarArchiveEntry(archive, groupedParts);
+            }
+        }
+    }
 }

src/SharpCompress/Archive/Rar/RarArchiveVolumeFactory.cs

@@ -1,147 +1,145 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-#if !PORTABLE
-using System.Linq;
-using System.Text;
-using SharpCompress.Common.Rar.Headers;
-#endif
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal static class RarArchiveVolumeFactory
-    {
-        internal static IEnumerable<RarVolume> GetParts(IEnumerable<Stream> streams, string password, Options options)
-        {
-            foreach (Stream s in streams)
-            {
-                if (!s.CanRead || !s.CanSeek)
-                {
-                    throw new ArgumentException("Stream is not readable and seekable");
-                }
-                StreamRarArchiveVolume part = new StreamRarArchiveVolume(s, password, options);
-                yield return part;
-            }
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, string password, Options options)
-        {
-            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, password, options);
-            yield return part;
-
-            if (!part.ArchiveHeader.ArchiveHeaderFlags.HasFlag(ArchiveFlags.VOLUME))
-            {
-                yield break; //if file isn't volume then there is no reason to look
-            }
-            ArchiveHeader ah = part.ArchiveHeader;
-            fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart);
-            //we use fileinfo because rar is dumb and looks at file names rather than archive info for another volume
-            while (fileInfo != null && fileInfo.Exists)
-            {
-                part = new FileInfoRarArchiveVolume(fileInfo, password, options);
-
-                fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart);
-                yield return part;
-            }
-        }
-
-        private static FileInfo GetNextFileInfo(ArchiveHeader ah, FileInfoRarFilePart currentFilePart)
-        {
-            if (currentFilePart == null)
-            {
-                return null;
-            }
-            bool oldNumbering = !ah.ArchiveHeaderFlags.HasFlag(ArchiveFlags.NEWNUMBERING)
-                                || currentFilePart.MarkHeader.OldFormat;
-            if (oldNumbering)
-            {
-                return FindNextFileWithOldNumbering(currentFilePart.FileInfo);
-            }
-            else
-            {
-                return FindNextFileWithNewNumbering(currentFilePart.FileInfo);
-            }
-        }
-
-        private static FileInfo FindNextFileWithOldNumbering(FileInfo currentFileInfo)
-        {
-            // .rar, .r00, .r01, ...
-            string extension = currentFileInfo.Extension;
-
-            StringBuilder buffer = new StringBuilder(currentFileInfo.FullName.Length);
-            buffer.Append(currentFileInfo.FullName.Substring(0,
-                                                             currentFileInfo.FullName.Length - extension.Length));
-            if (string.Compare(extension, ".rar", StringComparison.InvariantCultureIgnoreCase) == 0)
-            {
-                buffer.Append(".r00");
-            }
-            else
-            {
-                int num = 0;
-                if (int.TryParse(extension.Substring(2, 2), out num))
-                {
-                    num++;
-                    buffer.Append(".r");
-                    if (num < 10)
-                    {
-                        buffer.Append('0');
-                    }
-                    buffer.Append(num);
-                }
-                else
-                {
-                    ThrowInvalidFileName(currentFileInfo);
-                }
-            }
-            return new FileInfo(buffer.ToString());
-        }
-
-        private static FileInfo FindNextFileWithNewNumbering(FileInfo currentFileInfo)
-        {
-            // part1.rar, part2.rar, ...
-            string extension = currentFileInfo.Extension;
-            if (string.Compare(extension, ".rar", StringComparison.InvariantCultureIgnoreCase) != 0)
-            {
-                throw new ArgumentException("Invalid extension, expected 'rar': " + currentFileInfo.FullName);
-            }
-            int startIndex = currentFileInfo.FullName.LastIndexOf(".part");
-            if (startIndex < 0)
-            {
-                ThrowInvalidFileName(currentFileInfo);
-            }
-            StringBuilder buffer = new StringBuilder(currentFileInfo.FullName.Length);
-            buffer.Append(currentFileInfo.FullName, 0, startIndex);
-            int num = 0;
-            string numString = currentFileInfo.FullName.Substring(startIndex + 5,
-                                                                  currentFileInfo.FullName.IndexOf('.', startIndex + 5) -
-                                                                  startIndex - 5);
-            buffer.Append(".part");
-            if (int.TryParse(numString, out num))
-            {
-                num++;
-                for (int i = 0; i < numString.Length - num.ToString().Length; i++)
-                {
-                    buffer.Append('0');
-                }
-                buffer.Append(num);
-            }
-            else
-            {
-                ThrowInvalidFileName(currentFileInfo);
-            }
-            buffer.Append(".rar");
-            return new FileInfo(buffer.ToString());
-        }
-
-        private static void ThrowInvalidFileName(FileInfo fileInfo)
-        {
-            throw new ArgumentException("Filename invalid or next archive could not be found:"
-                                        + fileInfo.FullName);
-        }
-
-#endif
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal static class RarArchiveVolumeFactory
+    {
+        internal static IEnumerable<RarVolume> GetParts(IEnumerable<Stream> streams, string password, Options options)
+        {
+            foreach (Stream s in streams)
+            {
+                if (!s.CanRead || !s.CanSeek)
+                {
+                    throw new ArgumentException("Stream is not readable and seekable");
+                }
+                StreamRarArchiveVolume part = new StreamRarArchiveVolume(s, password, options);
+                yield return part;
+            }
+        }
+
+#if !NO_FILE
+        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, string password, Options options)
+        {
+            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, password, options);
+            yield return part;
+
+            if (!part.ArchiveHeader.ArchiveHeaderFlags.HasFlag(ArchiveFlags.VOLUME))
+            {
+                yield break; //if file isn't volume then there is no reason to look
+            }
+            ArchiveHeader ah = part.ArchiveHeader;
+            fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart);
+            //we use fileinfo because rar is dumb and looks at file names rather than archive info for another volume
+            while (fileInfo != null && fileInfo.Exists)
+            {
+                part = new FileInfoRarArchiveVolume(fileInfo, password, options);
+
+                fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart);
+                yield return part;
+            }
+        }
+
+        private static FileInfo GetNextFileInfo(ArchiveHeader ah, FileInfoRarFilePart currentFilePart)
+        {
+            if (currentFilePart == null)
+            {
+                return null;
+            }
+            bool oldNumbering = !ah.ArchiveHeaderFlags.HasFlag(ArchiveFlags.NEWNUMBERING)
+                                || currentFilePart.MarkHeader.OldFormat;
+            if (oldNumbering)
+            {
+                return FindNextFileWithOldNumbering(currentFilePart.FileInfo);
+            }
+            else
+            {
+                return FindNextFileWithNewNumbering(currentFilePart.FileInfo);
+            }
+        }
+
+        private static FileInfo FindNextFileWithOldNumbering(FileInfo currentFileInfo)
+        {
+            // .rar, .r00, .r01, ...
+            string extension = currentFileInfo.Extension;
+
+            StringBuilder buffer = new StringBuilder(currentFileInfo.FullName.Length);
+            buffer.Append(currentFileInfo.FullName.Substring(0,
+                                                             currentFileInfo.FullName.Length - extension.Length));
+            if (string.Compare(extension, ".rar", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                buffer.Append(".r00");
+            }
+            else
+            {
+                int num = 0;
+                if (int.TryParse(extension.Substring(2, 2), out num))
+                {
+                    num++;
+                    buffer.Append(".r");
+                    if (num < 10)
+                    {
+                        buffer.Append('0');
+                    }
+                    buffer.Append(num);
+                }
+                else
+                {
+                    ThrowInvalidFileName(currentFileInfo);
+                }
+            }
+            return new FileInfo(buffer.ToString());
+        }
+
+        private static FileInfo FindNextFileWithNewNumbering(FileInfo currentFileInfo)
+        {
+            // part1.rar, part2.rar, ...
+            string extension = currentFileInfo.Extension;
+            if (string.Compare(extension, ".rar", StringComparison.OrdinalIgnoreCase) != 0)
+            {
+                throw new ArgumentException("Invalid extension, expected 'rar': " + currentFileInfo.FullName);
+            }
+            int startIndex = currentFileInfo.FullName.LastIndexOf(".part");
+            if (startIndex < 0)
+            {
+                ThrowInvalidFileName(currentFileInfo);
+            }
+            StringBuilder buffer = new StringBuilder(currentFileInfo.FullName.Length);
+            buffer.Append(currentFileInfo.FullName, 0, startIndex);
+            int num = 0;
+            string numString = currentFileInfo.FullName.Substring(startIndex + 5,
+                                                                  currentFileInfo.FullName.IndexOf('.', startIndex + 5) -
+                                                                  startIndex - 5);
+            buffer.Append(".part");
+            if (int.TryParse(numString, out num))
+            {
+                num++;
+                for (int i = 0; i < numString.Length - num.ToString().Length; i++)
+                {
+                    buffer.Append('0');
+                }
+                buffer.Append(num);
+            }
+            else
+            {
+                ThrowInvalidFileName(currentFileInfo);
+            }
+            buffer.Append(".rar");
+            return new FileInfo(buffer.ToString());
+        }
+
+        private static void ThrowInvalidFileName(FileInfo fileInfo)
+        {
+            throw new ArgumentException("Filename invalid or next archive could not be found:"
+                                        + fileInfo.FullName);
+        }
+
+#endif
+    }
 }

src/SharpCompress/Archive/Rar/SeekableFilePart.cs

@@ -1,39 +1,37 @@
-using System;
-using System.IO;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal class SeekableFilePart : RarFilePart
-    {
-        private readonly Stream stream;
-        private readonly string password;
-
-        internal SeekableFilePart(MarkHeader mh, FileHeader fh, Stream stream, string password)
-            : base(mh, fh)
-        {
-            this.stream = stream;
-            this.password = password;
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            stream.Position = FileHeader.DataStartPosition;
-            if (FileHeader.Salt != null)
-            {
-#if PORTABLE
-                throw new NotSupportedException("Encrypted Rar files aren't supported in portable distro.");
-#else
-                return new RarCryptoWrapper(stream, password, FileHeader.Salt);
-#endif
-            }
-            return stream;
-        }
-
-        internal override string FilePartName
-        {
-            get { return "Unknown Stream - File Entry: " + FileHeader.FileName; }
-        }
-    }
+using System;
+using System.IO;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class SeekableFilePart : RarFilePart
+    {
+        private readonly Stream stream;
+        private readonly string password;
+
+        internal SeekableFilePart(MarkHeader mh, FileHeader fh, Stream stream, string password)
+            : base(mh, fh)
+        {
+            this.stream = stream;
+            this.password = password;
+        }
+
+        internal override Stream GetCompressedStream()
+        {
+            stream.Position = FileHeader.DataStartPosition;
+#if !NO_CRYPTO
+            if (FileHeader.Salt != null)
+            {
+                return new RarCryptoWrapper(stream, password, FileHeader.Salt);
+            }
+#endif
+            return stream;
+        }
+
+        internal override string FilePartName
+        {
+            get { return "Unknown Stream - File Entry: " + FileHeader.FileName; }
+        }
+    }
 }

src/SharpCompress/Archive/Rar/StreamRarArchiveVolume.cs

@@ -1,27 +1,27 @@
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.Common.Rar;
-using SharpCompress.Common.Rar.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive.Rar
-{
-    internal class StreamRarArchiveVolume : RarVolume
-    {
-        internal StreamRarArchiveVolume(Stream stream, string password, Options options)
-            : base(StreamingMode.Seekable, stream, password, options)
-        {
-        }
-
-        internal override IEnumerable<RarFilePart> ReadFileParts()
-        {
-            return GetVolumeFileParts();
-        }
-
-        internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
-        {
-            return new SeekableFilePart(markHeader, fileHeader, Stream, Password);
-        }
-    }
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class StreamRarArchiveVolume : RarVolume
+    {
+        internal StreamRarArchiveVolume(Stream stream, string password, Options options)
+            : base(StreamingMode.Seekable, stream, password, options)
+        {
+        }
+
+        internal override IEnumerable<RarFilePart> ReadFileParts()
+        {
+            return GetVolumeFileParts();
+        }
+
+        internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
+        {
+            return new SeekableFilePart(markHeader, fileHeader, Stream, Password);
+        }
+    }
 }

src/SharpCompress/Archive/SevenZip/SevenZipArchive.cs

@@ -1,252 +1,252 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.SevenZip;
-using SharpCompress.IO;
-using SharpCompress.Reader;
-
-namespace SharpCompress.Archive.SevenZip
-{
-    public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVolume>
-    {
-        private ArchiveDatabase database;
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        public static SevenZipArchive Open(string filePath)
-        {
-            return Open(filePath, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        public static SevenZipArchive Open(FileInfo fileInfo)
-        {
-            return Open(fileInfo, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        public static SevenZipArchive Open(string filePath, Options options)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        public static SevenZipArchive Open(FileInfo fileInfo, Options options)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new SevenZipArchive(fileInfo, options);
-        }
-#endif
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        public static SevenZipArchive Open(Stream stream)
-        {
-            stream.CheckNotNull("stream");
-            return Open(stream, Options.None);
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        public static SevenZipArchive Open(Stream stream, Options options)
-        {
-            stream.CheckNotNull("stream");
-            return new SevenZipArchive(stream, options);
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        internal SevenZipArchive(FileInfo fileInfo, Options options)
-            : base(ArchiveType.SevenZip, fileInfo, options, null)
-        {
-        }
-
-        protected override IEnumerable<SevenZipVolume> LoadVolumes(FileInfo file, Options options)
-        {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new SevenZipVolume(file.OpenRead(), options).AsEnumerable();
-        }
-
-        public static bool IsSevenZipFile(string filePath)
-        {
-            return IsSevenZipFile(new FileInfo(filePath));
-        }
-
-        public static bool IsSevenZipFile(FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                return false;
-            }
-            using (Stream stream = fileInfo.OpenRead())
-            {
-                return IsSevenZipFile(stream);
-            }
-        }
-#endif
-
-        internal SevenZipArchive(Stream stream, Options options)
-            : base(ArchiveType.SevenZip, stream.AsEnumerable(), options, null)
-        {
-        }
-
-        internal SevenZipArchive()
-            : base(ArchiveType.SevenZip)
-        {
-        }
-
-        protected override IEnumerable<SevenZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
-        {
-            foreach (Stream s in streams)
-            {
-                if (!s.CanRead || !s.CanSeek)
-                {
-                    throw new ArgumentException("Stream is not readable and seekable");
-                }
-                SevenZipVolume volume = new SevenZipVolume(s, options);
-                yield return volume;
-            }
-        }
-
-        protected override IEnumerable<SevenZipArchiveEntry> LoadEntries(IEnumerable<SevenZipVolume> volumes)
-        {
-            var stream = volumes.Single().Stream;
-            LoadFactory(stream);
-            for (int i = 0; i < database.Files.Count; i++)
-            {
-                var file = database.Files[i];
-                if (!file.IsDir)
-                {
-                    yield return new SevenZipArchiveEntry(this, new SevenZipFilePart(stream, database, i, file));
-                }
-            }
-        }
-
-        private void LoadFactory(Stream stream)
-        {
-            if (database == null)
-            {
-                stream.Position = 0;
-                var reader = new ArchiveReader();
-                reader.Open(stream);
-                database = reader.ReadDatabase(null);
-            }
-        }
-
-
-        public static bool IsSevenZipFile(Stream stream)
-        {
-            try
-            {
-                return SignatureMatch(stream);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static readonly byte[] SIGNATURE = new byte[] {(byte) '7', (byte) 'z', 0xBC, 0xAF, 0x27, 0x1C};
-
-        private static bool SignatureMatch(Stream stream)
-        {
-            BinaryReader reader = new BinaryReader(stream);
-            byte[] signatureBytes = reader.ReadBytes(6);
-            return signatureBytes.BinaryEquals(SIGNATURE);
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            return new SevenZipReader(this);
-        }
-
-        public override bool IsSolid
-        {
-            get { return Entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder).Count() > 1; }
-        }
-
-        public override long TotalSize
-        {
-            get
-            {
-                int i = Entries.Count;
-                return database.PackSizes.Aggregate(0L, (total, packSize) => total + packSize);
-            }
-        }
-
-        private class SevenZipReader : AbstractReader<SevenZipEntry, SevenZipVolume>
-        {
-            private readonly SevenZipArchive archive;
-            private CFolder currentFolder;
-            private Stream currentStream;
-            private CFileItem currentItem;
-
-            internal SevenZipReader(SevenZipArchive archive)
-                : base(Options.KeepStreamsOpen, ArchiveType.SevenZip)
-            {
-                this.archive = archive;
-            }
-
-
-            public override SevenZipVolume Volume
-            {
-                get { return archive.Volumes.Single(); }
-            }
-
-            internal override IEnumerable<SevenZipEntry> GetEntries(Stream stream)
-            {
-                List<SevenZipArchiveEntry> entries = archive.Entries.ToList();
-                stream.Position = 0;
-                foreach (var dir in entries.Where(x => x.IsDirectory))
-                {
-                    yield return dir;
-                }
-                foreach (var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder))
-                {
-                    currentFolder = group.Key;
-                    if (group.Key == null)
-                    {
-                        currentStream = Stream.Null;
-                    }
-                    else
-                    {
-                        currentStream = archive.database.GetFolderStream(stream, currentFolder, null);
-                    }
-                    foreach (var entry in group)
-                    {
-                        currentItem = entry.FilePart.Header;
-                        yield return entry;
-                    }
-                }
-            }
-
-            protected override EntryStream GetEntryStream()
-            {
-                return CreateEntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.SevenZip;
+using SharpCompress.IO;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Archive.SevenZip
+{
+    public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVolume>
+    {
+        private ArchiveDatabase database;
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static SevenZipArchive Open(string filePath)
+        {
+            return Open(filePath, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        public static SevenZipArchive Open(FileInfo fileInfo)
+        {
+            return Open(fileInfo, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        public static SevenZipArchive Open(string filePath, Options options)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        public static SevenZipArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new SevenZipArchive(fileInfo, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        public static SevenZipArchive Open(Stream stream)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream, Options.None);
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        public static SevenZipArchive Open(Stream stream, Options options)
+        {
+            stream.CheckNotNull("stream");
+            return new SevenZipArchive(stream, options);
+        }
+
+#if !NO_FILE
+        internal SevenZipArchive(FileInfo fileInfo, Options options)
+            : base(ArchiveType.SevenZip, fileInfo, options, null)
+        {
+        }
+
+        protected override IEnumerable<SevenZipVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
+            {
+                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            }
+            return new SevenZipVolume(file.OpenRead(), options).AsEnumerable();
+        }
+
+        public static bool IsSevenZipFile(string filePath)
+        {
+            return IsSevenZipFile(new FileInfo(filePath));
+        }
+
+        public static bool IsSevenZipFile(FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsSevenZipFile(stream);
+            }
+        }
+#endif
+
+        internal SevenZipArchive(Stream stream, Options options)
+            : base(ArchiveType.SevenZip, stream.AsEnumerable(), options, null)
+        {
+        }
+
+        internal SevenZipArchive()
+            : base(ArchiveType.SevenZip)
+        {
+        }
+
+        protected override IEnumerable<SevenZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            foreach (Stream s in streams)
+            {
+                if (!s.CanRead || !s.CanSeek)
+                {
+                    throw new ArgumentException("Stream is not readable and seekable");
+                }
+                SevenZipVolume volume = new SevenZipVolume(s, options);
+                yield return volume;
+            }
+        }
+
+        protected override IEnumerable<SevenZipArchiveEntry> LoadEntries(IEnumerable<SevenZipVolume> volumes)
+        {
+            var stream = volumes.Single().Stream;
+            LoadFactory(stream);
+            for (int i = 0; i < database.Files.Count; i++)
+            {
+                var file = database.Files[i];
+                if (!file.IsDir)
+                {
+                    yield return new SevenZipArchiveEntry(this, new SevenZipFilePart(stream, database, i, file));
+                }
+            }
+        }
+
+        private void LoadFactory(Stream stream)
+        {
+            if (database == null)
+            {
+                stream.Position = 0;
+                var reader = new ArchiveReader();
+                reader.Open(stream);
+                database = reader.ReadDatabase(null);
+            }
+        }
+
+
+        public static bool IsSevenZipFile(Stream stream)
+        {
+            try
+            {
+                return SignatureMatch(stream);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static readonly byte[] SIGNATURE = new byte[] {(byte) '7', (byte) 'z', 0xBC, 0xAF, 0x27, 0x1C};
+
+        private static bool SignatureMatch(Stream stream)
+        {
+            BinaryReader reader = new BinaryReader(stream);
+            byte[] signatureBytes = reader.ReadBytes(6);
+            return signatureBytes.BinaryEquals(SIGNATURE);
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            return new SevenZipReader(this);
+        }
+
+        public override bool IsSolid
+        {
+            get { return Entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder).Count() > 1; }
+        }
+
+        public override long TotalSize
+        {
+            get
+            {
+                int i = Entries.Count;
+                return database.PackSizes.Aggregate(0L, (total, packSize) => total + packSize);
+            }
+        }
+
+        private class SevenZipReader : AbstractReader<SevenZipEntry, SevenZipVolume>
+        {
+            private readonly SevenZipArchive archive;
+            private CFolder currentFolder;
+            private Stream currentStream;
+            private CFileItem currentItem;
+
+            internal SevenZipReader(SevenZipArchive archive)
+                : base(Options.KeepStreamsOpen, ArchiveType.SevenZip)
+            {
+                this.archive = archive;
+            }
+
+
+            public override SevenZipVolume Volume
+            {
+                get { return archive.Volumes.Single(); }
+            }
+
+            internal override IEnumerable<SevenZipEntry> GetEntries(Stream stream)
+            {
+                List<SevenZipArchiveEntry> entries = archive.Entries.ToList();
+                stream.Position = 0;
+                foreach (var dir in entries.Where(x => x.IsDirectory))
+                {
+                    yield return dir;
+                }
+                foreach (var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder))
+                {
+                    currentFolder = group.Key;
+                    if (group.Key == null)
+                    {
+                        currentStream = Stream.Null;
+                    }
+                    else
+                    {
+                        currentStream = archive.database.GetFolderStream(stream, currentFolder, null);
+                    }
+                    foreach (var entry in group)
+                    {
+                        currentItem = entry.FilePart.Header;
+                        yield return entry;
+                    }
+                }
+            }
+
+            protected override EntryStream GetEntryStream()
+            {
+                return CreateEntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
+            }
+        }
+    }
 }

src/SharpCompress/Archive/SevenZip/SevenZipArchiveEntry.cs

@@ -1,33 +1,34 @@
-using System.IO;
-using SharpCompress.Common.SevenZip;
-
-namespace SharpCompress.Archive.SevenZip
-{
-    public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
-    {
-        internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
-            : base(part)
-        {
-            Archive = archive;
-        }
-
-        public Stream OpenEntryStream()
-        {
-            return FilePart.GetCompressedStream();
-        }
-        public IArchive Archive { get; private set; }
-
-        public bool IsComplete
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// This is a 7Zip Anti item
-        /// </summary>
-        public bool IsAnti
-        {
-            get { return FilePart.Header.IsAnti; }
-        }
-    }
+using System;
+using System.IO;
+using SharpCompress.Common.SevenZip;
+
+namespace SharpCompress.Archive.SevenZip
+{
+    public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
+    {
+        internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
+            : base(part)
+        {
+            Archive = archive;
+        }
+
+        public Stream OpenEntryStream()
+        {
+            return FilePart.GetCompressedStream();
+        }
+        public IArchive Archive { get; private set; }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// This is a 7Zip Anti item
+        /// </summary>
+        public bool IsAnti
+        {
+            get { return FilePart.Header.IsAnti; }
+        }
+    }
 }

src/SharpCompress/Archive/Tar/TarArchive.cs

@@ -1,231 +1,231 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Tar;
-using SharpCompress.Common.Tar.Headers;
-using SharpCompress.IO;
-using SharpCompress.Reader;
-using SharpCompress.Reader.Tar;
-using SharpCompress.Writer.Tar;
-
-namespace SharpCompress.Archive.Tar
-{
-    public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
-    {
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        public static TarArchive Open(string filePath)
-        {
-            return Open(filePath, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        public static TarArchive Open(FileInfo fileInfo)
-        {
-            return Open(fileInfo, Options.None);
-        }
-
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        public static TarArchive Open(string filePath, Options options)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        public static TarArchive Open(FileInfo fileInfo, Options options)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new TarArchive(fileInfo, options);
-        }
-#endif
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        public static TarArchive Open(Stream stream)
-        {
-            stream.CheckNotNull("stream");
-            return Open(stream, Options.None);
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        public static TarArchive Open(Stream stream, Options options)
-        {
-            stream.CheckNotNull("stream");
-            return new TarArchive(stream, options);
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        public static bool IsTarFile(string filePath)
-        {
-            return IsTarFile(new FileInfo(filePath));
-        }
-
-        public static bool IsTarFile(FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                return false;
-            }
-            using (Stream stream = fileInfo.OpenRead())
-            {
-                return IsTarFile(stream);
-            }
-        }
-#endif
-
-        public static bool IsTarFile(Stream stream)
-        {
-            try
-            {
-                TarHeader tar = new TarHeader();
-                tar.Read(new BinaryReader(stream));
-                return tar.Name.Length > 0 && Enum.IsDefined(typeof (EntryType), tar.EntryType);
-            }
-            catch
-            {
-            }
-            return false;
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        internal TarArchive(FileInfo fileInfo, Options options)
-            : base(ArchiveType.Tar, fileInfo, options)
-        {
-        }
-
-        protected override IEnumerable<TarVolume> LoadVolumes(FileInfo file, Options options)
-        {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new TarVolume(file.OpenRead(), options).AsEnumerable();
-        }
-#endif
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        internal TarArchive(Stream stream, Options options)
-            : base(ArchiveType.Tar, stream, options)
-        {
-        }
-
-        internal TarArchive()
-            : base(ArchiveType.Tar)
-        {
-        }
-
-        protected override IEnumerable<TarVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
-        {
-            return new TarVolume(streams.First(), options).AsEnumerable();
-        }
-
-        protected override IEnumerable<TarArchiveEntry> LoadEntries(IEnumerable<TarVolume> volumes)
-        {
-            Stream stream = volumes.Single().Stream;
-            TarHeader previousHeader = null;
-            foreach (TarHeader header in TarHeaderFactory.ReadHeader(StreamingMode.Seekable, stream))
-            {
-                if (header != null)
-                {
-                    if (header.EntryType == EntryType.LongName)
-                    {
-                        previousHeader = header;
-                    }
-                    else
-                    {
-                        if (previousHeader != null)
-                        {
-                            var entry = new TarArchiveEntry(this, new TarFilePart(previousHeader, stream),
-                                                            CompressionType.None);
-
-                            var oldStreamPos = stream.Position;
-
-                            using(var entryStream = entry.OpenEntryStream())
-                            using(var memoryStream = new MemoryStream())
-                            {
-                                entryStream.TransferTo(memoryStream);
-                                memoryStream.Position = 0;
-                                var bytes = memoryStream.ToArray();
-
-                                header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
-                            }
-
-                            stream.Position = oldStreamPos;
-
-                            previousHeader = null;
-                        }
-                        yield return new TarArchiveEntry(this, new TarFilePart(header, stream), CompressionType.None);
-                    }
-                }
-            }
-        }
-
-        public static TarArchive Create()
-        {
-            return new TarArchive();
-        }
-
-        protected override TarArchiveEntry CreateEntryInternal(string filePath, Stream source,
-                                                       long size, DateTime? modified, bool closeStream)
-        {
-            return new TarWritableArchiveEntry(this, source, CompressionType.Unknown, filePath, size, modified,
-                                               closeStream);
-        }
-
-        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
-                                       IEnumerable<TarArchiveEntry> oldEntries,
-                                       IEnumerable<TarArchiveEntry> newEntries)
-        {
-            using (var writer = new TarWriter(stream, compressionInfo))
-            {
-                foreach (var entry in oldEntries.Concat(newEntries)
-                                                .Where(x => !x.IsDirectory))
-                {
-                    using (var entryStream = entry.OpenEntryStream())
-                    {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, entry.Size);
-                    }
-                }
-            }
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            var stream = Volumes.Single().Stream;
-            stream.Position = 0;
-            return TarReader.Open(stream);
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Tar;
+using SharpCompress.Common.Tar.Headers;
+using SharpCompress.IO;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Tar;
+using SharpCompress.Writer.Tar;
+
+namespace SharpCompress.Archive.Tar
+{
+    public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
+    {
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public static TarArchive Open(string filePath)
+        {
+            return Open(filePath, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        public static TarArchive Open(FileInfo fileInfo)
+        {
+            return Open(fileInfo, Options.None);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        public static TarArchive Open(string filePath, Options options)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        public static TarArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new TarArchive(fileInfo, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        public static TarArchive Open(Stream stream)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream, Options.None);
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        public static TarArchive Open(Stream stream, Options options)
+        {
+            stream.CheckNotNull("stream");
+            return new TarArchive(stream, options);
+        }
+
+#if !NO_FILE
+        public static bool IsTarFile(string filePath)
+        {
+            return IsTarFile(new FileInfo(filePath));
+        }
+
+        public static bool IsTarFile(FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsTarFile(stream);
+            }
+        }
+#endif
+
+        public static bool IsTarFile(Stream stream)
+        {
+            try
+            {
+                TarHeader tar = new TarHeader();
+                tar.Read(new BinaryReader(stream));
+                return tar.Name.Length > 0 && Enum.IsDefined(typeof (EntryType), tar.EntryType);
+            }
+            catch
+            {
+            }
+            return false;
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        internal TarArchive(FileInfo fileInfo, Options options)
+            : base(ArchiveType.Tar, fileInfo, options)
+        {
+        }
+
+        protected override IEnumerable<TarVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
+            {
+                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            }
+            return new TarVolume(file.OpenRead(), options).AsEnumerable();
+        }
+#endif
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        internal TarArchive(Stream stream, Options options)
+            : base(ArchiveType.Tar, stream, options)
+        {
+        }
+
+        internal TarArchive()
+            : base(ArchiveType.Tar)
+        {
+        }
+
+        protected override IEnumerable<TarVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            return new TarVolume(streams.First(), options).AsEnumerable();
+        }
+
+        protected override IEnumerable<TarArchiveEntry> LoadEntries(IEnumerable<TarVolume> volumes)
+        {
+            Stream stream = volumes.Single().Stream;
+            TarHeader previousHeader = null;
+            foreach (TarHeader header in TarHeaderFactory.ReadHeader(StreamingMode.Seekable, stream))
+            {
+                if (header != null)
+                {
+                    if (header.EntryType == EntryType.LongName)
+                    {
+                        previousHeader = header;
+                    }
+                    else
+                    {
+                        if (previousHeader != null)
+                        {
+                            var entry = new TarArchiveEntry(this, new TarFilePart(previousHeader, stream),
+                                                            CompressionType.None);
+
+                            var oldStreamPos = stream.Position;
+
+                            using(var entryStream = entry.OpenEntryStream())
+                            using(var memoryStream = new MemoryStream())
+                            {
+                                entryStream.TransferTo(memoryStream);
+                                memoryStream.Position = 0;
+                                var bytes = memoryStream.ToArray();
+
+                                header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
+                            }
+
+                            stream.Position = oldStreamPos;
+
+                            previousHeader = null;
+                        }
+                        yield return new TarArchiveEntry(this, new TarFilePart(header, stream), CompressionType.None);
+                    }
+                }
+            }
+        }
+
+        public static TarArchive Create()
+        {
+            return new TarArchive();
+        }
+
+        protected override TarArchiveEntry CreateEntryInternal(string filePath, Stream source,
+                                                       long size, DateTime? modified, bool closeStream)
+        {
+            return new TarWritableArchiveEntry(this, source, CompressionType.Unknown, filePath, size, modified,
+                                               closeStream);
+        }
+
+        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
+                                       IEnumerable<TarArchiveEntry> oldEntries,
+                                       IEnumerable<TarArchiveEntry> newEntries)
+        {
+            using (var writer = new TarWriter(stream, compressionInfo))
+            {
+                foreach (var entry in oldEntries.Concat(newEntries)
+                                                .Where(x => !x.IsDirectory))
+                {
+                    using (var entryStream = entry.OpenEntryStream())
+                    {
+                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, entry.Size);
+                    }
+                }
+            }
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.Single().Stream;
+            stream.Position = 0;
+            return TarReader.Open(stream);
+        }
+    }
 }

src/SharpCompress/Archive/Tar/TarArchiveEntry.cs

@@ -1,31 +1,31 @@
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Tar;
-
-namespace SharpCompress.Archive.Tar
-{
-    public class TarArchiveEntry : TarEntry, IArchiveEntry
-    {
-        internal TarArchiveEntry(TarArchive archive, TarFilePart part, CompressionType compressionType)
-            : base(part, compressionType)
-        {
-            Archive = archive;
-        }
-
-        public virtual Stream OpenEntryStream()
-        {
-            return Parts.Single().GetCompressedStream();
-        }
-
-        #region IArchiveEntry Members
-        public IArchive Archive { get; private set; }
-
-        public bool IsComplete
-        {
-            get { return true; }
-        }
-
-        #endregion
-    }
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Tar;
+
+namespace SharpCompress.Archive.Tar
+{
+    public class TarArchiveEntry : TarEntry, IArchiveEntry
+    {
+        internal TarArchiveEntry(TarArchive archive, TarFilePart part, CompressionType compressionType)
+            : base(part, compressionType)
+        {
+            Archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+        public IArchive Archive { get; private set; }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
 }

src/SharpCompress/Archive/Tar/TarWritableArchiveEntry.cs

@@ -1,110 +1,110 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive.Tar
-{
-    internal class TarWritableArchiveEntry : TarArchiveEntry, IWritableArchiveEntry
-    {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
-
-        internal TarWritableArchiveEntry(TarArchive archive, Stream stream, CompressionType compressionType,
-                                         string path, long size, DateTime? lastModified, bool closeStream)
-            : base(archive, null, compressionType)
-        {
-            this.stream = stream;
-            this.path = path;
-            this.size = size;
-            this.lastModified = lastModified;
-            this.closeStream = closeStream;
-        }
-
-        public override long Crc
-        {
-            get { return 0; }
-        }
-
-        public override string Key
-        {
-            get { return path; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return 0; }
-        }
-
-        public override long Size
-        {
-            get { return size; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return lastModified; }
-        }
-
-        public override DateTime? CreatedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? LastAccessedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? ArchivedTime
-        {
-            get { return null; }
-        }
-
-        public override bool IsEncrypted
-        {
-            get { return false; }
-        }
-
-        public override bool IsDirectory
-        {
-            get { return false; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { throw new NotImplementedException(); }
-        }
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
-
-        public override Stream OpenEntryStream()
-        {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
-        }
-
-        internal override void Close()
-        {
-            if (closeStream)
-            {
-                stream.Dispose();
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Tar
+{
+    internal class TarWritableArchiveEntry : TarArchiveEntry, IWritableArchiveEntry
+    {
+        private readonly string path;
+        private readonly long size;
+        private readonly DateTime? lastModified;
+        private readonly bool closeStream;
+        private readonly Stream stream;
+
+        internal TarWritableArchiveEntry(TarArchive archive, Stream stream, CompressionType compressionType,
+                                         string path, long size, DateTime? lastModified, bool closeStream)
+            : base(archive, null, compressionType)
+        {
+            this.stream = stream;
+            this.path = path;
+            this.size = size;
+            this.lastModified = lastModified;
+            this.closeStream = closeStream;
+        }
+
+        public override long Crc
+        {
+            get { return 0; }
+        }
+
+        public override string Key
+        {
+            get { return path; }
+        }
+
+        public override long CompressedSize
+        {
+            get { return 0; }
+        }
+
+        public override long Size
+        {
+            get { return size; }
+        }
+
+        public override DateTime? LastModifiedTime
+        {
+            get { return lastModified; }
+        }
+
+        public override DateTime? CreatedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? LastAccessedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? ArchivedTime
+        {
+            get { return null; }
+        }
+
+        public override bool IsEncrypted
+        {
+            get { return false; }
+        }
+
+        public override bool IsDirectory
+        {
+            get { return false; }
+        }
+
+        public override bool IsSplit
+        {
+            get { return false; }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { throw new NotImplementedException(); }
+        }
+        Stream IWritableArchiveEntry.Stream
+        {
+            get
+            {
+                return stream;
+            }
+        }
+
+        public override Stream OpenEntryStream()
+        {
+            //ensure new stream is at the start, this could be reset
+            stream.Seek(0, SeekOrigin.Begin);
+            return new NonDisposingStream(stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream)
+            {
+                stream.Dispose();
+            }
+        }
+    }
 }

src/SharpCompress/Archive/Zip/ZipArchive.cs

@@ -1,245 +1,245 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Zip;
-using SharpCompress.Common.Zip.Headers;
-using SharpCompress.Compressor.Deflate;
-using SharpCompress.Reader;
-using SharpCompress.Reader.Zip;
-using SharpCompress.Writer.Zip;
-
-namespace SharpCompress.Archive.Zip
-{
-    public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
-    {
-        private readonly SeekableZipHeaderFactory headerFactory;
-
-        /// <summary>
-        /// Gets or sets the compression level applied to files added to the archive,
-        /// if the compression method is set to deflate
-        /// </summary>
-        public CompressionLevel DeflateCompressionLevel { get; set; }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(string filePath, string password = null)
-        {
-            return Open(filePath, Options.None, password);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(FileInfo fileInfo, string password = null)
-        {
-            return Open(fileInfo, Options.None, password);
-        }
-
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(string filePath, Options options, string password = null)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), options, password);
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(FileInfo fileInfo, Options options, string password = null)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new ZipArchive(fileInfo, options, password);
-        }
-#endif
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(Stream stream, string password = null)
-        {
-            stream.CheckNotNull("stream");
-            return Open(stream, Options.None, password);
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        public static ZipArchive Open(Stream stream, Options options, string password = null)
-        {
-            stream.CheckNotNull("stream");
-            return new ZipArchive(stream, options, password);
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        public static bool IsZipFile(string filePath, string password = null)
-        {
-            return IsZipFile(new FileInfo(filePath), password);
-        }
-
-        public static bool IsZipFile(FileInfo fileInfo, string password = null)
-        {
-            if (!fileInfo.Exists)
-            {
-                return false;
-            }
-            using (Stream stream = fileInfo.OpenRead())
-            {
-                return IsZipFile(stream, password);
-            }
-        }
-#endif
-
-        public static bool IsZipFile(Stream stream, string password = null)
-        {
-            StreamingZipHeaderFactory headerFactory = new StreamingZipHeaderFactory(password);
-            try
-            {
-                ZipHeader header =
-                    headerFactory.ReadStreamHeader(stream).FirstOrDefault(x => x != null && x.ZipHeaderType != ZipHeaderType.Split);
-                if (header == null)
-                {
-                    return false;
-                }
-                return Enum.IsDefined(typeof (ZipHeaderType), header.ZipHeaderType);
-            }
-            catch (CryptographicException)
-            {
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal ZipArchive(FileInfo fileInfo, Options options, string password = null)
-            : base(ArchiveType.Zip, fileInfo, options)
-        {
-            headerFactory = new SeekableZipHeaderFactory(password);
-        }
-
-        protected override IEnumerable<ZipVolume> LoadVolumes(FileInfo file, Options options)
-        {
-            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
-            {
-                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
-            }
-            return new ZipVolume(file.OpenRead(), options).AsEnumerable();
-        }
-#endif
-
-        internal ZipArchive()
-            : base(ArchiveType.Zip)
-        {
-        }
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="options"></param>
-        /// <param name="password"></param>
-        internal ZipArchive(Stream stream, Options options, string password = null)
-            : base(ArchiveType.Zip, stream, options)
-        {
-            headerFactory = new SeekableZipHeaderFactory(password);
-        }
-
-        protected override IEnumerable<ZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
-        {
-            return new ZipVolume(streams.First(), options).AsEnumerable();
-        }
-
-        protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
-        {
-            var volume = volumes.Single();
-            Stream stream = volume.Stream;
-            foreach (ZipHeader h in headerFactory.ReadSeekableHeader(stream))
-            {
-                if (h != null)
-                {
-                    switch (h.ZipHeaderType)
-                    {
-                        case ZipHeaderType.DirectoryEntry:
-                            {
-                                yield return new ZipArchiveEntry(this,
-                                                                 new SeekableZipFilePart(headerFactory,
-                                                                                         h as DirectoryEntryHeader,
-                                                                                         stream));
-                            }
-                            break;
-                        case ZipHeaderType.DirectoryEnd:
-                            {
-                                byte[] bytes = (h as DirectoryEndHeader).Comment;
-                                volume.Comment = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length);
-                                yield break;
-                            }
-                    }
-                }
-            }
-        }
-
-        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
-                                       IEnumerable<ZipArchiveEntry> oldEntries,
-                                       IEnumerable<ZipArchiveEntry> newEntries)
-        {
-            using (var writer = new ZipWriter(stream, compressionInfo, string.Empty))
-            {
-                foreach (var entry in oldEntries.Concat(newEntries)
-                                                .Where(x => !x.IsDirectory))
-                {
-                    using (var entryStream = entry.OpenEntryStream())
-                    {
-                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, string.Empty);
-                    }
-                }
-            }
-        }
-
-        protected override ZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
-                                                       bool closeStream)
-        {
-            return new ZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
-        }
-
-        public static ZipArchive Create()
-        {
-            return new ZipArchive();
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            var stream = Volumes.Single().Stream;
-            stream.Position = 0;
-            return ZipReader.Open(stream);
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Zip;
+using SharpCompress.Common.Zip.Headers;
+using SharpCompress.Compressor.Deflate;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Zip;
+using SharpCompress.Writer.Zip;
+
+namespace SharpCompress.Archive.Zip
+{
+    public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
+    {
+        private readonly SeekableZipHeaderFactory headerFactory;
+
+        /// <summary>
+        /// Gets or sets the compression level applied to files added to the archive,
+        /// if the compression method is set to deflate
+        /// </summary>
+        public CompressionLevel DeflateCompressionLevel { get; set; }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(string filePath, string password = null)
+        {
+            return Open(filePath, Options.None, password);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(FileInfo fileInfo, string password = null)
+        {
+            return Open(fileInfo, Options.None, password);
+        }
+
+        /// <summary>
+        /// Constructor expects a filepath to an existing file.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(string filePath, Options options, string password = null)
+        {
+            filePath.CheckNotNullOrEmpty("filePath");
+            return Open(new FileInfo(filePath), options, password);
+        }
+
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(FileInfo fileInfo, Options options, string password = null)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new ZipArchive(fileInfo, options, password);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(Stream stream, string password = null)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream, Options.None, password);
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        public static ZipArchive Open(Stream stream, Options options, string password = null)
+        {
+            stream.CheckNotNull("stream");
+            return new ZipArchive(stream, options, password);
+        }
+
+#if !NO_FILE
+        public static bool IsZipFile(string filePath, string password = null)
+        {
+            return IsZipFile(new FileInfo(filePath), password);
+        }
+
+        public static bool IsZipFile(FileInfo fileInfo, string password = null)
+        {
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+            using (Stream stream = fileInfo.OpenRead())
+            {
+                return IsZipFile(stream, password);
+            }
+        }
+#endif
+
+        public static bool IsZipFile(Stream stream, string password = null)
+        {
+            StreamingZipHeaderFactory headerFactory = new StreamingZipHeaderFactory(password);
+            try
+            {
+                ZipHeader header =
+                    headerFactory.ReadStreamHeader(stream).FirstOrDefault(x => x.ZipHeaderType != ZipHeaderType.Split);
+                if (header == null)
+                {
+                    return false;
+                }
+                return Enum.IsDefined(typeof (ZipHeaderType), header.ZipHeaderType);
+            }
+            catch (CryptographicException)
+            {
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+#if !NO_FILE
+        /// <summary>
+        /// Constructor with a FileInfo object to an existing file.
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal ZipArchive(FileInfo fileInfo, Options options, string password = null)
+            : base(ArchiveType.Zip, fileInfo, options)
+        {
+            headerFactory = new SeekableZipHeaderFactory(password);
+        }
+
+        protected override IEnumerable<ZipVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            if (FlagUtility.HasFlag(options, Options.KeepStreamsOpen))
+            {
+                options = (Options)FlagUtility.SetFlag(options, Options.KeepStreamsOpen, false);
+            }
+            return new ZipVolume(file.OpenRead(), options).AsEnumerable();
+        }
+#endif
+
+        internal ZipArchive()
+            : base(ArchiveType.Zip)
+        {
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        /// <param name="password"></param>
+        internal ZipArchive(Stream stream, Options options, string password = null)
+            : base(ArchiveType.Zip, stream, options)
+        {
+            headerFactory = new SeekableZipHeaderFactory(password);
+        }
+
+        protected override IEnumerable<ZipVolume> LoadVolumes(IEnumerable<Stream> streams, Options options)
+        {
+            return new ZipVolume(streams.First(), options).AsEnumerable();
+        }
+
+        protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
+        {
+            var volume = volumes.Single();
+            Stream stream = volume.Stream;
+            foreach (ZipHeader h in headerFactory.ReadSeekableHeader(stream))
+            {
+                if (h != null)
+                {
+                    switch (h.ZipHeaderType)
+                    {
+                        case ZipHeaderType.DirectoryEntry:
+                            {
+                                yield return new ZipArchiveEntry(this,
+                                                                 new SeekableZipFilePart(headerFactory,
+                                                                                         h as DirectoryEntryHeader,
+                                                                                         stream));
+                            }
+                            break;
+                        case ZipHeaderType.DirectoryEnd:
+                            {
+                                byte[] bytes = (h as DirectoryEndHeader).Comment;
+                                volume.Comment = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length);
+                                yield break;
+                            }
+                    }
+                }
+            }
+        }
+
+        protected override void SaveTo(Stream stream, CompressionInfo compressionInfo,
+                                       IEnumerable<ZipArchiveEntry> oldEntries,
+                                       IEnumerable<ZipArchiveEntry> newEntries)
+        {
+            using (var writer = new ZipWriter(stream, compressionInfo, string.Empty))
+            {
+                foreach (var entry in oldEntries.Concat(newEntries)
+                                                .Where(x => !x.IsDirectory))
+                {
+                    using (var entryStream = entry.OpenEntryStream())
+                    {
+                        writer.Write(entry.Key, entryStream, entry.LastModifiedTime, string.Empty);
+                    }
+                }
+            }
+        }
+
+        protected override ZipArchiveEntry CreateEntryInternal(string filePath, Stream source, long size, DateTime? modified,
+                                                       bool closeStream)
+        {
+            return new ZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
+        }
+
+        public static ZipArchive Create()
+        {
+            return new ZipArchive();
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.Single().Stream;
+            stream.Position = 0;
+            return ZipReader.Open(stream);
+        }
+    }
 }

src/SharpCompress/Archive/Zip/ZipArchiveEntry.cs

@@ -1,36 +1,36 @@
-using System.IO;
-using System.Linq;
-using SharpCompress.Common.Zip;
-
-namespace SharpCompress.Archive.Zip
-{
-    public class ZipArchiveEntry : ZipEntry, IArchiveEntry
-    {
-        internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart part)
-            : base(part)
-        {
-            Archive = archive;
-        }
-
-        public virtual Stream OpenEntryStream()
-        {
-            return Parts.Single().GetCompressedStream();
-        }
-
-        #region IArchiveEntry Members
-
-        public IArchive Archive { get; private set; }
-
-        public bool IsComplete
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-        public string Comment
-        {
-            get { return (Parts.Single() as SeekableZipFilePart).Comment; }
-        }
-    }
+using System.IO;
+using System.Linq;
+using SharpCompress.Common.Zip;
+
+namespace SharpCompress.Archive.Zip
+{
+    public class ZipArchiveEntry : ZipEntry, IArchiveEntry
+    {
+        internal ZipArchiveEntry(ZipArchive archive, SeekableZipFilePart part)
+            : base(part)
+        {
+            Archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+
+        public IArchive Archive { get; private set; }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+
+        public string Comment
+        {
+            get { return (Parts.Single() as SeekableZipFilePart).Comment; }
+        }
+    }
 }

src/SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs

@@ -1,113 +1,113 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.IO;
-
-namespace SharpCompress.Archive.Zip
-{
-    internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
-    {
-        private readonly string path;
-        private readonly long size;
-        private readonly DateTime? lastModified;
-        private readonly bool closeStream;
-        private readonly Stream stream;
-        private bool isDisposed;
-
-        internal ZipWritableArchiveEntry(ZipArchive archive, Stream stream, string path, long size,
-                                         DateTime? lastModified, bool closeStream)
-            : base(archive, null)
-        {
-            this.stream = stream;
-            this.path = path;
-            this.size = size;
-            this.lastModified = lastModified;
-            this.closeStream = closeStream;
-        }
-
-        public override long Crc
-        {
-            get { return 0; }
-        }
-
-        public override string Key
-        {
-            get { return path; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return 0; }
-        }
-
-        public override long Size
-        {
-            get { return size; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return lastModified; }
-        }
-
-        public override DateTime? CreatedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? LastAccessedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? ArchivedTime
-        {
-            get { return null; }
-        }
-
-        public override bool IsEncrypted
-        {
-            get { return false; }
-        }
-
-        public override bool IsDirectory
-        {
-            get { return false; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        Stream IWritableArchiveEntry.Stream
-        {
-            get
-            {
-                return stream;
-            }
-        }
-
-        public override Stream OpenEntryStream()
-        {
-            //ensure new stream is at the start, this could be reset
-            stream.Seek(0, SeekOrigin.Begin);
-            return new NonDisposingStream(stream);
-        }
-
-        internal override void Close()
-        {
-            if (closeStream && !isDisposed)
-            {
-                stream.Dispose();
-                isDisposed = true;
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Zip
+{
+    internal class ZipWritableArchiveEntry : ZipArchiveEntry, IWritableArchiveEntry
+    {
+        private readonly string path;
+        private readonly long size;
+        private readonly DateTime? lastModified;
+        private readonly bool closeStream;
+        private readonly Stream stream;
+        private bool isDisposed;
+
+        internal ZipWritableArchiveEntry(ZipArchive archive, Stream stream, string path, long size,
+                                         DateTime? lastModified, bool closeStream)
+            : base(archive, null)
+        {
+            this.stream = stream;
+            this.path = path;
+            this.size = size;
+            this.lastModified = lastModified;
+            this.closeStream = closeStream;
+        }
+
+        public override long Crc
+        {
+            get { return 0; }
+        }
+
+        public override string Key
+        {
+            get { return path; }
+        }
+
+        public override long CompressedSize
+        {
+            get { return 0; }
+        }
+
+        public override long Size
+        {
+            get { return size; }
+        }
+
+        public override DateTime? LastModifiedTime
+        {
+            get { return lastModified; }
+        }
+
+        public override DateTime? CreatedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? LastAccessedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? ArchivedTime
+        {
+            get { return null; }
+        }
+
+        public override bool IsEncrypted
+        {
+            get { return false; }
+        }
+
+        public override bool IsDirectory
+        {
+            get { return false; }
+        }
+
+        public override bool IsSplit
+        {
+            get { return false; }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        Stream IWritableArchiveEntry.Stream
+        {
+            get
+            {
+                return stream;
+            }
+        }
+
+        public override Stream OpenEntryStream()
+        {
+            //ensure new stream is at the start, this could be reset
+            stream.Seek(0, SeekOrigin.Begin);
+            return new NonDisposingStream(stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream && !isDisposed)
+            {
+                stream.Dispose();
+                isDisposed = true;
+            }
+        }
+    }
 }

src/SharpCompress/AssemblyInfo.cs

@@ -1,20 +1,13 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-
-#if PORTABLE
-[assembly: AssemblyTitle("SharpCompress.Portable")]
-[assembly: AssemblyProduct("SharpCompress.Portable")]
-#else
-
-[assembly: AssemblyTitle("SharpCompress")]
-[assembly: AssemblyProduct("SharpCompress")]
-#endif
-
-#if UNSIGNED
-[assembly: InternalsVisibleTo("SharpCompress.Test")]
-[assembly: InternalsVisibleTo("SharpCompress.Test.Portable")]
-#endif
-
-[assembly: CLSCompliant(true)]
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+
+[assembly: AssemblyTitle("SharpCompress")]
+[assembly: AssemblyProduct("SharpCompress")]
+
+
+[assembly: InternalsVisibleTo("SharpCompress.Test")]
+[assembly: InternalsVisibleTo("SharpCompress.Test.Portable")]
+
+[assembly: CLSCompliant(true)]

src/SharpCompress/Common/ArchiveEncoding.cs

@@ -1,23 +1,23 @@
-using System.Text;
-
-namespace SharpCompress.Common
-{
-    public static class ArchiveEncoding
-    {
-        /// <summary>
-        /// Default encoding to use when archive format doesn't specify one.
-        /// </summary>
-        public static Encoding Default { get; set; }
-
-        /// <summary>
-        /// Encoding used by encryption schemes which don't comply with RFC 2898.
-        /// </summary>
-        public static Encoding Password { get; set; }
-
-        static ArchiveEncoding()
-        {
-            Default = Encoding.UTF8;
-            Password = Encoding.UTF8;
-        }
-    }
+using System.Text;
+
+namespace SharpCompress.Common
+{
+    public static class ArchiveEncoding
+    {
+        /// <summary>
+        /// Default encoding to use when archive format doesn't specify one.
+        /// </summary>
+        public static Encoding Default { get; set; }
+
+        /// <summary>
+        /// Encoding used by encryption schemes which don't comply with RFC 2898.
+        /// </summary>
+        public static Encoding Password { get; set; }
+
+        static ArchiveEncoding()
+        {
+            Default = Encoding.UTF8;
+            Password = Encoding.UTF8;
+        }
+    }
 }

src/SharpCompress/Common/ArchiveException.cs

@@ -1,12 +1,12 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class ArchiveException : Exception
-    {
-        public ArchiveException(string message)
-            : base(message)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class ArchiveException : Exception
+    {
+        public ArchiveException(string message)
+            : base(message)
+        {
+        }
+    }
 }

src/SharpCompress/Common/ArchiveExtractionEventArgs.cs

@@ -1,14 +1,14 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class ArchiveExtractionEventArgs<T> : EventArgs
-    {
-        internal ArchiveExtractionEventArgs(T entry)
-        {
-            Item = entry;
-        }
-
-        public T Item { get; private set; }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class ArchiveExtractionEventArgs<T> : EventArgs
+    {
+        internal ArchiveExtractionEventArgs(T entry)
+        {
+            Item = entry;
+        }
+
+        public T Item { get; private set; }
+    }
 }

src/SharpCompress/Common/ArchiveType.cs

@@ -1,11 +1,11 @@
-namespace SharpCompress.Common
-{
-    public enum ArchiveType
-    {
-        Rar,
-        Zip,
-        Tar,
-        SevenZip,
-        GZip,
-    }
+namespace SharpCompress.Common
+{
+    public enum ArchiveType
+    {
+        Rar,
+        Zip,
+        Tar,
+        SevenZip,
+        GZip,
+    }
 }

src/SharpCompress/Common/CompressedBytesReadEventArgs.cs

@@ -1,17 +1,17 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class CompressedBytesReadEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Compressed bytes read for the current entry
-        /// </summary>
-        public long CompressedBytesRead { get; internal set; }
-
-        /// <summary>
-        /// Current file part read for Multipart files (e.g. Rar)
-        /// </summary>
-        public long CurrentFilePartCompressedBytesRead { get; internal set; }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class CompressedBytesReadEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Compressed bytes read for the current entry
+        /// </summary>
+        public long CompressedBytesRead { get; internal set; }
+
+        /// <summary>
+        /// Current file part read for Multipart files (e.g. Rar)
+        /// </summary>
+        public long CurrentFilePartCompressedBytesRead { get; internal set; }
+    }
 }

src/SharpCompress/Common/CompressionInfo.cs

@@ -1,30 +1,30 @@
-using SharpCompress.Compressor.Deflate;
-
-namespace SharpCompress.Common
-{
-    /// <summary>
-    /// Detailed compression properties when saving.
-    /// </summary>
-    public class CompressionInfo
-    {
-        public CompressionInfo()
-        {
-            DeflateCompressionLevel = CompressionLevel.Default;
-        }
-
-        /// <summary>
-        /// The algorthm to use.  Must be valid for the format type.
-        /// </summary>
-        public CompressionType Type { get; set; }
-
-        /// <summary>
-        /// When CompressionType.Deflate is used, this property is referenced.  Defaults to CompressionLevel.Default.
-        /// </summary>
-        public CompressionLevel DeflateCompressionLevel { get; set; }
-
-        public static implicit operator CompressionInfo(CompressionType compressionType)
-        {
-            return new CompressionInfo() {Type = compressionType};
-        }
-    }
+using SharpCompress.Compressor.Deflate;
+
+namespace SharpCompress.Common
+{
+    /// <summary>
+    /// Detailed compression properties when saving.
+    /// </summary>
+    public class CompressionInfo
+    {
+        public CompressionInfo()
+        {
+            DeflateCompressionLevel = CompressionLevel.Default;
+        }
+
+        /// <summary>
+        /// The algorthm to use.  Must be valid for the format type.
+        /// </summary>
+        public CompressionType Type { get; set; }
+
+        /// <summary>
+        /// When CompressionType.Deflate is used, this property is referenced.  Defaults to CompressionLevel.Default.
+        /// </summary>
+        public CompressionLevel DeflateCompressionLevel { get; set; }
+
+        public static implicit operator CompressionInfo(CompressionType compressionType)
+        {
+            return new CompressionInfo() {Type = compressionType};
+        }
+    }
 }

src/SharpCompress/Common/CompressionType.cs

@@ -1,16 +1,16 @@
-namespace SharpCompress.Common
-{
-    public enum CompressionType
-    {
-        None,
-        GZip,
-        BZip2,
-        PPMd,
-        Deflate,
-        Rar,
-        LZMA,
-        BCJ,
-        BCJ2,
-        Unknown,
-    }
+namespace SharpCompress.Common
+{
+    public enum CompressionType
+    {
+        None,
+        GZip,
+        BZip2,
+        PPMd,
+        Deflate,
+        Rar,
+        LZMA,
+        BCJ,
+        BCJ2,
+        Unknown,
+    }
 }

src/SharpCompress/Common/CryptographicException.cs

@@ -1,12 +1,12 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class CryptographicException : Exception
-    {
-        public CryptographicException(string message)
-            : base(message)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class CryptographicException : Exception
+    {
+        public CryptographicException(string message)
+            : base(message)
+        {
+        }
+    }
 }

src/SharpCompress/Common/Entry.cs

@@ -1,85 +1,85 @@
-using System;
-using System.Collections.Generic;
-
-namespace SharpCompress.Common
-{
-    public abstract class Entry : IEntry
-    {
-        /// <summary>
-        /// The File's 32 bit CRC Hash
-        /// </summary>
-        public abstract long Crc { get; }
-
-        /// <summary>
-        /// The string key of the file internal to the Archive.
-        /// </summary>
-        public abstract string Key { get; }
-
-        /// <summary>
-        /// The compressed file size
-        /// </summary>
-        public abstract long CompressedSize { get; }
-
-        /// <summary>
-        /// The compression type
-        /// </summary>
-        public abstract CompressionType CompressionType { get; }
-
-        /// <summary>
-        /// The uncompressed file size
-        /// </summary>
-        public abstract long Size { get; }
-
-        /// <summary>
-        /// The entry last modified time in the archive, if recorded
-        /// </summary>
-        public abstract DateTime? LastModifiedTime { get; }
-
-        /// <summary>
-        /// The entry create time in the archive, if recorded
-        /// </summary>
-        public abstract DateTime? CreatedTime { get; }
-
-        /// <summary>
-        /// The entry last accessed time in the archive, if recorded
-        /// </summary>
-        public abstract DateTime? LastAccessedTime { get; }
-
-        /// <summary>
-        /// The entry time when archived, if recorded
-        /// </summary>
-        public abstract DateTime? ArchivedTime { get; }
-
-        /// <summary>
-        /// Entry is password protected and encrypted and cannot be extracted.
-        /// </summary>
-        public abstract bool IsEncrypted { get; }
-
-        /// <summary>
-        /// Entry is password protected and encrypted and cannot be extracted.
-        /// </summary>
-        public abstract bool IsDirectory { get; }
-
-        /// <summary>
-        /// Entry is split among multiple volumes
-        /// </summary>
-        public abstract bool IsSplit { get; }
-
-        internal abstract IEnumerable<FilePart> Parts { get; }
-        internal bool IsSolid { get; set; }
-
-        internal virtual void Close()
-        {
-
-        }
-
-        /// <summary>
-        /// Entry file attribute.
-        /// </summary>
-        public virtual int? Attrib
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-    }
+using System;
+using System.Collections.Generic;
+
+namespace SharpCompress.Common
+{
+    public abstract class Entry : IEntry
+    {
+        /// <summary>
+        /// The File's 32 bit CRC Hash
+        /// </summary>
+        public abstract long Crc { get; }
+
+        /// <summary>
+        /// The string key of the file internal to the Archive.
+        /// </summary>
+        public abstract string Key { get; }
+
+        /// <summary>
+        /// The compressed file size
+        /// </summary>
+        public abstract long CompressedSize { get; }
+
+        /// <summary>
+        /// The compression type
+        /// </summary>
+        public abstract CompressionType CompressionType { get; }
+
+        /// <summary>
+        /// The uncompressed file size
+        /// </summary>
+        public abstract long Size { get; }
+
+        /// <summary>
+        /// The entry last modified time in the archive, if recorded
+        /// </summary>
+        public abstract DateTime? LastModifiedTime { get; }
+
+        /// <summary>
+        /// The entry create time in the archive, if recorded
+        /// </summary>
+        public abstract DateTime? CreatedTime { get; }
+
+        /// <summary>
+        /// The entry last accessed time in the archive, if recorded
+        /// </summary>
+        public abstract DateTime? LastAccessedTime { get; }
+
+        /// <summary>
+        /// The entry time when archived, if recorded
+        /// </summary>
+        public abstract DateTime? ArchivedTime { get; }
+
+        /// <summary>
+        /// Entry is password protected and encrypted and cannot be extracted.
+        /// </summary>
+        public abstract bool IsEncrypted { get; }
+
+        /// <summary>
+        /// Entry is password protected and encrypted and cannot be extracted.
+        /// </summary>
+        public abstract bool IsDirectory { get; }
+
+        /// <summary>
+        /// Entry is split among multiple volumes
+        /// </summary>
+        public abstract bool IsSplit { get; }
+
+        internal abstract IEnumerable<FilePart> Parts { get; }
+        internal bool IsSolid { get; set; }
+
+        internal virtual void Close()
+        {
+
+        }
+
+        /// <summary>
+        /// Entry file attribute.
+        /// </summary>
+        public virtual int? Attrib
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+    }
 }

src/SharpCompress/Common/EntryStream.cs

@@ -1,103 +1,103 @@
-using System;
-using System.IO;
-using SharpCompress.Reader;
-
-namespace SharpCompress.Common
-{
-    public class EntryStream : Stream
-    {
-        public IReader Reader { get; private set; }
-        private Stream stream;
-        private bool completed;
-        private bool isDisposed;
-
-        internal EntryStream(IReader reader, Stream stream)
-        {
-            this.Reader = reader;
-            this.stream = stream;
-        }
-
-        /// <summary>
-        /// When reading a stream from OpenEntryStream, the stream must be completed so use this to finish reading the entire entry.
-        /// </summary>
-        public void SkipEntry()
-        {
-            var buffer = new byte[4096];
-            while (Read(buffer, 0, buffer.Length) > 0)
-            {
-            }
-            completed = true;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (!(completed || Reader.Cancelled))
-            {
-                SkipEntry();
-            }
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            base.Dispose(disposing);
-            stream.Dispose();
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override void Flush()
-        {
-            throw new NotSupportedException();
-        }
-
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int read = stream.Read(buffer, offset, count);
-            if (read <= 0)
-            {
-                completed = true;
-            }
-            return read;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
+using System;
+using System.IO;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Common
+{
+    public class EntryStream : Stream
+    {
+        public IReader Reader { get; private set; }
+        private Stream stream;
+        private bool completed;
+        private bool isDisposed;
+
+        internal EntryStream(IReader reader, Stream stream)
+        {
+            this.Reader = reader;
+            this.stream = stream;
+        }
+
+        /// <summary>
+        /// When reading a stream from OpenEntryStream, the stream must be completed so use this to finish reading the entire entry.
+        /// </summary>
+        public void SkipEntry()
+        {
+            var buffer = new byte[4096];
+            while (Read(buffer, 0, buffer.Length) > 0)
+            {
+            }
+            completed = true;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (!(completed || Reader.Cancelled))
+            {
+                SkipEntry();
+            }
+            if (isDisposed)
+            {
+                return;
+            }
+            isDisposed = true;
+            base.Dispose(disposing);
+            stream.Dispose();
+        }
+
+        public override bool CanRead
+        {
+            get { return true; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return false; }
+        }
+
+        public override void Flush()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override long Length
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        public override long Position
+        {
+            get { throw new NotSupportedException(); }
+            set { throw new NotSupportedException(); }
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            int read = stream.Read(buffer, offset, count);
+            if (read <= 0)
+            {
+                completed = true;
+            }
+            return read;
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+    }
 }

src/SharpCompress/Common/ExtractOptions.cs

@@ -1,30 +1,30 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    [Flags]
-    public enum ExtractOptions
-    {
-        None = 0,
-
-        /// <summary>
-        /// overwrite target if it exists
-        /// </summary>
-        Overwrite = 1 << 0,
-
-        /// <summary>
-        /// extract with internal directory structure
-        /// </summary>
-        ExtractFullPath = 1 << 1,
-
-        /// <summary>
-        /// preserve file time
-        /// </summary>
-        PreserveFileTime = 1 << 2,
-
-        /// <summary>
-        /// preserve windows file attributes
-        /// </summary>
-        PreserveAttributes = 1 << 3,
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    [Flags]
+    public enum ExtractOptions
+    {
+        None = 0,
+
+        /// <summary>
+        /// overwrite target if it exists
+        /// </summary>
+        Overwrite = 1 << 0,
+
+        /// <summary>
+        /// extract with internal directory structure
+        /// </summary>
+        ExtractFullPath = 1 << 1,
+
+        /// <summary>
+        /// preserve file time
+        /// </summary>
+        PreserveFileTime = 1 << 2,
+
+        /// <summary>
+        /// preserve windows file attributes
+        /// </summary>
+        PreserveAttributes = 1 << 3,
+    }
 }

src/SharpCompress/Common/ExtractionException.cs

@@ -1,17 +1,17 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class ExtractionException : Exception
-    {
-        public ExtractionException(string message)
-            : base(message)
-        {
-        }
-
-        public ExtractionException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class ExtractionException : Exception
+    {
+        public ExtractionException(string message)
+            : base(message)
+        {
+        }
+
+        public ExtractionException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
 }

src/SharpCompress/Common/FilePart.cs

@@ -1,12 +1,12 @@
-using System.IO;
-
-namespace SharpCompress.Common
-{
-    public abstract class FilePart
-    {
-        internal abstract string FilePartName { get; }
-
-        internal abstract Stream GetCompressedStream();
-        internal abstract Stream GetRawStream();
-    }
+using System.IO;
+
+namespace SharpCompress.Common
+{
+    public abstract class FilePart
+    {
+        internal abstract string FilePartName { get; }
+
+        internal abstract Stream GetCompressedStream();
+        internal abstract Stream GetRawStream();
+    }
 }

src/SharpCompress/Common/FilePartExtractionBeginEventArgs.cs

@@ -1,22 +1,22 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class FilePartExtractionBeginEventArgs : EventArgs
-    {
-        /// <summary>
-        /// File name for the part for the current entry
-        /// </summary>
-        public string Name { get; internal set; }
-
-        /// <summary>
-        /// Uncompressed size of the current entry in the part
-        /// </summary>
-        public long Size { get; internal set; }
-
-        /// <summary>
-        /// Compressed size of the current entry in the part
-        /// </summary>
-        public long CompressedSize { get; internal set; }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class FilePartExtractionBeginEventArgs : EventArgs
+    {
+        /// <summary>
+        /// File name for the part for the current entry
+        /// </summary>
+        public string Name { get; internal set; }
+
+        /// <summary>
+        /// Uncompressed size of the current entry in the part
+        /// </summary>
+        public long Size { get; internal set; }
+
+        /// <summary>
+        /// Compressed size of the current entry in the part
+        /// </summary>
+        public long CompressedSize { get; internal set; }
+    }
 }

src/SharpCompress/Common/FlagUtility.cs

@@ -1,130 +1,109 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    internal static class FlagUtility
-    {
-        /// <summary>
-        /// Returns true if the flag is set on the specified bit field.
-        /// Currently only works with 32-bit bitfields. 
-        /// </summary>
-        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to test</param>
-        /// <returns></returns>
-        public static bool HasFlag<T>(long bitField, T flag)
-            where T : struct
-        {
-            return HasFlag(bitField, flag);
-        }
-
-        /// <summary>
-        /// Returns true if the flag is set on the specified bit field.
-        /// Currently only works with 32-bit bitfields. 
-        /// </summary>
-        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to test</param>
-        /// <returns></returns>
-        public static bool HasFlag<T>(ulong bitField, T flag)
-            where T : struct
-        {
-            return HasFlag(bitField, flag);
-        }
-
-        /// <summary>
-        /// Returns true if the flag is set on the specified bit field.
-        /// Currently only works with 32-bit bitfields. 
-        /// </summary>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to test</param>
-        /// <returns></returns>
-        public static bool HasFlag(ulong bitField, ulong flag)
-        {
-            return ((bitField & flag) == flag);
-        }
-
-        public static bool HasFlag(short bitField, short flag)
-        {
-            return ((bitField & flag) == flag);
-        }
-
-#if PORTABLE
-    /// <summary>
-    /// Generically checks enums in a Windows Phone 7 enivronment
-    /// </summary>
-    /// <param name="enumVal"></param>
-    /// <param name="flag"></param>
-    /// <returns></returns>
-        public static bool HasFlag(this Enum enumVal, Enum flag)
-        {
-            if (enumVal.GetHashCode() > 0) //GetHashCode returns the enum value. But it's something very crazy if not set beforehand
-            {
-                ulong num = Convert.ToUInt64(flag.GetHashCode());
-                return ((Convert.ToUInt64(enumVal.GetHashCode()) & num) == num);
-            }
-            else
-            {
-                return false;
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Returns true if the flag is set on the specified bit field.
-        /// Currently only works with 32-bit bitfields. 
-        /// </summary>
-        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to test</param>
-        /// <returns></returns>
-        public static bool HasFlag<T>(T bitField, T flag)
-            where T : struct
-        {
-            return HasFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag));
-        }
-
-        /// <summary>
-        /// Returns true if the flag is set on the specified bit field.
-        /// Currently only works with 32-bit bitfields. 
-        /// </summary>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to test</param>
-        /// <returns></returns>
-        public static bool HasFlag(long bitField, long flag)
-        {
-            return ((bitField & flag) == flag);
-        }
-
-
-        /// <summary>
-        /// Sets a bit-field to either on or off for the specified flag.
-        /// </summary>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to change</param>
-        /// <param name="on">bool</param>
-        /// <returns>The flagged variable with the flag changed</returns>
-        public static long SetFlag(long bitField, long flag, bool @on)
-        {
-            if (@on)
-            {
-                return bitField | flag;
-            }
-            return bitField & (~flag);
-        }
-
-        /// <summary>
-        /// Sets a bit-field to either on or off for the specified flag.
-        /// </summary>
-        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
-        /// <param name="bitField">Flagged variable</param>
-        /// <param name="flag">Flag to change</param>
-        /// <param name="on">bool</param>
-        /// <returns>The flagged variable with the flag changed</returns>
-        public static long SetFlag<T>(T bitField, T flag, bool @on)
-            where T : struct
-        {
-            return SetFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag), @on);
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    internal static class FlagUtility
+    {
+        /// <summary>
+        /// Returns true if the flag is set on the specified bit field.
+        /// Currently only works with 32-bit bitfields. 
+        /// </summary>
+        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to test</param>
+        /// <returns></returns>
+        public static bool HasFlag<T>(long bitField, T flag)
+            where T : struct
+        {
+            return HasFlag(bitField, flag);
+        }
+
+        /// <summary>
+        /// Returns true if the flag is set on the specified bit field.
+        /// Currently only works with 32-bit bitfields. 
+        /// </summary>
+        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to test</param>
+        /// <returns></returns>
+        public static bool HasFlag<T>(ulong bitField, T flag)
+            where T : struct
+        {
+            return HasFlag(bitField, flag);
+        }
+
+        /// <summary>
+        /// Returns true if the flag is set on the specified bit field.
+        /// Currently only works with 32-bit bitfields. 
+        /// </summary>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to test</param>
+        /// <returns></returns>
+        public static bool HasFlag(ulong bitField, ulong flag)
+        {
+            return ((bitField & flag) == flag);
+        }
+
+        public static bool HasFlag(short bitField, short flag)
+        {
+            return ((bitField & flag) == flag);
+        }
+        
+        /// <summary>
+        /// Returns true if the flag is set on the specified bit field.
+        /// Currently only works with 32-bit bitfields. 
+        /// </summary>
+        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to test</param>
+        /// <returns></returns>
+        public static bool HasFlag<T>(T bitField, T flag)
+            where T : struct
+        {
+            return HasFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag));
+        }
+
+        /// <summary>
+        /// Returns true if the flag is set on the specified bit field.
+        /// Currently only works with 32-bit bitfields. 
+        /// </summary>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to test</param>
+        /// <returns></returns>
+        public static bool HasFlag(long bitField, long flag)
+        {
+            return ((bitField & flag) == flag);
+        }
+
+
+        /// <summary>
+        /// Sets a bit-field to either on or off for the specified flag.
+        /// </summary>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to change</param>
+        /// <param name="on">bool</param>
+        /// <returns>The flagged variable with the flag changed</returns>
+        public static long SetFlag(long bitField, long flag, bool @on)
+        {
+            if (@on)
+            {
+                return bitField | flag;
+            }
+            return bitField & (~flag);
+        }
+
+        /// <summary>
+        /// Sets a bit-field to either on or off for the specified flag.
+        /// </summary>
+        /// <typeparam name="T">Enumeration with Flags attribute</typeparam>
+        /// <param name="bitField">Flagged variable</param>
+        /// <param name="flag">Flag to change</param>
+        /// <param name="on">bool</param>
+        /// <returns>The flagged variable with the flag changed</returns>
+        public static long SetFlag<T>(T bitField, T flag, bool @on)
+            where T : struct
+        {
+            return SetFlag(Convert.ToInt64(bitField), Convert.ToInt64(flag), @on);
+        }
+    }
 }

src/SharpCompress/Common/GZip/GZipEntry.cs

@@ -1,86 +1,86 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace SharpCompress.Common.GZip
-{
-    public class GZipEntry : Entry
-    {
-        private readonly GZipFilePart filePart;
-
-        internal GZipEntry(GZipFilePart filePart)
-        {
-            this.filePart = filePart;
-        }
-
-        public override CompressionType CompressionType
-        {
-            get { return CompressionType.GZip; }
-        }
-
-        public override long Crc
-        {
-            get { return 0; }
-        }
-
-        public override string Key
-        {
-            get { return filePart.FilePartName; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return 0; }
-        }
-
-        public override long Size
-        {
-            get { return 0; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return filePart.DateModified; }
-        }
-
-        public override DateTime? CreatedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? LastAccessedTime
-        {
-            get { return null; }
-        }
-
-        public override DateTime? ArchivedTime
-        {
-            get { return null; }
-        }
-
-        public override bool IsEncrypted
-        {
-            get { return false; }
-        }
-
-        public override bool IsDirectory
-        {
-            get { return false; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { return filePart.AsEnumerable<FilePart>(); }
-        }
-
-        internal static IEnumerable<GZipEntry> GetEntries(Stream stream)
-        {
-            yield return new GZipEntry(new GZipFilePart(stream));
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace SharpCompress.Common.GZip
+{
+    public class GZipEntry : Entry
+    {
+        private readonly GZipFilePart filePart;
+
+        internal GZipEntry(GZipFilePart filePart)
+        {
+            this.filePart = filePart;
+        }
+
+        public override CompressionType CompressionType
+        {
+            get { return CompressionType.GZip; }
+        }
+
+        public override long Crc
+        {
+            get { return 0; }
+        }
+
+        public override string Key
+        {
+            get { return filePart.FilePartName; }
+        }
+
+        public override long CompressedSize
+        {
+            get { return 0; }
+        }
+
+        public override long Size
+        {
+            get { return 0; }
+        }
+
+        public override DateTime? LastModifiedTime
+        {
+            get { return filePart.DateModified; }
+        }
+
+        public override DateTime? CreatedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? LastAccessedTime
+        {
+            get { return null; }
+        }
+
+        public override DateTime? ArchivedTime
+        {
+            get { return null; }
+        }
+
+        public override bool IsEncrypted
+        {
+            get { return false; }
+        }
+
+        public override bool IsDirectory
+        {
+            get { return false; }
+        }
+
+        public override bool IsSplit
+        {
+            get { return false; }
+        }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { return filePart.AsEnumerable<FilePart>(); }
+        }
+
+        internal static IEnumerable<GZipEntry> GetEntries(Stream stream)
+        {
+            yield return new GZipEntry(new GZipFilePart(stream));
+        }
+    }
 }

src/SharpCompress/Common/GZip/GZipFilePart.cs

@@ -1,103 +1,104 @@
-using System;
-using System.IO;
-using SharpCompress.Common.Tar.Headers;
-using SharpCompress.Compressor;
-using SharpCompress.Compressor.Deflate;
-
-namespace SharpCompress.Common.GZip
-{
-    internal class GZipFilePart : FilePart
-    {
-        private string name;
-        private readonly Stream stream;
-
-        internal GZipFilePart(Stream stream)
-        {
-            ReadAndValidateGzipHeader(stream);
-            this.stream = stream;
-        }
-
-        internal DateTime? DateModified { get; private set; }
-
-        internal override string FilePartName
-        {
-            get { return name; }
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            return new DeflateStream(stream, CompressionMode.Decompress, CompressionLevel.Default, false);
-        }
-
-        internal override Stream GetRawStream()
-        {
-            return stream;
-        }
-
-        private void ReadAndValidateGzipHeader(Stream stream)
-        {
-            // read the header on the first read
-            byte[] header = new byte[10];
-            int n = stream.Read(header, 0, header.Length);
-
-            // workitem 8501: handle edge case (decompress empty stream)
-            if (n == 0)
-                return;
-
-            if (n != 10)
-                throw new ZlibException("Not a valid GZIP stream.");
-
-            if (header[0] != 0x1F || header[1] != 0x8B || header[2] != 8)
-                throw new ZlibException("Bad GZIP header.");
-
-            Int32 timet = BitConverter.ToInt32(header, 4);
-            DateModified = TarHeader.Epoch.AddSeconds(timet);
-            if ((header[3] & 0x04) == 0x04)
-            {
-                // read and discard extra field
-                n = stream.Read(header, 0, 2); // 2-byte length field
-
-                Int16 extraLength = (Int16) (header[0] + header[1]*256);
-                byte[] extra = new byte[extraLength];
-                n = stream.Read(extra, 0, extra.Length);
-                if (n != extraLength)
-                {
-                    throw new ZlibException("Unexpected end-of-file reading GZIP header.");
-                }
-            }
-            if ((header[3] & 0x08) == 0x08)
-                name = ReadZeroTerminatedString(stream);
-            if ((header[3] & 0x10) == 0x010)
-                ReadZeroTerminatedString(stream);
-            if ((header[3] & 0x02) == 0x02)
-                stream.ReadByte(); // CRC16, ignore
-        }
-
-
-        private static string ReadZeroTerminatedString(Stream stream)
-        {
-            byte[] buf1 = new byte[1];
-            var list = new System.Collections.Generic.List<byte>();
-            bool done = false;
-            do
-            {
-                // workitem 7740
-                int n = stream.Read(buf1, 0, 1);
-                if (n != 1)
-                {
-                    throw new ZlibException("Unexpected EOF reading GZIP header.");
-                }
-                if (buf1[0] == 0)
-                {
-                    done = true;
-                }
-                else
-                {
-                    list.Add(buf1[0]);
-                }
-            } while (!done);
-            byte[] a = list.ToArray();
-            return ArchiveEncoding.Default.GetString(a, 0, a.Length);
-        }
-    }
+using System;
+using System.IO;
+using SharpCompress.Common.Tar.Headers;
+using SharpCompress.Compressor;
+using SharpCompress.Compressor.Deflate;
+using SharpCompress.Converter;
+
+namespace SharpCompress.Common.GZip
+{
+    internal class GZipFilePart : FilePart
+    {
+        private string name;
+        private readonly Stream stream;
+
+        internal GZipFilePart(Stream stream)
+        {
+            ReadAndValidateGzipHeader(stream);
+            this.stream = stream;
+        }
+
+        internal DateTime? DateModified { get; private set; }
+
+        internal override string FilePartName
+        {
+            get { return name; }
+        }
+
+        internal override Stream GetCompressedStream()
+        {
+            return new DeflateStream(stream, CompressionMode.Decompress, CompressionLevel.Default, false);
+        }
+
+        internal override Stream GetRawStream()
+        {
+            return stream;
+        }
+
+        private void ReadAndValidateGzipHeader(Stream stream)
+        {
+            // read the header on the first read
+            byte[] header = new byte[10];
+            int n = stream.Read(header, 0, header.Length);
+
+            // workitem 8501: handle edge case (decompress empty stream)
+            if (n == 0)
+                return;
+
+            if (n != 10)
+                throw new ZlibException("Not a valid GZIP stream.");
+
+            if (header[0] != 0x1F || header[1] != 0x8B || header[2] != 8)
+                throw new ZlibException("Bad GZIP header.");
+
+            Int32 timet = DataConverter.LittleEndian.GetInt32(header, 4);
+            DateModified = TarHeader.Epoch.AddSeconds(timet);
+            if ((header[3] & 0x04) == 0x04)
+            {
+                // read and discard extra field
+                n = stream.Read(header, 0, 2); // 2-byte length field
+
+                Int16 extraLength = (Int16) (header[0] + header[1]*256);
+                byte[] extra = new byte[extraLength];
+                n = stream.Read(extra, 0, extra.Length);
+                if (n != extraLength)
+                {
+                    throw new ZlibException("Unexpected end-of-file reading GZIP header.");
+                }
+            }
+            if ((header[3] & 0x08) == 0x08)
+                name = ReadZeroTerminatedString(stream);
+            if ((header[3] & 0x10) == 0x010)
+                ReadZeroTerminatedString(stream);
+            if ((header[3] & 0x02) == 0x02)
+                stream.ReadByte(); // CRC16, ignore
+        }
+
+
+        private static string ReadZeroTerminatedString(Stream stream)
+        {
+            byte[] buf1 = new byte[1];
+            var list = new System.Collections.Generic.List<byte>();
+            bool done = false;
+            do
+            {
+                // workitem 7740
+                int n = stream.Read(buf1, 0, 1);
+                if (n != 1)
+                {
+                    throw new ZlibException("Unexpected EOF reading GZIP header.");
+                }
+                if (buf1[0] == 0)
+                {
+                    done = true;
+                }
+                else
+                {
+                    list.Add(buf1[0]);
+                }
+            } while (!done);
+            byte[] a = list.ToArray();
+            return ArchiveEncoding.Default.GetString(a, 0, a.Length);
+        }
+    }
 }

src/SharpCompress/Common/GZip/GZipVolume.cs

@@ -1,34 +1,29 @@
-using System.IO;
-
-namespace SharpCompress.Common.GZip
-{
-    public class GZipVolume : Volume
-    {
-#if !PORTABLE && !NETFX_CORE
-        private readonly FileInfo fileInfo;
-#endif
-
-        public GZipVolume(Stream stream, Options options)
-            : base(stream, options)
-        {
-        }
-
-#if !PORTABLE && !NETFX_CORE
-        public GZipVolume(FileInfo fileInfo, Options options)
-            : base(fileInfo.OpenRead(), options)
-        {
-            this.fileInfo = fileInfo;
-        }
-#endif
-
-        public override bool IsFirstVolume
-        {
-            get { return true; }
-        }
-
-        public override bool IsMultiVolume
-        {
-            get { return true; }
-        }
-    }
+using System.IO;
+
+namespace SharpCompress.Common.GZip
+{
+    public class GZipVolume : Volume
+    {
+        public GZipVolume(Stream stream, Options options)
+            : base(stream, options)
+        {
+        }
+
+#if !NO_FILE
+        public GZipVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo.OpenRead(), options)
+        {
+        }
+#endif
+
+        public override bool IsFirstVolume
+        {
+            get { return true; }
+        }
+
+        public override bool IsMultiVolume
+        {
+            get { return true; }
+        }
+    }
 }

src/SharpCompress/Common/IEntry.Extensions.cs

@@ -0,0 +1,49 @@
+#if !NO_FILE
+using System.IO;
+
+namespace SharpCompress.Common
+{
+    internal static class IEntryExtensions
+    {
+        internal static void PreserveExtractionOptions(this IEntry entry, string destinationFileName,
+                                                        ExtractOptions options)
+        {
+            if (options.HasFlag(ExtractOptions.PreserveFileTime) || options.HasFlag(ExtractOptions.PreserveAttributes))
+            {
+                FileInfo nf = new FileInfo(destinationFileName);
+                if (!nf.Exists)
+                {
+                    return;
+                }
+
+                // update file time to original packed time
+                if (options.HasFlag(ExtractOptions.PreserveFileTime))
+                {
+                    if (entry.CreatedTime.HasValue)
+                    {
+                        nf.CreationTime = entry.CreatedTime.Value;
+                    }
+
+                    if (entry.LastModifiedTime.HasValue)
+                    {
+                        nf.LastWriteTime = entry.LastModifiedTime.Value;
+                    }
+
+                    if (entry.LastAccessedTime.HasValue)
+                    {
+                        nf.LastAccessTime = entry.LastAccessedTime.Value;
+                    }
+                }
+
+                if (options.HasFlag(ExtractOptions.PreserveAttributes))
+                {
+                    if (entry.Attrib.HasValue)
+                    {
+                        nf.Attributes = (FileAttributes)System.Enum.ToObject(typeof(FileAttributes), entry.Attrib.Value);
+                    }
+                }
+            }
+        }
+    }
+}
+#endif

src/SharpCompress/Common/IEntry.cs

@@ -1,21 +1,21 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public interface IEntry
-    {
-        CompressionType CompressionType { get; }
-        DateTime? ArchivedTime { get; }
-        long CompressedSize { get; }
-        long Crc { get; }
-        DateTime? CreatedTime { get; }
-        string Key { get; }
-        bool IsDirectory { get; }
-        bool IsEncrypted { get; }
-        bool IsSplit { get; }
-        DateTime? LastAccessedTime { get; }
-        DateTime? LastModifiedTime { get; }
-        long Size { get; }
-        int? Attrib { get; }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public interface IEntry
+    {
+        CompressionType CompressionType { get; }
+        DateTime? ArchivedTime { get; }
+        long CompressedSize { get; }
+        long Crc { get; }
+        DateTime? CreatedTime { get; }
+        string Key { get; }
+        bool IsDirectory { get; }
+        bool IsEncrypted { get; }
+        bool IsSplit { get; }
+        DateTime? LastAccessedTime { get; }
+        DateTime? LastModifiedTime { get; }
+        long Size { get; }
+        int? Attrib { get; }
+    }
 }

src/SharpCompress/Common/IExtractionListener.cs

@@ -1,8 +1,8 @@
-namespace SharpCompress.Common
-{
-    internal interface IExtractionListener
-    {
-        void FireFilePartExtractionBegin(string name, long size, long compressedSize);
-        void FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes);
-    }
+namespace SharpCompress.Common
+{
+    internal interface IExtractionListener
+    {
+        void FireFilePartExtractionBegin(string name, long size, long compressedSize);
+        void FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes);
+    }
 }

src/SharpCompress/Common/IVolume.cs

@@ -1,11 +1,11 @@
-using System;
-#if !PORTABLE && !NETFX_CORE
-using System.IO;
-#endif
-
-namespace SharpCompress.Common
-{
-    public interface IVolume : IDisposable
-    {
-    }
+using System;
+#if !NO_FILE
+using System.IO;
+#endif
+
+namespace SharpCompress.Common
+{
+    public interface IVolume : IDisposable
+    {
+    }
 }

src/SharpCompress/Common/IncompleteArchiveException.cs

@@ -1,10 +1,10 @@
-namespace SharpCompress.Common
-{
-    public class IncompleteArchiveException : ArchiveException
-    {
-        public IncompleteArchiveException(string message)
-            : base(message)
-        {
-        }
-    }
+namespace SharpCompress.Common
+{
+    public class IncompleteArchiveException : ArchiveException
+    {
+        public IncompleteArchiveException(string message)
+            : base(message)
+        {
+        }
+    }
 }

src/SharpCompress/Common/InvalidFormatException.cs

@@ -1,17 +1,17 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class InvalidFormatException : ExtractionException
-    {
-        public InvalidFormatException(string message)
-            : base(message)
-        {
-        }
-
-        public InvalidFormatException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class InvalidFormatException : ExtractionException
+    {
+        public InvalidFormatException(string message)
+            : base(message)
+        {
+        }
+
+        public InvalidFormatException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
 }

src/SharpCompress/Common/MultiVolumeExtractionException.cs

@@ -1,17 +1,17 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class MultiVolumeExtractionException : ExtractionException
-    {
-        public MultiVolumeExtractionException(string message)
-            : base(message)
-        {
-        }
-
-        public MultiVolumeExtractionException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class MultiVolumeExtractionException : ExtractionException
+    {
+        public MultiVolumeExtractionException(string message)
+            : base(message)
+        {
+        }
+
+        public MultiVolumeExtractionException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
 }

src/SharpCompress/Common/MultipartStreamRequiredException.cs

@@ -1,10 +1,10 @@
-namespace SharpCompress.Common
-{
-    public class MultipartStreamRequiredException : ExtractionException
-    {
-        public MultipartStreamRequiredException(string message)
-            : base(message)
-        {
-        }
-    }
+namespace SharpCompress.Common
+{
+    public class MultipartStreamRequiredException : ExtractionException
+    {
+        public MultipartStreamRequiredException(string message)
+            : base(message)
+        {
+        }
+    }
 }

src/SharpCompress/Common/Options.cs

@@ -1,23 +1,23 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    [Flags]
-    public enum Options
-    {
-        /// <summary>
-        /// No options specified
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// SharpCompress will keep the supplied streams open
-        /// </summary>
-        KeepStreamsOpen = 1,
-
-        /// <summary>
-        /// Look for RarArchive (Check for self-extracting archives or cases where RarArchive isn't at the start of the file)
-        /// </summary>
-        LookForHeader = 2,
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    [Flags]
+    public enum Options
+    {
+        /// <summary>
+        /// No options specified
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// SharpCompress will keep the supplied streams open
+        /// </summary>
+        KeepStreamsOpen = 1,
+
+        /// <summary>
+        /// Look for RarArchive (Check for self-extracting archives or cases where RarArchive isn't at the start of the file)
+        /// </summary>
+        LookForHeader = 2,
+    }
 }

src/SharpCompress/Common/PasswordProtectedException.cs

@@ -1,17 +1,17 @@
-using System;
-
-namespace SharpCompress.Common
-{
-    public class PasswordProtectedException : ExtractionException
-    {
-        public PasswordProtectedException(string message)
-            : base(message)
-        {
-        }
-
-        public PasswordProtectedException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class PasswordProtectedException : ExtractionException
+    {
+        public PasswordProtectedException(string message)
+            : base(message)
+        {
+        }
+
+        public PasswordProtectedException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
 }

src/SharpCompress/Common/Rar/Headers/AVHeader.cs

@@ -1,20 +1,20 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class SignHeader : RarHeader
-    {
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-            CreationTime = reader.ReadInt32();
-            ArcNameSize = reader.ReadInt16();
-            UserNameSize = reader.ReadInt16();
-        }
-
-        internal int CreationTime { get; private set; }
-
-        internal short ArcNameSize { get; private set; }
-
-        internal short UserNameSize { get; private set; }
-    }
+using SharpCompress.IO;
+
+namespace SharpCompress.Common.Rar.Headers
+{
+    internal class SignHeader : RarHeader
+    {
+        protected override void ReadFromReader(MarkingBinaryReader reader)
+        {
+            CreationTime = reader.ReadInt32();
+            ArcNameSize = reader.ReadInt16();
+            UserNameSize = reader.ReadInt16();
+        }
+
+        internal int CreationTime { get; private set; }
+
+        internal short ArcNameSize { get; private set; }
+
+        internal short UserNameSize { get; private set; }
+    }
 }