TarEntry handles longnames

.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-format": {
-      "version": "4.1.131201",
-      "commands": [
-        "dotnet-format"
-      ]
-    }
-  }
-}

.gitattributes

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

.github/workflows/dotnetcore.yml

@@ -1,20 +0,0 @@
-name: SharpCompress
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest, ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.401
-    - run: dotnet run -p build/build.csproj
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ matrix.os }}-sharpcompress.nupkg
-        path: artifacts/*

.gitignore

@@ -1,20 +1,10 @@
-**/bin/*
-**/obj/*
-_ReSharper.SharpCompress/
-bin/
-*.suo
-*.user
-TestArchives/Scratch/
-TestArchives/Scratch2/
-TestResults/
-*.nupkg
-packages/*/
-project.lock.json
-tests/TestArchives/Scratch
-.vs
-tools
-.vscode
-.idea/
-
-.DS_Store
-*.snupkg
+**/bin/*
+**/obj/*
+_ReSharper.SharpCompress/
+bin/
+*.suo
+*.user
+TestArchives/Scratch/
+TestArchives/Scratch2/
+TestResults/
+*.nupkg

FORMATS.md

@@ -1,59 +0,0 @@
-# Formats
-
-## Accessing Archives
-
-* Archive classes allow random access to a seekable stream.
-* Reader classes allow forward-only reading on a stream.
-* Writer classes allow forward-only Writing on a stream.
-
-## Supported Format Table
-
-| Archive Format         | Compression Format(s)                             | Compress/Decompress | Archive API     | Reader API | Writer API    |
-| ---------------------- | ------------------------------------------------- | ------------------- | --------------- | ---------- | ------------- |
-| Rar                    | Rar                                               | Decompress (1)      | RarArchive      | RarReader  | N/A           |
-| Zip (2)                | None, DEFLATE, Deflate64, BZip2, LZMA/LZMA2, PPMd | Both                | ZipArchive      | ZipReader  | ZipWriter     |
-| Tar                    | None                                              | Both                | TarArchive      | TarReader  | TarWriter (3) |
-| Tar.GZip               | DEFLATE                                           | Both                | TarArchive      | TarReader  | TarWriter (3) |
-| Tar.BZip2              | BZip2                                             | Both                | TarArchive      | TarReader  | TarWriter (3) |
-| Tar.LZip               | LZMA                                              | Both                | TarArchive      | TarReader  | TarWriter (3) |
-| Tar.XZ                 | LZMA2                                             | Decompress          | TarArchive      | TarReader  | TarWriter (3) |
-| GZip (single file)     | DEFLATE                                           | Both                | GZipArchive     | GZipReader | GZipWriter    |
-| 7Zip (4)               | LZMA, LZMA2, BZip2, PPMd, BCJ, BCJ2, Deflate      | Decompress          | SevenZipArchive | N/A        | N/A           |
-
-1. SOLID Rars are only supported in the RarReader API.
-2. Zip format supports pkware and WinzipAES encryption. However, encrypted LZMA is not supported. Zip64 reading/writing is supported but only with seekable streams as the Zip spec doesn't support Zip64 data in post data descriptors. Deflate64 is only supported for reading.
-3. The Tar format requires a file size in the header. If no size is specified to the TarWriter and the stream is not seekable, then an exception will be thrown.
-4. The 7Zip format doesn't allow for reading as a forward-only stream so 7Zip is only supported through the Archive API
-5. LZip has no support for extra data like the file name or timestamp. There is a default filename used when looking at the entry Key on the archive.
-
-## Compression Streams
-
-For those who want to directly compress/decompress bits. The single file formats are represented here as well. However, BZip2, LZip and XZ have no metadata (GZip has a little) so using them without something like a Tar file makes little sense.
-
-| Compressor      | Compress/Decompress |
-| --------------- | ------------------- |
-| BZip2Stream     | Both                |
-| GZipStream      | Both                |
-| DeflateStream   | Both                |
-| Deflate64Stream | Decompress          |
-| LZMAStream      | Both                |
-| PPMdStream      | Both                |
-| ADCStream       | Decompress          |
-| LZipStream      | Both                |
-| XZStream        | Decompress          |
-
-## Archive Formats vs Compression
-
-Sometimes the terminology gets mixed.
-
-### Compression
-
-DEFLATE, LZMA are pure compression algorithms
-
-### Formats
-
-Formats like Zip, 7Zip, Rar are archive formats only. They use other compression methods (e.g. DEFLATE, LZMA, etc.) or propriatory (e.g RAR)
-
-### Overlap
-
-GZip, BZip2 and LZip are single file archival formats. The overlap in the API happens because Tar uses the single file formats as "compression" methods and the API tries to hide this a bit.

LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014  Adam Hathcock
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

NuGet/sharpcompress.nuspec

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>sharpcompress</id>
+        <version>0.10.1.3</version>
+        <title>SharpCompress - Pure C# Decompression/Compression</title>
+        <authors>Adam Hathcock</authors>
+        <owners>Adam Hathcock</owners>
+        <licenseUrl>http://sharpcompress.codeplex.com/license</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 .net40 .net35 sl4</tags>
+    </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+sl4+wp7+win8\SharpCompress.dll" />
+    </files>
+</package>

README.md

@@ -1,186 +1,38 @@
-# SharpCompress
+SharpCompress
+=============
 
-SharpCompress is a compression library in pure C# for .NET Standard 2.0, 2.1, .NET Core 3.1 and .NET 5.0 that can unrar, un7zip, unzip, untar unbzip2, ungzip, unlzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip/lzip are implemented.
+Github mirror of http://sharpcompress.codeplex.com
 
-The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream).
+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 is implemented.
 
-GitHub Actions Build -
-[![GitHubActions](https://github.com/adamhathcock/sharpcompress/workflows/SharpCompress/badge.svg)](https://circleci.com/gh/adamhathcock/sharpcompress)
+The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream). 
 
-## Need Help?
-
-Post Issues on Github!
-
-Check the [Supported Formats](FORMATS.md) and [Basic Usage.](USAGE.md)
-
-## Recommended Formats
-
-In general, I recommend GZip (Deflate)/BZip2 (BZip)/LZip (LZMA) as the simplicity of the formats lend to better long term archival as well as the streamability. Tar is often used in conjunction for multiple files in a single archive (e.g. `.tar.gz`)
-
-Zip is okay, but it's a very hap-hazard format and the variation in headers and implementations makes it hard to get correct. Uses Deflate by default but supports a lot of compression methods.
-
-RAR is not recommended as it's a propriatory format and the compression is closed source. Use Tar/LZip for LZMA
-
-7Zip and XZ both are overly complicated. 7Zip does not support streamable formats. XZ has known holes explained here: (http://www.nongnu.org/lzip/xz_inadequate.html) Use Tar/LZip for LZMA compression instead.
-
-## A Simple Request
+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!
 
-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?
+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)
-
-* RAR 5 decryption support
+TODOs (always lots):
+* RAR 5 support
 * 7Zip writing
-* Zip64 (Need writing and extend Reading)
+* Zip64
 * Multi-volume Zip support.
 
-## Version Log
+Version 0.10.1:
+==============
+- Fixed 7Zip extraction performance problem
 
-### Version 0.18
+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)
 
-* [Now on Github releases](https://github.com/adamhathcock/sharpcompress/releases/tag/0.18)
-
-### Version 0.17.1
-
-* Fix - [Bug Fix for .NET Core on Windows](https://github.com/adamhathcock/sharpcompress/pull/257)
-
-### Version 0.17.0
-
-* New - Full LZip support! Can read and write LZip files and Tars inside LZip files. [Make LZip a first class citizen. #241](https://github.com/adamhathcock/sharpcompress/issues/241)
-* New - XZ read support! Can read XZ files and Tars inside XZ files. [XZ in SharpCompress #91](https://github.com/adamhathcock/sharpcompress/issues/94)
-* Fix - [Regression - zip file writing on seekable streams always assumed stream start was 0. Introduced with Zip64 writing.](https://github.com/adamhathcock/sharpcompress/issues/244)
-* Fix - [Zip files with post-data descriptors can be properly skipped via decompression](https://github.com/adamhathcock/sharpcompress/issues/162)
-
-### Version 0.16.2
-
-* Fix [.NET 3.5 should support files and cryptography (was a regression from 0.16.0)](https://github.com/adamhathcock/sharpcompress/pull/251)
-* Fix [Zip per entry compression customization wrote the wrong method into the zip archive](https://github.com/adamhathcock/sharpcompress/pull/249)
-
-### Version 0.16.1
-
-* Fix [Preserve compression method when getting a compressed stream](https://github.com/adamhathcock/sharpcompress/pull/235)
-* Fix [RAR entry key normalization fix](https://github.com/adamhathcock/sharpcompress/issues/201)
-
-### Version 0.16.0
-
-* Breaking - [Progress Event Tracking rethink](https://github.com/adamhathcock/sharpcompress/pull/226)
-* Update to VS2017 - [VS2017](https://github.com/adamhathcock/sharpcompress/pull/231) - Framework targets have been changed.
-* New - [Add Zip64 writing](https://github.com/adamhathcock/sharpcompress/pull/211)
-* [Fix invalid/mismatching Zip version flags.](https://github.com/adamhathcock/sharpcompress/issues/164) - This allows nuget/System.IO.Packaging to read zip files generated by SharpCompress
-* [Fix 7Zip directory hiding](https://github.com/adamhathcock/sharpcompress/pull/215/files)
-* [Verify RAR CRC headers](https://github.com/adamhathcock/sharpcompress/pull/220)
-
-### Version 0.15.2
-
-* [Fix invalid headers](https://github.com/adamhathcock/sharpcompress/pull/210) - fixes an issue creating large-ish zip archives that was introduced with zip64 reading.
-
-### Version 0.15.1
-
-* [Zip64 extending information and ZipReader](https://github.com/adamhathcock/sharpcompress/pull/206)
-
-### Version 0.15.0
-
-* [Add zip64 support for ZipArchive extraction](https://github.com/adamhathcock/sharpcompress/pull/205)
-
-### Version 0.14.1
-
-* [.NET Assemblies aren't strong named](https://github.com/adamhathcock/sharpcompress/issues/158)
-* [Pkware encryption for Zip files didn't allow for multiple reads of an entry](https://github.com/adamhathcock/sharpcompress/issues/197)
-* [GZip Entry couldn't be read multiple times](https://github.com/adamhathcock/sharpcompress/issues/198)
-
-### Version 0.14.0
-
-* [Support for LZip reading in for Tars](https://github.com/adamhathcock/sharpcompress/pull/191)
-
-### Version 0.13.1
-
-* [Fix null password on ReaderFactory. Fix null options on SevenZipArchive](https://github.com/adamhathcock/sharpcompress/pull/188)
-* [Make PpmdProperties lazy to avoid unnecessary allocations.](https://github.com/adamhathcock/sharpcompress/pull/185)
-
-### Version 0.13.0
-
-* Breaking change: Big refactor of Options on API.
-* 7Zip supports Deflate
-
-### Version 0.12.4
-
-* Forward only zip issue fix https://github.com/adamhathcock/sharpcompress/issues/160
-* Try to fix frameworks again by copying targets from JSON.NET
-
-### Version 0.12.3
-
-* 7Zip fixes https://github.com/adamhathcock/sharpcompress/issues/73
-* Maybe all profiles will work with project.json now
-
-### Version 0.12.2
-
-* Support Profile 259 again
-
-### Version 0.12.1
-
-* Support Silverlight 5
-
-### Version 0.12.0
-
-* .NET Core RTM!
-* Bug fix for Tar long paths
-
-### Version 0.11.6
-
-* Bug fix for global header in Tar
-* Writers now have a leaveOpen `bool` overload. They won't close streams if not-requested to.
-
-### 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)
-
-XZ implementation based on: https://github.com/sambott/XZ.NET by @sambott
+Some Help/Discussion:
+https://sharpcompress.codeplex.com/discussions
 
 7Zip implementation based on: https://code.google.com/p/managed-lzma/
 
@@ -191,4 +43,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

SharpCompress.Test/ArchiveTests.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Archive;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    public class ArchiveTests : TestBase
+    {
+        protected void ArchiveStreamReadExtractAll(string testArchive, CompressionType compression)
+        {
+            testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
+            ArchiveStreamReadExtractAll(testArchive.AsEnumerable(), compression);
+        }
+
+
+        protected void ArchiveStreamReadExtractAll(IEnumerable<string> testArchives, CompressionType compression)
+        {
+            foreach (var path in testArchives)
+            {
+                ResetScratch();
+                using (Stream stream = File.OpenRead(path))
+                using (var archive = ArchiveFactory.Open(stream))
+                {
+                    Assert.IsTrue(archive.IsSolid);
+                    using (var reader = archive.ExtractAllEntries())
+                    {
+                        ReaderTests.UseReader(this, reader, compression);
+                    }
+                    VerifyFiles();
+
+                    if (archive.Entries.First().CompressionType == CompressionType.Rar)
+                    {
+                        return;
+                    }
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH,
+                                               ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+                VerifyFiles();
+            }
+        }
+
+        protected void ArchiveStreamRead(string testArchive)
+        {
+            testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
+            ArchiveStreamRead(testArchive.AsEnumerable());
+        }
+
+        protected void ArchiveStreamRead(params string[] testArchives)
+        {
+            ArchiveStreamRead(testArchives.Select(x => Path.Combine(TEST_ARCHIVES_PATH, x)));
+        }
+
+        protected void ArchiveStreamRead(IEnumerable<string> testArchives)
+        {
+            foreach (var path in testArchives)
+            {
+                ResetScratch();
+                using (Stream stream = File.OpenRead(path))
+                using (var archive = ArchiveFactory.Open(stream))
+                {
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+                VerifyFiles();
+            }
+        }
+
+        protected void ArchiveFileRead(string testArchive)
+        {
+            testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
+            ArchiveFileRead(testArchive.AsEnumerable());
+        }
+        protected void ArchiveFileRead(IEnumerable<string> testArchives)
+        {
+            foreach (var path in testArchives)
+            {
+                ResetScratch();
+                using (var archive = ArchiveFactory.Open(path))
+                {
+                    archive.EntryExtractionBegin += archive_EntryExtractionBegin;
+                    archive.FilePartExtractionBegin += archive_FilePartExtractionBegin;
+                    archive.CompressedBytesRead += archive_CompressedBytesRead;
+
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH,
+                                               ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+                VerifyFiles();
+            }
+        }
+
+        void archive_CompressedBytesRead(object sender, CompressedBytesReadEventArgs e)
+        {
+            Console.WriteLine("Read Compressed File Part Bytes: {0} Percentage: {1}%",
+                e.CurrentFilePartCompressedBytesRead, CreatePercentage(e.CurrentFilePartCompressedBytesRead, partTotal));
+
+            string percentage = entryTotal.HasValue ? CreatePercentage(e.CompressedBytesRead,
+                entryTotal.Value).ToString() : "Unknown";
+            Console.WriteLine("Read Compressed File Entry Bytes: {0} Percentage: {1}%",
+                e.CompressedBytesRead, percentage);
+        }
+
+        void archive_FilePartExtractionBegin(object sender, FilePartExtractionBeginEventArgs e)
+        {
+            this.partTotal = e.Size;
+            Console.WriteLine("Initializing File Part Extraction: " + e.Name);
+        }
+
+        void archive_EntryExtractionBegin(object sender, ArchiveExtractionEventArgs<IArchiveEntry> e)
+        {
+            this.entryTotal = e.Item.Size;
+            Console.WriteLine("Initializing File Entry Extraction: " + e.Item.FilePath);
+        }
+
+        private long? entryTotal;
+        private long partTotal;
+
+        private int CreatePercentage(long n, long d)
+        {
+            return (int)(((double)n / (double)d) * 100);
+        }
+    }
+}

SharpCompress.Test/GZip/GZipArchiveTests.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Archive;
+using SharpCompress.Archive.GZip;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class GZipArchiveTests : ArchiveTests
+    {
+        public GZipArchiveTests()
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void GZip_Archive_Generic()
+        {
+            ResetScratch();
+            using (Stream stream = File.Open(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"), FileMode.Open))
+            using (var archive = ArchiveFactory.Open(stream))
+            {
+                var entry = archive.Entries.First();
+                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.FilePath));
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"),
+                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
+        }
+
+        [TestMethod]
+        public void GZip_Archive()
+        {
+            ResetScratch();
+            using (Stream stream = File.Open(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"), FileMode.Open))
+            using (var archive = GZipArchive.Open(stream))
+            {
+                var entry = archive.Entries.First();
+                entry.WriteToFile(Path.Combine(SCRATCH_FILES_PATH, entry.FilePath));
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"),
+                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
+        }
+
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void GZip_Archive_NoAdd()
+        {
+            string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg\\test.jpg");
+            ResetScratch();
+            using (Stream stream = File.Open(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"), FileMode.Open))
+            using (var archive = GZipArchive.Open(stream))
+            {
+                archive.AddEntry("jpg\\test.jpg", jpg);
+                archive.SaveTo(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"));
+            }
+        }
+    }
+}

SharpCompress.Test/GZip/GZipWriterTests.cs

@@ -1,66 +1,58 @@
-using System.IO;
-using SharpCompress.Common;
-using SharpCompress.Writers;
-using SharpCompress.Writers.GZip;
-using Xunit;
-
-namespace SharpCompress.Test.GZip
-{
-    public class GZipWriterTests : WriterTests
-    {
-        public GZipWriterTests()
-            : base(ArchiveType.GZip)
-        {
-            UseExtensionInsteadOfNameToVerify = true;
-        }
-
-        [Fact]
-        public void GZip_Writer_Generic()
-        {
-            using (Stream stream = File.Open(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"), FileMode.OpenOrCreate, FileAccess.Write))
-            using (var writer = WriterFactory.Open(stream, ArchiveType.GZip, CompressionType.GZip))
-            {
-                writer.Write("Tar.tar", Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
-            }
-            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
-                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
-        }
-
-        [Fact]
-        public void GZip_Writer()
-        {
-            using (Stream stream = File.Open(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"), FileMode.OpenOrCreate, FileAccess.Write))
-            using (var writer = new GZipWriter(stream))
-            {
-                writer.Write("Tar.tar", Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
-            }
-            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
-                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
-        }
-
-        [Fact]
-        public void GZip_Writer_Generic_Bad_Compression()
-        {
-            Assert.Throws<InvalidFormatException>(() =>
-            {
-                using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz")))
-                using (var writer = WriterFactory.Open(stream, ArchiveType.GZip, CompressionType.BZip2))
-                {
-                }
-            });
-        }
-
-        [Fact]
-        public void GZip_Writer_Entry_Path_With_Dir()
-        {
-            using (Stream stream = File.Open(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"), FileMode.OpenOrCreate, FileAccess.Write))
-            using (var writer = new GZipWriter(stream))
-            {
-                var path = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar");
-                writer.Write(path, path); //covers issue #532
-            }
-            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
-                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
-        }
-    }
-}
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Writer;
+using SharpCompress.Writer.GZip;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class GZipWriterTests : WriterTests
+    {
+        public GZipWriterTests()
+            : base(ArchiveType.GZip)
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void GZip_Writer_Generic()
+        {
+            ResetScratch();
+            using (Stream stream = File.Open(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"), FileMode.OpenOrCreate, FileAccess.Write))
+            using (var writer = WriterFactory.Open(stream, ArchiveType.GZip, CompressionType.GZip))
+            {
+                writer.Write("Tar.tar", Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
+                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
+        }
+
+        [TestMethod]
+        public void GZip_Writer()
+        {
+            ResetScratch();
+            using (Stream stream = File.Open(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"), FileMode.OpenOrCreate, FileAccess.Write))
+            using (var writer = new GZipWriter(stream))
+            {
+                writer.Write("Tar.tar", Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
+                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidFormatException))]
+        public void GZip_Writer_Generic_Bad_Compression()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz")))
+            using (var writer = WriterFactory.Open(stream, ArchiveType.GZip, CompressionType.BZip2))
+            {
+                writer.Write("Tar.tar", Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"));
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH_FILES_PATH, "Tar.tar.gz"),
+                Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz"));
+        }
+    }
+}

SharpCompress.Test/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <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

@@ -0,0 +1,117 @@
+<?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

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <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

@@ -0,0 +1,7 @@
+<?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/Rar/RarArchiveTests.cs

@@ -0,0 +1,188 @@
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Archive;
+using SharpCompress.Archive.Rar;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class RarArchiveTests : ArchiveTests
+    {
+        [TestMethod]
+        public void Rar_None_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Rar.none.rar");
+        }
+
+        [TestMethod]
+        public void Rar_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Rar.rar");
+        }
+
+
+        [TestMethod]
+        public void Rar_test_invalid_exttime_ArchiveStreamRead()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "test_invalid_exttime.rar")))
+            {
+                using (var archive = ArchiveFactory.Open(stream))
+                {
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+        }
+
+        [TestMethod]
+        public void Rar_Jpg_ArchiveStreamRead()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "RarJpeg.jpg")))
+            {
+                using (var archive = RarArchive.Open(stream, Options.LookForHeader))
+                {
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH,
+                                               ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+                VerifyFiles();
+            }
+        }
+
+        [TestMethod]
+        public void Rar_IsSolidArchiveCheck()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Rar.rar")))
+            {
+                using (var archive = RarArchive.Open(stream))
+                {
+                    Assert.IsFalse(archive.IsSolidArchive());
+                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                    {
+                        entry.WriteToDirectory(SCRATCH_FILES_PATH,
+                                               ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidFormatException))]
+        public void Rar_Solid_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Rar.solid.rar");
+        }
+
+        [TestMethod]
+        public void Rar_Solid_StreamRead_Extract_All()
+        {
+            ArchiveStreamReadExtractAll("Rar.solid.rar", CompressionType.Rar);
+        }
+
+        [TestMethod]
+        public void Rar_Multi_ArchiveStreamRead()
+        {
+            var testArchives = new string[] { "Rar.multi.part01.rar",
+                "Rar.multi.part02.rar",
+                "Rar.multi.part03.rar",
+                "Rar.multi.part04.rar",
+                "Rar.multi.part05.rar",
+                "Rar.multi.part06.rar"};
+
+
+            ResetScratch();
+            using (var archive = RarArchive.Open(testArchives.Select(s => Path.Combine(TEST_ARCHIVES_PATH, s))
+                .Select(p => File.OpenRead(p))))
+            {
+                foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                {
+                    entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void RarNoneArchiveFileRead()
+        {
+            ArchiveFileRead("Rar.none.rar");
+        }
+
+        [TestMethod]
+        public void Rar_ArchiveFileRead()
+        {
+            ArchiveFileRead("Rar.rar");
+        }
+
+        [TestMethod]
+        public void Rar_ArchiveFileRead_HasDirectories()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Rar.rar")))
+            {
+                using (var archive = RarArchive.Open(stream))
+                {
+                    Assert.IsFalse(archive.IsSolidArchive());
+                    Assert.IsTrue(archive.Entries.Any(entry => entry.IsDirectory));
+                }
+            }
+        }
+
+        [TestMethod]
+        public void Rar_Jpg_ArchiveFileRead()
+        {
+            ResetScratch();
+            using (var archive = RarArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "RarJpeg.jpg"), Options.LookForHeader))
+            {
+                foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
+                {
+                    entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidFormatException))]
+        public void Rar_Solid_ArchiveFileRead()
+        {
+            ArchiveFileRead("Rar.solid.rar");
+        }
+
+        [TestMethod]
+        public void Rar_Multi_ArchiveFileRead()
+        {
+            ArchiveFileRead("Rar.multi.part01.rar");
+        }
+
+        [TestMethod]
+        public void Rar_IsFirstVolume_True()
+        {
+            using (var archive = RarArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "Rar.multi.part01.rar")))
+            {
+                Assert.IsTrue(archive.IsMultipartVolume());
+                Assert.IsTrue(archive.IsFirstVolume());
+            }
+        }
+
+        [TestMethod]
+        public void Rar_IsFirstVolume_False()
+        {
+            using (var archive = RarArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "Rar.multi.part03.rar")))
+            {
+                Assert.IsTrue(archive.IsMultipartVolume());
+                Assert.IsFalse(archive.IsFirstVolume());
+            }
+        }
+    }
+}

SharpCompress.Test/Rar/RarHeaderFactoryTest.cs

@@ -0,0 +1,60 @@
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Common.Rar.Headers;
+using SharpCompress.IO;
+
+namespace SharpCompress.Test.Rar
+{
+    /// <summary>
+    /// Summary description for RarFactoryReaderTest
+    /// </summary>
+    [TestClass]
+    public class RarHeaderFactoryTest : TestBase
+    {
+        private RarHeaderFactory rarHeaderFactory;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            ResetScratch();
+            rarHeaderFactory = new RarHeaderFactory(StreamingMode.Seekable, Options.KeepStreamsOpen);
+        }
+
+
+        [TestMethod]
+        public void ReadHeaders_RecognizeEncryptedFlag()
+        {
+
+            ReadEncryptedFlag("Rar.Encrypted_filesAndHeader.rar", true);
+
+
+
+        }
+
+        private void ReadEncryptedFlag(string testArchive, bool isEncrypted)
+        {
+            using (var stream = GetReaderStream(testArchive))
+                foreach (var header in rarHeaderFactory.ReadHeaders(stream))
+                {
+                    if (header.HeaderType == HeaderType.ArchiveHeader)
+                    {
+                        Assert.AreEqual(isEncrypted, rarHeaderFactory.IsEncrypted);
+                        break;
+                    }
+                }
+        }
+
+        [TestMethod]
+        public void ReadHeaders_RecognizeNoEncryptedFlag()
+        {
+            ReadEncryptedFlag("Rar.rar", false);
+        }
+
+        private FileStream GetReaderStream(string testArchive)
+        {
+            return new FileStream(Path.Combine(TEST_ARCHIVES_PATH, testArchive),
+                                  FileMode.Open);
+        }
+    }
+}

SharpCompress.Test/Rar/RarReaderTests.cs

@@ -0,0 +1,233 @@
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Rar;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class RarReaderTests : ReaderTests
+    {
+        [TestMethod]
+        public void Rar_Multi_Reader()
+        {
+            var testArchives = new string[] { "Rar.multi.part01.rar",
+                "Rar.multi.part02.rar",
+                "Rar.multi.part03.rar",
+                "Rar.multi.part04.rar",
+                "Rar.multi.part05.rar",
+                "Rar.multi.part06.rar"};
+
+
+            ResetScratch();
+            using (var reader = RarReader.Open(testArchives.Select(s => Path.Combine(TEST_ARCHIVES_PATH, s))
+                .Select(p => File.OpenRead(p))))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Rar_Multi_Reader_Delete_Files()
+        {
+            var testArchives = new string[] { "Rar.multi.part01.rar",
+                "Rar.multi.part02.rar",
+                "Rar.multi.part03.rar",
+                "Rar.multi.part04.rar",
+                "Rar.multi.part05.rar",
+                "Rar.multi.part06.rar"};
+
+
+            ResetScratch();
+
+            foreach (var file in testArchives)
+            {
+                File.Copy(Path.Combine(TEST_ARCHIVES_PATH, file), Path.Combine(SCRATCH2_FILES_PATH, file));
+            }
+            var streams = testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)).Select(File.OpenRead).ToList();
+            using (var reader = RarReader.Open(streams))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            foreach (var stream in streams)
+            {
+                stream.Dispose();
+            }
+            VerifyFiles();
+
+            foreach (var file in testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s)))
+            {
+                File.Delete(file);
+            }
+        }
+
+        [TestMethod]
+        public void Rar_None_Reader()
+        {
+            Read("Rar.none.rar", CompressionType.Rar);
+        }
+
+        [TestMethod]
+        public void Rar_Reader()
+        {
+            Read("Rar.rar", CompressionType.Rar);
+        }
+
+        [TestMethod]
+        public void Rar_EncryptedFileAndHeader_Reader()
+        {
+            ReadRar("Rar.encrypted_filesAndHeader.rar", "test");
+
+        }
+
+        [TestMethod]
+        public void Rar_EncryptedFileOnly_Reader()
+        {
+            ReadRar("Rar.encrypted_filesOnly.rar", "test");
+
+        }
+
+        [TestMethod]
+        public void Rar_Encrypted_Reader()
+        {
+            ReadRar("Encrypted.rar", "test");
+
+        }
+
+        private void ReadRar(string testArchive, string password)
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, testArchive)))
+            using (var reader = RarReader.Open(stream, password))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Rar_Entry_Stream()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Rar.rar")))
+            using (var reader = RarReader.Open(stream))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                        using (var entryStream = reader.OpenEntryStream())
+                        {
+                            string file = Path.GetFileName(reader.Entry.FilePath);
+                            string folder = Path.GetDirectoryName(reader.Entry.FilePath);
+                            string destdir = Path.Combine(SCRATCH_FILES_PATH, folder);
+                            if (!Directory.Exists(destdir))
+                            {
+                                Directory.CreateDirectory(destdir);
+                            }
+                            string destinationFileName = Path.Combine(destdir, file);
+
+                            using (FileStream fs = File.OpenWrite(destinationFileName))
+                            {
+                                entryStream.TransferTo(fs);
+                            }
+                        }
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Rar_Reader_Audio_program()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Audio_program.rar")))
+            using (var reader = RarReader.Open(stream, Options.LookForHeader))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            CompareFilesByPath(Path.Combine(SCRATCH_FILES_PATH, "test.dat"),
+                Path.Combine(MISC_TEST_FILES_PATH, "test.dat"));
+        }
+
+        [TestMethod]
+        public void Rar_Jpg_Reader()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "RarJpeg.jpg")))
+            using (var reader = RarReader.Open(stream, Options.LookForHeader))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Rar_Solid_Reader()
+        {
+            Read("Rar.solid.rar", CompressionType.Rar);
+        }
+
+        [TestMethod]
+        public void Rar_Solid_Skip_Reader()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Rar.solid.rar")))
+            using (var reader = RarReader.Open(stream, Options.LookForHeader))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (reader.Entry.FilePath.Contains("jpg"))
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+        }
+
+        [TestMethod]
+        public void Rar_Reader_Skip()
+        {
+            ResetScratch();
+            using (var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Rar.rar")))
+            using (var reader = RarReader.Open(stream, Options.LookForHeader))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (reader.Entry.FilePath.Contains("jpg"))
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+        }
+    }
+}

SharpCompress.Test/ReaderTests.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Test
+{
+    public class ReaderTests : TestBase
+    {
+        protected void Read(string testArchive, CompressionType expectedCompression)
+        {
+            testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
+            Read(testArchive.AsEnumerable(), expectedCompression);
+        }
+
+        protected void Read(IEnumerable<string> testArchives, CompressionType expectedCompression)
+        {
+            foreach (var path in testArchives)
+            {
+                using (Stream stream = File.OpenRead(path))
+                using (IReader reader = ReaderFactory.Open(stream))
+                {
+                    UseReader(this, reader, expectedCompression);
+                }
+            }
+        }
+
+        public static void UseReader(TestBase test, IReader reader, CompressionType expectedCompression)
+        {
+            test.ResetScratch();
+            while (reader.MoveToNextEntry())
+            {
+                if (!reader.Entry.IsDirectory)
+                {
+                    Assert.AreEqual(reader.Entry.CompressionType, expectedCompression);
+                    reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            test.VerifyFiles();
+        }
+    }
+}

SharpCompress.Test/RewindableStreamTest.cs

@@ -0,0 +1,84 @@
+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/SevenZip/SevenZipArchiveTests.cs

@@ -0,0 +1,74 @@
+
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class SevenZipArchiveTests : ArchiveTests
+    {
+        [TestMethod]
+        public void SevenZipArchive_LZMA_StreamRead()
+        {
+            ArchiveStreamRead("7Zip.LZMA.7z");
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_LZMA_PathRead()
+        {
+            ArchiveFileRead("7Zip.LZMA.7z");
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_PPMd_StreamRead()
+        {
+            ArchiveStreamRead("7Zip.PPMd.7z");
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_PPMd_StreamRead_Extract_All()
+        {
+            ArchiveStreamReadExtractAll("7Zip.PPMd.7z", CompressionType.PPMd);
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_PPMd_PathRead()
+        {
+            ArchiveFileRead("7Zip.PPMd.7z");
+        }
+        [TestMethod]
+        public void SevenZipArchive_LZMA2_StreamRead()
+        {
+            ArchiveStreamRead("7Zip.LZMA2.7z");
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_LZMA2_PathRead()
+        {
+            ArchiveFileRead("7Zip.LZMA2.7z");
+        }
+        [TestMethod]
+        public void SevenZipArchive_BZip2_StreamRead()
+        {
+            ArchiveStreamRead("7Zip.BZip2.7z");
+        }
+
+        [TestMethod]
+        public void SevenZipArchive_BZip2_PathRead()
+        {
+            ArchiveFileRead("7Zip.BZip2.7z");
+        }
+
+
+        [TestMethod]
+        [ExpectedException(typeof(IndexOutOfRangeException))]
+        public void SevenZipArchive_BZip2_Split()
+        {
+            ArchiveStreamRead("Original.7z.001", "Original.7z.002",
+                "Original.7z.003", "Original.7z.004", "Original.7z.005",
+                "Original.7z.006", "Original.7z.007");
+        }
+    }
+}

SharpCompress.Test/SharpCompress.Test.Portable.csproj

@@ -0,0 +1,113 @@
+<?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>true</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

@@ -0,0 +1,113 @@
+<?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>true</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.csproj">
+      <Project>{10A689CF-76A2-4A4F-96E4-553C33398438}</Project>
+      <Name>SharpCompress</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/Streams/StreamTests.cs

@@ -1,20 +1,21 @@
-using System.IO;
-using SharpCompress.Compressors.LZMA;
-using Xunit;
-
-namespace SharpCompress.Test.Streams
-{
-    public class LzmaStreamTests
-    {
-        [Fact]
-        public void TestLzma2Decompress1Byte()
-        {
-            byte[] properties = new byte[] { 0x01 };
-            byte[] compressedData = new byte[] { 0x01, 0x00, 0x00, 0x58, 0x00 };
-            MemoryStream lzma2Stream = new MemoryStream(compressedData);
-
-            LzmaStream decompressor = new LzmaStream(properties, lzma2Stream, 5, 1);
-            Assert.Equal('X', decompressor.ReadByte());
-        }
-    }
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Compressor.LZMA;
+
+namespace SharpCompress.Test.Streams
+{
+    [TestClass]
+    public class StreamTests
+    {
+        [TestMethod]
+        public void TestLzma2Decompress1Byte()
+        {
+            byte[] properties = new byte[] { 0x01 };
+            byte[] compressedData = new byte[] { 0x01, 0x00, 0x00, 0x58, 0x00 };
+            MemoryStream lzma2Stream = new MemoryStream(compressedData);
+
+            LzmaStream decompressor = new LzmaStream(properties, lzma2Stream, 5, 1);
+            Assert.AreEqual('X', decompressor.ReadByte());
+        }
+    }
 }

SharpCompress.Test/Tar/TarArchiveTests.cs

@@ -0,0 +1,124 @@
+
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Archive;
+using SharpCompress.Archive.Tar;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class TarArchiveTests : ArchiveTests
+    {
+        public TarArchiveTests()
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void TarArchiveStreamRead()
+        {
+            ArchiveStreamRead("Tar.tar");
+        }
+
+        [TestMethod]
+        public void TarArchivePathRead()
+        {
+            ArchiveFileRead("Tar.tar");
+        }
+
+
+        [TestMethod]
+        public void TarArchivePathReadLongName()
+        {
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
+            using (var archive = TarArchive.Open(unmodified))
+            {
+                Assert.AreEqual(2, archive.Entries.Count);
+                Assert.AreEqual(archive.Entries.Last().FilePath, @"very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg");
+            }
+        }
+
+        [TestMethod]
+        public void Tar_Create_New()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.tar");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Create())
+            {
+                archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
+
+        [TestMethod]
+        public void Tar_Create_New_Long_FileName()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.tar");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Create())
+            {
+                archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
+
+        [TestMethod]
+        public void Tar_Random_Write_Add()
+        {
+            string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg\\test.jpg");
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Open(unmodified))
+            {
+                archive.AddEntry("jpg\\test.jpg", jpg);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+
+                [TestMethod]
+        public void Tar_Random_Write_Add_Long_name()
+        {
+            string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg\\test.jpg");
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Create())
+            {
+                archive.AddEntry(@"very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg", jpg);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
+
+
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
+        [TestMethod]
+        public void Tar_Random_Write_Remove()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.mod.tar");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.mod.tar");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
+
+            base.ResetScratch();
+            using (var archive = TarArchive.Open(unmodified))
+            {
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
+                archive.RemoveEntry(entry);
+                archive.SaveTo(scratchPath, CompressionType.None);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+    }
+}

SharpCompress.Test/Tar/TarReaderTests.cs

@@ -0,0 +1,92 @@
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Reader.Tar;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class TarReaderTests : ReaderTests
+    {
+        public TarReaderTests()
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void Tar_Reader()
+        {
+            Read("Tar.tar", CompressionType.None);
+        }
+
+        [TestMethod]
+        public void Tar_BZip2_Reader()
+        {
+            Read("Tar.tar.bz2", CompressionType.BZip2);
+        }
+
+        [TestMethod]
+        public void Tar_GZip_Reader()
+        {
+            Read("Tar.tar.gz", CompressionType.GZip);
+        }
+
+        [TestMethod]
+        public void Tar_BZip2_Entry_Stream()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.bz2")))
+            using (var reader = TarReader.Open(stream))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.BZip2);
+                        using (var entryStream = reader.OpenEntryStream())
+                        {
+                            string file = Path.GetFileName(reader.Entry.FilePath);
+                            string folder = Path.GetDirectoryName(reader.Entry.FilePath);
+                            string destdir = Path.Combine(SCRATCH_FILES_PATH, folder);
+                            if (!Directory.Exists(destdir))
+                            {
+                                Directory.CreateDirectory(destdir);
+                            }
+                            string destinationFileName = Path.Combine(destdir, file);
+
+                            using (FileStream fs = File.OpenWrite(destinationFileName))
+                            {
+                                entryStream.TransferTo(fs);
+                            }
+                        }
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Tar_BZip2_Skip_Entry_Stream()
+        {
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.bz2")))
+            using (var reader = TarReader.Open(stream))
+            {
+                List<string> names = new List<string>();
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.BZip2);
+                        using (var entryStream = reader.OpenEntryStream())
+                        {
+                            entryStream.SkipEntry();
+                            names.Add(reader.Entry.FilePath);
+                        }
+                    }
+                }
+                Assert.AreEqual(names.Count, 3);
+            }
+        }
+    }
+}

SharpCompress.Test/Tar/TarWriterTests.cs

@@ -0,0 +1,34 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class TarWriterTests : WriterTests
+    {
+        public TarWriterTests()
+            : base(ArchiveType.Tar)
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void Tar_Writer()
+        {
+            Write(CompressionType.None, "Tar.noEmptyDirs.tar", "Tar.noEmptyDirs.tar");
+        }
+
+        [TestMethod]
+        public void Tar_BZip2_Writer()
+        {
+            Write(CompressionType.BZip2, "Tar.noEmptyDirs.tar.bz2", "Tar.noEmptyDirs.tar.bz2");
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidFormatException))]
+        public void Tar_Rar_Write()
+        {
+            Write(CompressionType.Rar, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip");
+        }
+    }
+}

SharpCompress.Test/TestBase.cs

@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+
+namespace SharpCompress.Test
+{
+    public class TestBase
+    {
+        protected const string TEST_BASE_PATH = @"C:\Git\sharpcompress";
+        protected static readonly string TEST_ARCHIVES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Archives");
+        protected static readonly string ORIGINAL_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Original");
+        protected static readonly string MISC_TEST_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "MiscTest");
+        protected static readonly string SCRATCH_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Scratch");
+        protected static readonly string SCRATCH2_FILES_PATH = Path.Combine(TEST_BASE_PATH, "TestArchives", "Scratch2");
+
+        protected static IEnumerable<string> GetRarArchives()
+        {
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Rar.none.rar");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Rar.rar");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Rar.solid.rar");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Rar.multi.part01.rar");
+        }
+        protected static IEnumerable<string> GetZipArchives()
+        {
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.dd.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.dd-.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.dd.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.lzma.dd.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.lzma.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.none.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.ppmd.dd.zip");
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Zip.ppmd.zip");
+        }
+        protected static IEnumerable<string> GetTarArchives()
+        {
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar");
+        }
+        protected static IEnumerable<string> GetTarBz2Archives()
+        {
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.bz2");
+        }
+        protected static IEnumerable<string> GetTarGzArchives()
+        {
+            yield return Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz");
+        }
+
+        public void ResetScratch()
+        {
+            if (Directory.Exists(SCRATCH_FILES_PATH))
+            {
+                Directory.Delete(SCRATCH_FILES_PATH, true);
+            }
+            Directory.CreateDirectory(SCRATCH_FILES_PATH);
+            if (Directory.Exists(SCRATCH2_FILES_PATH))
+            {
+                Directory.Delete(SCRATCH2_FILES_PATH, true);
+            }
+            Directory.CreateDirectory(SCRATCH2_FILES_PATH);
+
+        }
+
+        public void VerifyFiles()
+        {
+            if (UseExtensionInsteadOfNameToVerify)
+            {
+                VerifyFilesByExtension();
+            }
+            else
+            {
+                VerifyFilesByName();
+            }
+        }
+
+        protected void VerifyFilesByName()
+        {
+            var extracted =
+                Directory.EnumerateFiles(SCRATCH_FILES_PATH, "*.*", SearchOption.AllDirectories)
+                .ToLookup(path => path.Substring(SCRATCH_FILES_PATH.Length));
+            var original =
+                Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories)
+                .ToLookup(path => path.Substring(ORIGINAL_FILES_PATH.Length));
+
+            Assert.AreEqual(extracted.Count, original.Count);
+
+            foreach (var orig in original)
+            {
+                Assert.IsTrue(extracted.Contains(orig.Key));
+
+                CompareFilesByPath(orig.Single(), extracted[orig.Key].Single());
+            }
+        }
+
+        protected bool UseExtensionInsteadOfNameToVerify { get; set; }
+
+        protected void VerifyFilesByExtension()
+        {
+            var extracted =
+                Directory.EnumerateFiles(SCRATCH_FILES_PATH, "*.*", SearchOption.AllDirectories)
+                .ToLookup(path => Path.GetExtension(path));
+            var original =
+                Directory.EnumerateFiles(ORIGINAL_FILES_PATH, "*.*", SearchOption.AllDirectories)
+                .ToLookup(path => Path.GetExtension(path));
+
+            Assert.AreEqual(extracted.Count, original.Count);
+
+            foreach (var orig in original)
+            {
+                Assert.IsTrue(extracted.Contains(orig.Key));
+
+                CompareFilesByPath(orig.Single(), extracted[orig.Key].Single());
+            }
+        }
+
+        protected void CompareFilesByPath(string file1, string file2)
+        {
+            using (var file1Stream = File.OpenRead(file1))
+            using (var file2Stream = File.OpenRead(file2))
+            {
+                Assert.AreEqual(file1Stream.Length, file2Stream.Length);
+                int byte1 = 0;
+                int byte2 = 0;
+                for (int counter = 0; byte1 != -1; counter++)
+                {
+                    byte1 = file1Stream.ReadByte();
+                    byte2 = file2Stream.ReadByte();
+                    if (byte1 != byte2)
+                        Assert.AreEqual(byte1, byte2, string.Format("Byte {0} differ between {1} and {2}",
+                            counter, file1, file2));
+                }
+            }
+        }
+
+        protected void CompareArchivesByPath(string file1, string file2)
+        {
+            using (var archive1 = ReaderFactory.Open(File.OpenRead(file1), Options.None))
+            using (var archive2 = ReaderFactory.Open(File.OpenRead(file2), Options.None))
+            {
+                while (archive1.MoveToNextEntry())
+                {
+                    Assert.IsTrue(archive2.MoveToNextEntry());
+                    Assert.AreEqual(archive1.Entry.FilePath, archive2.Entry.FilePath);
+                }
+                Assert.IsFalse(archive2.MoveToNextEntry());
+            }
+        }
+
+        private static readonly object testLock = new object();
+
+        [TestInitialize]
+        public void TestSetup()
+        {
+            Monitor.Enter(testLock);
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            Monitor.Exit(testLock);
+        }
+    }
+}

SharpCompress.Test/TestStream.cs

@@ -0,0 +1,85 @@
+using System.IO;
+
+namespace SharpCompress.Test
+{
+   public class TestStream : Stream
+   {
+      private Stream stream;
+      private bool read;
+      private bool write;
+      private bool seek;
+
+      public TestStream(Stream stream)
+         : this(stream, true, true, true)
+      {
+      }
+
+      public bool IsDisposed { get; private set; }
+
+      public TestStream(Stream stream, bool read, bool write, bool seek)
+      {
+         this.stream = stream;
+         this.read = read;
+         this.write = write;
+         this.seek = seek;
+      }
+
+      protected override void Dispose(bool disposing)
+      {
+         base.Dispose(disposing);
+         stream.Dispose();
+         IsDisposed = true;
+      }
+
+      public override bool CanRead
+      {
+         get { return read; }
+      }
+
+      public override bool CanSeek
+      {
+         get { return seek; }
+      }
+
+      public override bool CanWrite
+      {
+         get { return write; }
+      }
+
+      public override void Flush()
+      {
+         stream.Flush();
+      }
+
+      public override long Length
+      {
+         get { return stream.Length; }
+      }
+
+      public override long Position
+      {
+         get { return stream.Position; }
+         set { stream.Position = value; }
+      }
+
+      public override int Read(byte[] buffer, int offset, int count)
+      {
+         return stream.Read(buffer, offset, count);
+      }
+
+      public override long Seek(long offset, SeekOrigin origin)
+      {
+         return stream.Seek(offset, origin);
+      }
+
+      public override void SetLength(long value)
+      {
+         stream.SetLength(value);
+      }
+
+      public override void Write(byte[] buffer, int offset, int count)
+      {
+         stream.Write(buffer, offset, count);
+      }
+   }
+}

SharpCompress.Test/WriterTests.cs

@@ -0,0 +1,36 @@
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+using SharpCompress.Writer;
+
+namespace SharpCompress.Test
+{
+    public class WriterTests : TestBase
+    {
+        private ArchiveType type;
+
+        protected WriterTests(ArchiveType type)
+        {
+            this.type = type;
+        }
+
+        protected void Write(CompressionType compressionType, string archive, string archiveToVerifyAgainst)
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive)))
+            using (var writer = WriterFactory.Open(stream, type, compressionType))
+            {
+               writer.WriteAll(ORIGINAL_FILES_PATH, "*", SearchOption.AllDirectories);
+            }
+            CompareArchivesByPath(Path.Combine(SCRATCH2_FILES_PATH, archive),
+               Path.Combine(TEST_ARCHIVES_PATH, archiveToVerifyAgainst));
+
+            using (Stream stream = File.OpenRead(Path.Combine(SCRATCH2_FILES_PATH, archive)))
+            using (var reader = ReaderFactory.Open(stream))
+            {
+               reader.WriteAllToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath);
+            }
+            VerifyFiles();
+        }
+    }
+}

SharpCompress.Test/Zip/ZipArchiveTests.cs

@@ -0,0 +1,310 @@
+
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Archive;
+using SharpCompress.Archive.Zip;
+using SharpCompress.Common;
+using SharpCompress.Writer;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class ZipArchiveTests : ArchiveTests
+    {
+        public ZipArchiveTests()
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+
+        [TestMethod]
+        public void Zip_ZipX_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.zipx");
+        }
+
+
+        [TestMethod]
+        public void Zip_BZip2_Streamed_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.bzip2.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_BZip2_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.bzip2.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed2_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.deflate.dd-.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.deflate.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.deflate.zip");
+        }
+
+        [TestMethod]
+        public void Zip_LZMA_Streamed_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.lzma.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_LZMA_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.lzma.zip");
+        }
+        [TestMethod]
+        public void Zip_PPMd_Streamed_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.ppmd.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_PPMd_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.ppmd.zip");
+        }
+        [TestMethod]
+        public void Zip_None_ArchiveStreamRead()
+        {
+            ArchiveStreamRead("Zip.none.zip");
+        }
+
+        [TestMethod]
+        public void Zip_BZip2_Streamed_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.bzip2.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_BZip2_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.bzip2.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed2_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.deflate.dd-.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.deflate.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_Deflate_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.deflate.zip");
+        }
+
+        [TestMethod]
+        public void Zip_LZMA_Streamed_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.lzma.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_LZMA_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.lzma.zip");
+        }
+        [TestMethod]
+        public void Zip_PPMd_Streamed_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.ppmd.dd.zip");
+        }
+        [TestMethod]
+        public void Zip_PPMd_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.ppmd.zip");
+        }
+        [TestMethod]
+        public void Zip_None_ArchiveFileRead()
+        {
+            ArchiveFileRead("Zip.none.zip");
+        }
+
+        [TestMethod]
+        public void Zip_Random_Write_Remove()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip");
+
+            base.ResetScratch();
+            using (var archive = ZipArchive.Open(unmodified))
+            {
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
+                archive.RemoveEntry(entry);
+                archive.SaveTo(scratchPath, CompressionType.Deflate);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(ArchiveException))]
+        public void Zip_Random_Write_Remove_Fail()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip");
+
+            base.ResetScratch();
+            using (var stream = File.OpenRead(unmodified))
+            using (var archive = ZipArchive.Open(stream))
+            {
+                var entry = archive.Entries.Where(x => x.FilePath.EndsWith("jpg")).Single();
+                archive.RemoveEntry(entry);
+                archive.SaveTo(scratchPath, CompressionType.Deflate);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+
+        [TestMethod]
+        public void Zip_Random_Write_Add()
+        {
+            string jpg = Path.Combine(ORIGINAL_FILES_PATH, "jpg\\test.jpg");
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.mod.zip");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod.zip");
+            string modified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.mod2.zip");
+
+            base.ResetScratch();
+            using (var archive = ZipArchive.Open(unmodified))
+            {
+                archive.AddEntry("jpg\\test.jpg", jpg);
+                archive.SaveTo(scratchPath, CompressionType.Deflate);
+            }
+            CompareArchivesByPath(modified, scratchPath);
+        }
+
+        [TestMethod]
+        public void Zip_Create_New()
+        {
+            string scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.noEmptyDirs.zip");
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
+
+            base.ResetScratch();
+            using (var archive = ZipArchive.Create())
+            {
+                archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
+                archive.SaveTo(scratchPath, CompressionType.Deflate);
+            }
+            CompareArchivesByPath(unmodified, scratchPath);
+        }
+
+        [TestMethod]
+        public void Zip_Deflate_WinzipAES_Read()
+        {
+            ResetScratch();
+            using (var reader = ZipArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.WinzipAES.zip"), "test"))
+            {
+                foreach (var entry in reader.Entries.Where(x => !x.IsDirectory))
+                {
+                    entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+
+        [TestMethod]
+        public void Zip_BZip2_Pkware_Read()
+        {
+            ResetScratch();
+            using (var reader = ZipArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.pkware.zip"), "test"))
+            {
+                foreach (var entry in reader.Entries.Where(x => !x.IsDirectory))
+                {
+                    entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Zip_Random_Entry_Access()
+        {
+            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
+
+            base.ResetScratch();
+            ZipArchive a = ZipArchive.Open(unmodified);
+            int count = 0;
+            foreach (var e in a.Entries)
+                count++;
+
+            //Prints 3
+            Assert.AreEqual(count, 3);
+            a.Dispose();
+
+            a = ZipArchive.Open(unmodified);
+            int count2 = 0;
+
+            foreach (var e in a.Entries)
+            {
+                count2++;
+
+                //Stop at last file
+                if (count2 == count)
+                {
+                    var s = e.OpenEntryStream();
+                    s.ReadByte(); //Actually access stream
+                    s.Dispose();
+                    break;
+                }
+            }
+
+            int count3 = 0;
+            foreach (var e in a.Entries)
+                count3++;
+
+            Assert.AreEqual(count3, 3);
+        }
+
+
+        class NonSeekableMemoryStream : MemoryStream
+        {
+            public override bool CanSeek
+            {
+                get
+                {
+                    return false;
+                }
+            }
+        }
+
+        [TestMethod]
+        public void TestSharpCompressWithEmptyStream()
+        {
+            MemoryStream stream = new NonSeekableMemoryStream();
+
+            using (IWriter zipWriter = WriterFactory.Open(stream, ArchiveType.Zip, CompressionType.Deflate))
+            {
+                zipWriter.Write("foo.txt", new MemoryStream(new byte[0]));
+                zipWriter.Write("foo2.txt", new MemoryStream(new byte[10]));
+            }
+
+            stream = new MemoryStream(stream.ToArray());
+            File.WriteAllBytes("foo.zip", stream.ToArray());
+
+            using (var zipArchive = ZipArchive.Open(stream))
+            {
+                foreach(var entry in zipArchive.Entries)
+                {
+                    using (var entryStream = entry.OpenEntryStream())
+                    {
+                        MemoryStream tempStream = new MemoryStream();
+                        const int bufSize = 0x1000;
+                        byte[] buf = new byte[bufSize];
+                        int bytesRead = 0;
+                        while ((bytesRead = entryStream.Read(buf, 0, bufSize)) > 0)
+                            tempStream.Write(buf, 0, bytesRead);
+                    }
+                }
+            }
+        }
+    }
+}

SharpCompress.Test/Zip/ZipReaderTests.cs

@@ -0,0 +1,224 @@
+using System;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+using SharpCompress.Reader;
+using SharpCompress.Reader.Zip;
+using SharpCompress.Writer;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class ZipReaderTests : ReaderTests
+    {
+        public ZipReaderTests()
+        {
+            UseExtensionInsteadOfNameToVerify = true;
+        }
+        [TestMethod]
+        public void Zip_ZipX_Streamed_Read()
+        {
+            Read("Zip.Zipx", CompressionType.LZMA);
+        }
+
+        [TestMethod]
+        public void Zip_BZip2_Streamed_Read()
+        {
+            Read("Zip.bzip2.dd.zip", CompressionType.BZip2);
+        }
+        [TestMethod]
+        public void Zip_BZip2_Read()
+        {
+            Read("Zip.bzip2.zip", CompressionType.BZip2);
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed2_Read()
+        {
+            Read("Zip.deflate.dd-.zip", CompressionType.Deflate);
+        }
+        [TestMethod]
+        public void Zip_Deflate_Streamed_Read()
+        {
+            Read("Zip.deflate.dd.zip", CompressionType.Deflate);
+        }
+        [TestMethod]
+        public void Zip_Deflate_Read()
+        {
+            Read("Zip.deflate.zip", CompressionType.Deflate);
+        }
+
+        [TestMethod]
+        public void Zip_LZMA_Streamed_Read()
+        {
+            Read("Zip.lzma.dd.zip", CompressionType.LZMA);
+        }
+        [TestMethod]
+        public void Zip_LZMA_Read()
+        {
+            Read("Zip.lzma.zip", CompressionType.LZMA);
+        }
+        [TestMethod]
+        public void Zip_PPMd_Streamed_Read()
+        {
+            Read("Zip.ppmd.dd.zip", CompressionType.PPMd);
+        }
+        [TestMethod]
+        public void Zip_PPMd_Read()
+        {
+            Read("Zip.ppmd.zip", CompressionType.PPMd);
+        }
+
+        [TestMethod]
+        public void Zip_None_Read()
+        {
+            Read("Zip.none.zip", CompressionType.None);
+        }
+
+        [TestMethod]
+        public void Zip_Deflate_NoEmptyDirs_Read()
+        {
+            Read("Zip.deflate.noEmptyDirs.zip", CompressionType.Deflate);
+        }
+
+        [TestMethod]
+        public void Zip_BZip2_PkwareEncryption_Read()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Zip.bzip2.pkware.zip")))
+            using (var reader = ZipReader.Open(stream, "test"))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.BZip2);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Zip_Reader_Disposal_Test()
+        {
+            ResetScratch();
+            using (TestStream stream = new TestStream(File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.dd.zip"))))
+            {
+                using (var reader = ReaderFactory.Open(stream, Options.None))
+                {
+                    while (reader.MoveToNextEntry())
+                    {
+                        if (!reader.Entry.IsDirectory)
+                        {
+                            reader.WriteEntryToDirectory(SCRATCH_FILES_PATH,
+                                                         ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                        }
+                    }
+                }
+                Assert.IsTrue(stream.IsDisposed);
+            }
+        }
+
+        [TestMethod]
+        public void Zip_Reader_Disposal_Test2()
+        {
+            ResetScratch();
+            using (TestStream stream = new TestStream(File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.dd.zip"))))
+            {
+                var reader = ReaderFactory.Open(stream, Options.None);
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH,
+                                                     ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+                Assert.IsFalse(stream.IsDisposed);
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void Zip_LZMA_WinzipAES_Read()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Zip.lzma.winzipaes.zip")))
+            using (var reader = ZipReader.Open(stream, "test"))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Unknown);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        [TestMethod]
+        public void Zip_Deflate_WinzipAES_Read()
+        {
+            ResetScratch();
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.WinzipAES.zip")))
+            using (var reader = ZipReader.Open(stream, "test"))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Unknown);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH,
+                                                     ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
+                    }
+                }
+            }
+            VerifyFiles();
+        }
+
+        class NonSeekableMemoryStream : MemoryStream
+        {
+            public override bool CanSeek
+            {
+                get
+                {
+                    return false;
+                }
+            }
+        }
+
+        [TestMethod]
+        public void TestSharpCompressWithEmptyStream()
+        {
+            MemoryStream stream = new NonSeekableMemoryStream();
+
+            using (IWriter zipWriter = WriterFactory.Open(stream, ArchiveType.Zip, CompressionType.Deflate))
+            {
+                zipWriter.Write("foo.txt", new MemoryStream(new byte[0]));
+                zipWriter.Write("foo2.txt", new MemoryStream(new byte[10]));
+            }
+
+            stream = new MemoryStream(stream.ToArray());
+            File.WriteAllBytes("foo.zip", stream.ToArray());
+
+            using (IReader zipReader = ZipReader.Open(stream))
+            {
+                while (zipReader.MoveToNextEntry())
+                {
+                    using (EntryStream entry = zipReader.OpenEntryStream())
+                    {
+                        MemoryStream tempStream = new MemoryStream();
+                        const int bufSize = 0x1000;
+                        byte[] buf = new byte[bufSize];
+                        int bytesRead = 0;
+                        while ((bytesRead = entry.Read(buf, 0, bufSize)) > 0)
+                            tempStream.Write(buf, 0, bytesRead);
+                    }
+                }
+            }
+        }
+    }
+}

SharpCompress.Test/Zip/ZipWriterTests.cs

@@ -1,53 +1,54 @@
-using System.Text;
-
-using SharpCompress.Common;
-using Xunit;
-
-namespace SharpCompress.Test.Zip
-{
-    public class ZipWriterTests : WriterTests
-    {
-        public ZipWriterTests()
-            : base(ArchiveType.Zip)
-        {
-        }
-
-
-        [Fact]
-        public void Zip_Deflate_Write()
-        {
-            Write(CompressionType.Deflate, "Zip.deflate.noEmptyDirs.zip", "Zip.deflate.noEmptyDirs.zip", Encoding.UTF8);
-        }
-
-        [Fact]
-        public void Zip_BZip2_Write()
-        {
-            Write(CompressionType.BZip2, "Zip.bzip2.noEmptyDirs.zip", "Zip.bzip2.noEmptyDirs.zip", Encoding.UTF8);
-        }
-
-        [Fact]
-        public void Zip_None_Write()
-        {
-            Write(CompressionType.None, "Zip.none.noEmptyDirs.zip", "Zip.none.noEmptyDirs.zip", Encoding.UTF8);
-        }
-
-        [Fact]
-        public void Zip_LZMA_Write()
-        {
-            Write(CompressionType.LZMA, "Zip.lzma.noEmptyDirs.zip", "Zip.lzma.noEmptyDirs.zip", Encoding.UTF8);
-        }
-
-        [Fact]
-        public void Zip_PPMd_Write()
-        {
-            Write(CompressionType.PPMd, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip", Encoding.UTF8);
-        }
-
-
-        [Fact]
-        public void Zip_Rar_Write()
-        {
-            Assert.Throws<InvalidFormatException>(() => Write(CompressionType.Rar, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip"));
-        }
-    }
-}
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SharpCompress.Common;
+
+namespace SharpCompress.Test
+{
+    [TestClass]
+    public class ZipWriterTests : WriterTests
+    {
+        public ZipWriterTests()
+            : base(ArchiveType.Zip)
+        {
+        }
+
+        [TestMethod]
+        public void Zip_Deflate_Write()
+        {
+            Write(CompressionType.Deflate, "Zip.deflate.noEmptyDirs.zip", "Zip.deflate.noEmptyDirs.zip");
+        }
+
+
+        [TestMethod]
+        public void Zip_BZip2_Write()
+        {
+            Write(CompressionType.BZip2, "Zip.bzip2.noEmptyDirs.zip", "Zip.bzip2.noEmptyDirs.zip");
+        }
+
+
+        [TestMethod]
+        public void Zip_None_Write()
+        {
+            Write(CompressionType.None, "Zip.none.noEmptyDirs.zip", "Zip.none.noEmptyDirs.zip");
+        }
+
+
+        [TestMethod]
+        public void Zip_LZMA_Write()
+        {
+            Write(CompressionType.LZMA, "Zip.lzma.noEmptyDirs.zip", "Zip.lzma.noEmptyDirs.zip");
+        }
+
+        [TestMethod]
+        public void Zip_PPMd_Write()
+        {
+            Write(CompressionType.PPMd, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip");
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidFormatException))]
+        public void Zip_Rar_Write()
+        {
+            Write(CompressionType.Rar, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip");
+        }
+    }
+}

SharpCompress.shfbproj

@@ -0,0 +1,53 @@
+<?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,44 +1,64 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C5BE746-03E5-4895-9988-0B57F162F86C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0F0901FF-E8D9-426A-B5A2-17C7F47C1529}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpCompress", "src\SharpCompress\SharpCompress.csproj", "{FD19DDD8-72B2-4024-8665-0D1F7A2AA998}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpCompress.Test", "tests\SharpCompress.Test\SharpCompress.Test.csproj", "{F2B1A1EB-0FA6-40D0-8908-E13247C7226F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "build", "build\build.csproj", "{D4D613CB-5E94-47FB-85BE-B8423D20C545}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
-		{F2B1A1EB-0FA6-40D0-8908-E13247C7226F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2B1A1EB-0FA6-40D0-8908-E13247C7226F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2B1A1EB-0FA6-40D0-8908-E13247C7226F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2B1A1EB-0FA6-40D0-8908-E13247C7226F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4D613CB-5E94-47FB-85BE-B8423D20C545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4D613CB-5E94-47FB-85BE-B8423D20C545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4D613CB-5E94-47FB-85BE-B8423D20C545}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4D613CB-5E94-47FB-85BE-B8423D20C545}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FD19DDD8-72B2-4024-8665-0D1F7A2AA998} = {3C5BE746-03E5-4895-9988-0B57F162F86C}
-		{F2B1A1EB-0FA6-40D0-8908-E13247C7226F} = {0F0901FF-E8D9-426A-B5A2-17C7F47C1529}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+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
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "SharpCompress\SharpCompress.csproj", "{10A689CF-76A2-4A4F-96E4-553C33398438}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test", "SharpCompress.Test\SharpCompress.Test.csproj", "{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Portable", "SharpCompress\SharpCompress.Portable.csproj", "{7FA7D133-1417-4F85-9998-4C618AC8FEDA}"
+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
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		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
+	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}
+	EndGlobalSection
+EndGlobal

SharpCompress.sln.DotSettings

@@ -1,132 +1,6 @@
 <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:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArgumentsStyleNamedExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Fdowhile/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Ffixed/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Ffor/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Fforeach/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Fifelse/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Flock/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Fusing/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeBraces_005Fwhile/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Basic_0020Clean/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Basic Clean"&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;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="False" RemoveRedundantParentheses="False" AddMissingParentheses="False" ArrangeBraces="True" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;/Profile&gt;</s:String>
-	
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Basic Clean</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/APPLY_ON_COMPLETION/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ARGUMENTS_NAMED/@EntryValue">Named</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_FIRST_ARG_BY_PAREN/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXPRESSION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_START_COMMENT/@EntryValue">0</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_SINGLE_LINE_COMMENT/@EntryValue">1</s:Int64>
-	
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_ATTRIBUTE_STYLE/@EntryValue">SEPARATE</s:String>
-	<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:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</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:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSORHOLDER_ON_SINGLE_LINE/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE/@EntryValue">True</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_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_ARROW_OP/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
-	
-	
-	<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/STICK_COMMENT/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_EXTENDS_LIST_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForBuiltInTypes/@EntryValue">UseVarWhenEvident</s:String>
-	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseVarWhenEvident</s:String>
-	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseVarWhenEvident</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/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@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_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
-	<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_002ECSharpPlaceAttributeOnSameLineMigration/@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:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=6af8f80e_002D9fdd_002D4223_002D8e02_002D473db916f9b2/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="All tests from Solution" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
-  &lt;Solution /&gt;
-&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/AbsolutePath/@EntryValue">D:\Git\sharpcompress\SharpCompress\sharpcompress.DotSettings</s:String>
+	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/RelativePath/@EntryValue">..\SharpCompress\sharpcompress.DotSettings</s:String>
+	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=181069325DAB1C4287CD564D6CDDEDB3/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File181069325DAB1C4287CD564D6CDDEDB3/@KeyIndexDefined">True</s:Boolean>
+	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File181069325DAB1C4287CD564D6CDDEDB3/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>

SharpCompress/Archive/AbstractArchive.cs

@@ -1,177 +1,205 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Archives
-{
-    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 ReaderOptions ReaderOptions { get; }
-
-        private bool disposed;
-
-        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, ReaderOptions readerOptions)
-        {
-            Type = type;
-            if (!fileInfo.Exists)
-            {
-                throw new ArgumentException("File does not exist: " + fileInfo.FullName);
-            }
-            ReaderOptions = readerOptions;
-            readerOptions.LeaveStreamOpen = false;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(fileInfo));
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
-        }
-
-
-        protected abstract IEnumerable<TVolume> LoadVolumes(FileInfo file);
-
-        internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, ReaderOptions readerOptions)
-        {
-            Type = type;
-            ReaderOptions = readerOptions;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams)));
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
-        }
-
-#nullable disable
-        internal AbstractArchive(ArchiveType type)
-        {
-            Type = type;
-            lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
-            lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
-        }
-#nullable enable
-
-        public ArchiveType Type { get; }
-
-        void IArchiveExtractionListener.FireEntryExtractionBegin(IArchiveEntry entry)
-        {
-            EntryExtractionBegin?.Invoke(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
-        }
-
-        void IArchiveExtractionListener.FireEntryExtractionEnd(IArchiveEntry entry)
-        {
-            EntryExtractionEnd?.Invoke(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 => lazyEntries;
-
-        /// <summary>
-        /// Returns an ReadOnlyCollection of all the RarArchiveVolumes across the one or many parts of the RarArchive.
-        /// </summary>
-        public ICollection<TVolume> Volumes => lazyVolumes;
-
-        /// <summary>
-        /// The total size of the files compressed in the archive.
-        /// </summary>
-        public virtual long TotalSize => 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 => Entries.Aggregate(0L, (total, cf) => total + cf.Size);
-
-        protected abstract IEnumerable<TVolume> LoadVolumes(IEnumerable<Stream> streams);
-        protected abstract IEnumerable<TEntry> LoadEntries(IEnumerable<TVolume> volumes);
-
-        IEnumerable<IArchiveEntry> IArchive.Entries => Entries.Cast<IArchiveEntry>();
-
-        IEnumerable<IVolume> IArchive.Volumes => lazyVolumes.Cast<IVolume>();
-
-        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)
-        {
-            CompressedBytesRead?.Invoke(this, new CompressedBytesReadEventArgs(
-                currentFilePartCompressedBytesRead: currentPartCompressedBytes,
-                compressedBytesRead: compressedReadBytes
-            ));
-        }
-
-        void IExtractionListener.FireFilePartExtractionBegin(string name, long size, long compressedSize)
-        {
-            FilePartExtractionBegin?.Invoke(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 => 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, IStreamListener
+        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;
+
+#if !PORTABLE && !NETFX_CORE
+        internal AbstractArchive(ArchiveType type, FileInfo fileInfo, Options options)
+        {
+            this.Type = type;
+            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)
+        {
+            this.Type = type;
+            lazyVolumes =
+                new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select<Stream, Stream>(CheckStreams), options));
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
+        }
+
+        internal AbstractArchive(ArchiveType type)
+        {
+            this.Type = type;
+            lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
+            lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
+        }
+
+        internal void FireEntryExtractionBegin(IArchiveEntry entry)
+        {
+            if (EntryExtractionBegin != null)
+            {
+                EntryExtractionBegin(this, new ArchiveExtractionEventArgs<IArchiveEntry>(entry));
+            }
+        }
+
+        internal void 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>
+        /// <returns></returns>
+        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>
+        /// <returns></returns>
+        public ICollection<TVolume> Volumes
+        {
+            get { return lazyVolumes; }
+        }
+
+        /// <summary>
+        /// The total size of the files compressed in the archive.
+        /// </summary>
+        public long TotalSize
+        {
+            get { return Entries.Aggregate(0L, (total, cf) => total + cf.CompressedSize); }
+        }
+
+        protected abstract IEnumerable<TVolume> LoadVolumes(IEnumerable<Stream> streams, Options options);
+        protected abstract IEnumerable<TEntry> LoadEntries(IEnumerable<TVolume> volumes);
+
+        IEnumerable<IArchiveEntry> IArchive.Entries
+        {
+            get { return lazyEntries.Cast<IArchiveEntry>(); }
+        }
+
+        IEnumerable<IVolume> IArchive.Volumes
+        {
+            get { return lazyVolumes.Cast<IVolume>(); }
+        }
+
+        private bool disposed;
+
+        public void Dispose()
+        {
+            if (!disposed)
+            {
+                lazyVolumes.ForEach(v => v.Dispose());
+                lazyEntries.GetLoaded().Cast<Entry>().ForEach(x => x.Close());
+                disposed = true;
+            }
+        }
+
+        internal void EnsureEntriesLoaded()
+        {
+            lazyEntries.EnsureFullyLoaded();
+            lazyVolumes.EnsureFullyLoaded();
+        }
+
+
+        public ArchiveType Type { get; private set; }
+
+        void IStreamListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
+        {
+            if (CompressedBytesRead != null)
+            {
+                CompressedBytesRead(this, new CompressedBytesReadEventArgs()
+                                              {
+                                                  CurrentFilePartCompressedBytesRead = currentPartCompressedBytes,
+                                                  CompressedBytesRead = compressedReadBytes
+                                              });
+            }
+        }
+
+        void IStreamListener.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()
+        {
+            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
+            {
+                EnsureEntriesLoaded();
+                return Entries.All(x => x.IsComplete);
+            }
+        }
+    }
+}

SharpCompress/Archive/AbstractWritableArchive.Extensions.cs

@@ -0,0 +1,85 @@
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public static class AbstractWritableArchiveExtensions
+    {
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   Stream stream, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
+        }
+
+#if !PORTABLE && !NETFX_CORE
+
+        public static void AddEntry<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                     string entryPath, string filePath)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            var fileInfo = new FileInfo(filePath);
+            if (!fileInfo.Exists)
+            {
+                throw new FileNotFoundException("Could not AddEntry: " + filePath);
+            }
+            writableArchive.AddEntry(entryPath, new FileInfo(filePath).OpenRead(), true, fileInfo.Length,
+                                     fileInfo.LastWriteTime);
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   string filePath, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(new FileInfo(filePath), new CompressionInfo {Type = compressionType});
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   FileInfo fileInfo, CompressionType compressionType)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+            {
+                writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
+            }
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   string filePath, CompressionInfo compressionInfo)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            writableArchive.SaveTo(new FileInfo(filePath), compressionInfo);
+        }
+
+        public static void SaveTo<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+                                                   FileInfo fileInfo, CompressionInfo compressionInfo)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+            {
+                writableArchive.SaveTo(stream, compressionInfo);
+            }
+        }
+
+        public static void AddAllFromDirectory<TEntry, TVolume>(
+            this AbstractWritableArchive<TEntry, TVolume> writableArchive,
+            string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
+            where TEntry : IArchiveEntry
+            where TVolume : IVolume
+        {
+            foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))
+            {
+                var fileInfo = new FileInfo(path);
+                writableArchive.AddEntry(path.Substring(filePath.Length), fileInfo.OpenRead(), true, fileInfo.Length,
+                                         fileInfo.LastWriteTime);
+            }
+        }
+#endif
+    }
+}

SharpCompress/Archive/AbstractWritableArchive.cs

@@ -0,0 +1,121 @@
+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>
+        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;
+        private readonly bool anyNotWritable;
+
+        internal AbstractWritableArchive(ArchiveType type)
+            : base(type)
+        {
+        }
+
+        internal AbstractWritableArchive(ArchiveType type, IEnumerable<Stream> streams, Options options)
+            : base(type, streams, options)
+        {
+            if (streams.Any(x => !x.CanWrite))
+            {
+                anyNotWritable = true;
+            }
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        internal AbstractWritableArchive(ArchiveType type, FileInfo fileInfo, Options options)
+            : base(type, fileInfo, options)
+        {
+        }
+#endif
+
+        private void CheckWritable()
+        {
+            if (anyNotWritable)
+            {
+                throw new ArchiveException("All Archive streams must be Writable to use Archive writing functionality.");
+            }
+        }
+
+        public override ICollection<TEntry> Entries
+        {
+            get
+            {
+                if (hasModifications)
+                {
+                    return modifiedEntries;
+                }
+                return base.Entries;
+            }
+        }
+
+        private void RebuildModifiedCollection()
+        {
+            hasModifications = true;
+            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)
+        {
+            CheckWritable();
+            if (!removedEntries.Contains(entry))
+            {
+                removedEntries.Add(entry);
+                RebuildModifiedCollection();
+            }
+        }
+
+        public void AddEntry(string filePath, Stream source,
+                             long size = 0, DateTime? modified = null)
+        {
+            CheckWritable();
+            newEntries.Add(CreateEntry(filePath, source, size, modified, false));
+            RebuildModifiedCollection();
+        }
+
+        public void AddEntry(string filePath, Stream source, bool closeStream,
+                             long size = 0, DateTime? modified = null)
+        {
+            CheckWritable();
+            newEntries.Add(CreateEntry(filePath, source, size, modified, closeStream));
+            RebuildModifiedCollection();
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        public void AddEntry(string filePath, FileInfo fileInfo)
+        {
+            if (!fileInfo.Exists)
+            {
+                throw new ArgumentException("FileInfo does not exist.");
+            }
+            AddEntry(filePath, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
+        }
+#endif
+
+        public void SaveTo(Stream stream, CompressionInfo compressionType)
+        {
+            SaveTo(stream, compressionType, OldEntries, newEntries);
+        }
+
+        protected abstract TEntry CreateEntry(string filePath, Stream source, long size, DateTime? modified,
+                                              bool closeStream);
+
+        protected abstract void SaveTo(Stream stream, CompressionInfo compressionType,
+                                       IEnumerable<TEntry> oldEntries, IEnumerable<TEntry> newEntries);
+    }
+}

SharpCompress/Archive/ArchiveFactory.cs

@@ -0,0 +1,168 @@
+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 (RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
+            {
+                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);
+            }
+            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);
+            }
+            throw new InvalidOperationException("Cannot determine compressed stream type.  Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
+        }
+
+        public static IArchive Create(ArchiveType type)
+        {
+            switch (type)
+            {
+                case ArchiveType.Zip:
+                    {
+                        return ZipArchive.Create();
+                    }
+                case ArchiveType.Tar:
+                    {
+                        return TarArchive.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 (RarArchive.IsRarFile(stream, Options.LookForHeader | Options.KeepStreamsOpen))
+                {
+                    stream.Dispose();
+                    return RarArchive.Open(fileInfo, options);
+                }
+                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);
+                }
+                throw new InvalidOperationException("Cannot determine compressed stream type.");
+            }
+        }
+
+        /// <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
+    }
+}

SharpCompress/Archive/GZip/GZipArchive.cs

@@ -1,181 +1,213 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.GZip;
-using SharpCompress.Readers;
-using SharpCompress.Readers.GZip;
-using SharpCompress.Writers;
-using SharpCompress.Writers.GZip;
-
-namespace SharpCompress.Archives.GZip
-{
-    public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
-    {
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="readerOptions"></param>
-        public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
-        {
-            filePath.CheckNotNullOrEmpty(nameof(filePath));
-            return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="readerOptions"></param>
-        public static GZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
-        {
-            fileInfo.CheckNotNull(nameof(fileInfo));
-            return new GZipArchive(fileInfo, readerOptions ?? new ReaderOptions());
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="readerOptions"></param>
-        public static GZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
-        {
-            stream.CheckNotNull(nameof(stream));
-            return new GZipArchive(stream, readerOptions ?? new ReaderOptions());
-        }
-
-        public static GZipArchive Create()
-        {
-            return new GZipArchive();
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="options"></param>
-        internal GZipArchive(FileInfo fileInfo, ReaderOptions options)
-            : base(ArchiveType.GZip, fileInfo, options)
-        {
-        }
-
-        protected override IEnumerable<GZipVolume> LoadVolumes(FileInfo file)
-        {
-            return new GZipVolume(file, ReaderOptions).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, new WriterOptions(CompressionType.GZip));
-            }
-        }
-
-        public static bool IsGZipFile(Stream stream)
-        {
-            // read the header on the first read
-            Span<byte> header = stackalloc byte[10];
-
-            // workitem 8501: handle edge case (decompress empty stream)
-            if (!stream.ReadFully(header))
-            {
-                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, ReaderOptions options)
-            : base(ArchiveType.GZip, stream, options)
-        {
-        }
-
-        internal GZipArchive()
-            : base(ArchiveType.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, WriterOptions options,
-                                       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, new GZipWriterOptions(options)))
-            {
-                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)
-        {
-            return new GZipVolume(streams.First(), ReaderOptions).AsEnumerable();
-        }
-
-        protected override IEnumerable<GZipArchiveEntry> LoadEntries(IEnumerable<GZipVolume> volumes)
-        {
-            Stream stream = volumes.Single().Stream;
-            yield return new GZipArchiveEntry(this, new GZipFilePart(stream, ReaderOptions.ArchiveEncoding));
-        }
-
-        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 !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);
+        }
+
+#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.AsEnumerable(), options)
+        {
+        }
+
+        internal GZipArchive()
+            : base(ArchiveType.GZip)
+        {
+        }
+
+        public void SaveTo(Stream stream)
+        {
+            this.SaveTo(stream, CompressionType.GZip);
+        }
+
+        protected override GZipArchiveEntry CreateEntry(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.FilePath, 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);
+        }
+    }
+}

SharpCompress/Archive/GZip/GZipArchiveEntry.cs

@@ -0,0 +1,41 @@
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.GZip;
+
+namespace SharpCompress.Archive.GZip
+{
+    public class GZipArchiveEntry : GZipEntry, IArchiveEntry
+    {
+        private GZipArchive archive;
+
+        internal GZipArchiveEntry(GZipArchive archive, GZipFilePart part)
+            : base(part)
+        {
+            this.archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, streamToWriteTo);
+        }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}

SharpCompress/Archive/GZip/GZipWritableArchiveEntry.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.GZip
+{
+    internal class GZipWritableArchiveEntry : GZipArchiveEntry
+    {
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
+
+        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 uint Crc
+        {
+            get { return 0; }
+        }
+
+        public override string FilePath
+        {
+            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(); }
+        }
+
+        internal Stream Stream { get; private set; }
+
+        public override Stream OpenEntryStream()
+        {
+            return new NonDisposingStream(Stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream)
+            {
+                Stream.Dispose();
+            }
+        }
+    }
+}

SharpCompress/Archive/IArchive.Extensions.cs

@@ -1,20 +1,22 @@
-using System.Linq;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archives
-{
-    public static class IArchiveExtensions
-    {
-        /// <summary>
-        /// Extract to specific directory, retaining filename
-        /// </summary>
-        public static void WriteToDirectory(this IArchive archive, string destinationDirectory,
-                                            ExtractionOptions? options = null)
-        {
-            foreach (IArchiveEntry entry in archive.Entries.Where(x => !x.IsDirectory))
-            {
-                entry.WriteToDirectory(destinationDirectory, options);
-            }
-        }
-    }
+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
+    }
 }

SharpCompress/Archive/IArchive.cs

@@ -1,49 +1,41 @@
-using System;
-using System.Collections.Generic;
-using SharpCompress.Common;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Archives
-{
-    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; }
+        long TotalSize { 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>
+        /// <returns></returns>
+        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; }
+    }
 }

SharpCompress/Archive/IArchiveEntry.Extensions.cs

@@ -0,0 +1,61 @@
+using System.IO;
+using SharpCompress.Common;
+
+namespace SharpCompress.Archive
+{
+    public static class IArchiveEntryExtensions
+    {
+#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.Empty;
+            string file = Path.GetFileName(entry.FilePath);
+
+
+            if (options.HasFlag(ExtractOptions.ExtractFullPath))
+            {
+                string folder = Path.GetDirectoryName(entry.FilePath);
+                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))
+//            using (Stream entryStream = entry.OpenEntryStream())
+            {
+                //entryStream.TransferTo(fs);
+                entry.WriteTo(fs);
+            }
+        }
+#endif
+    }
+}

SharpCompress/Archive/IArchiveEntry.cs

@@ -1,24 +1,21 @@
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archives
-{
-    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();
+
+        void WriteTo(Stream stream);
+
+        /// <summary>
+        /// The archive can find all the parts of the archive needed to extract this entry.
+        /// </summary>
+        bool IsComplete { get; }
+    }
 }

SharpCompress/Archive/Rar/FileInfoRarArchiveVolume.cs

@@ -0,0 +1,51 @@
+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, Options options)
+            : base(StreamingMode.Seekable, fileInfo.OpenRead(), 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;
+        }
+
+        public override FileInfo VolumeFile
+        {
+            get { return FileInfo; }
+        }
+    }
+}

SharpCompress/Archive/Rar/FileInfoRarFilePart.cs

@@ -0,0 +1,36 @@
+using System.IO;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class FileInfoRarFilePart : RarFilePart
+    {
+        private FileInfoRarArchiveVolume volume;
+
+        internal FileInfoRarFilePart(FileInfoRarArchiveVolume volume, MarkHeader mh, FileHeader fh, FileInfo fi)
+            : base(mh, fh)
+        {
+            this.volume = volume;
+            FileInfo = fi;
+        }
+
+        internal FileInfo FileInfo { get; private set; }
+
+        internal override Stream GetCompressedStream()
+        {
+            var stream = volume.Stream;
+            stream.Position = FileHeader.DataStartPosition;
+            return stream;
+        }
+
+        internal override string FilePartName
+        {
+            get
+            {
+                return "Rar File: " + FileInfo.FullName
+                       + " File Entry: " + FileHeader.FileName;
+            }
+        }
+    }
+}

SharpCompress/Archive/Rar/RarArchive.Extensions.cs

@@ -1,23 +1,31 @@
-using System.Linq;
-
-namespace SharpCompress.Archives.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;
+        }
+
+        /// <summary>
+        /// RarArchive is SOLID (this means the Archive saved bytes by reusing information which helps for archives containing many small files).
+        /// </summary>
+        public static bool IsSolidArchive(this RarArchive archive)
+        {
+            return archive.IsSolid;
+        }
+    }
 }

SharpCompress/Archive/Rar/RarArchive.cs

@@ -0,0 +1,203 @@
+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>
+        internal RarArchive(FileInfo fileInfo, Options options)
+            : base(ArchiveType.Rar, fileInfo, options)
+        {
+        }
+
+        protected override IEnumerable<RarVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            return RarArchiveVolumeFactory.GetParts(file, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        /// <param name="options"></param>
+        internal RarArchive(IEnumerable<Stream> streams, Options options)
+            : base(ArchiveType.Rar, streams, options)
+        {
+        }
+
+        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, 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>
+        public static RarArchive 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 RarArchive 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 RarArchive 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 RarArchive Open(FileInfo fileInfo, Options options)
+        {
+            fileInfo.CheckNotNull("fileInfo");
+            return new RarArchive(fileInfo, options);
+        }
+#endif
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        public static RarArchive Open(Stream stream)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream.AsEnumerable());
+        }
+
+        /// <summary>
+        /// Takes a seekable Stream as a source
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="options"></param>
+        public static RarArchive Open(Stream stream, Options options)
+        {
+            stream.CheckNotNull("stream");
+            return Open(stream.AsEnumerable(), options);
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        public static RarArchive Open(IEnumerable<Stream> streams)
+        {
+            streams.CheckNotNull("streams");
+            return new RarArchive(streams, Options.KeepStreamsOpen);
+        }
+
+        /// <summary>
+        /// Takes multiple seekable Streams for a multi-part archive
+        /// </summary>
+        /// <param name="streams"></param>
+        /// <param name="options"></param>
+        public static RarArchive Open(IEnumerable<Stream> streams, Options options)
+        {
+            streams.CheckNotNull("streams");
+            return new RarArchive(streams, options);
+        }
+
+#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
+    }
+}

SharpCompress/Archive/Rar/RarArchiveEntry.cs

@@ -0,0 +1,105 @@
+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;
+
+        internal RarArchiveEntry(RarArchive archive, IEnumerable<RarFilePart> parts)
+        {
+            this.parts = parts.ToList();
+            Archive = archive;
+        }
+
+        public override CompressionType CompressionType
+        {
+            get { return CompressionType.Rar; }
+        }
+
+        private RarArchive Archive { get; set; }
+
+        internal override IEnumerable<FilePart> Parts
+        {
+            get { return parts.Cast<FilePart>(); }
+        }
+
+        internal override FileHeader FileHeader
+        {
+            get { return parts.First().FileHeader; }
+        }
+
+        public override uint Crc
+        {
+            get
+            {
+                CheckIncomplete();
+                return parts.Select(fp => fp.FileHeader)
+                            .Where(fh => !fh.FileFlags.HasFlag(FileFlags.SPLIT_AFTER))
+                            .Single().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 void WriteTo(Stream streamToWriteTo)
+        {
+            CheckIncomplete();
+            if (Archive.IsSolidArchive())
+            {
+                throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
+            }
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(Archive, streamToWriteTo);
+        }
+
+        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.");
+            }
+        }
+
+        internal override void Close()
+        {
+        }
+    }
+}

SharpCompress/Archive/Rar/RarArchiveEntryFactory.cs

@@ -1,49 +1,49 @@
-using System.Collections.Generic;
-using SharpCompress.Common.Rar;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Archives.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 (!fp.FileHeader.IsSplitAfter)
-                {
-                    yield return groupedParts;
-                    groupedParts = new List<RarFilePart>();
-                }
-            }
-            if (groupedParts.Count > 0)
-            {
-                yield return groupedParts;
-            }
-        }
-
-        internal static IEnumerable<RarArchiveEntry> GetEntries(RarArchive archive,
-                                                                IEnumerable<RarVolume> rarParts,
-                                                                ReaderOptions readerOptions)
-        {
-            foreach (var groupedParts in GetMatchedFileParts(rarParts))
-            {
-                yield return new RarArchiveEntry(archive, groupedParts, readerOptions);
-            }
-        }
-    }
+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);
+            }
+        }
+    }
 }

SharpCompress/Archive/Rar/RarArchiveVolumeFactory.cs

@@ -1,140 +1,147 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common.Rar;
-using SharpCompress.Readers;
-using System.Linq;
-using System.Text;
-using SharpCompress.Common.Rar.Headers;
-
-namespace SharpCompress.Archives.Rar
-{
-    internal static class RarArchiveVolumeFactory
-    {
-        internal static IEnumerable<RarVolume> GetParts(IEnumerable<Stream> streams, ReaderOptions 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, options);
-                yield return part;
-            }
-        }
-
-        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, ReaderOptions options)
-        {
-            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, options);
-            yield return part;
-
-            ArchiveHeader ah = part.ArchiveHeader;
-            if (!ah.IsVolume)
-            {
-                yield break; //if file isn't volume then there is no reason to look
-            }
-            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, options);
-
-                fileInfo = GetNextFileInfo(ah, part.FileParts.FirstOrDefault() as FileInfoRarFilePart)!;
-                yield return part;
-            }
-        }
-
-        private static FileInfo? GetNextFileInfo(ArchiveHeader ah, FileInfoRarFilePart? currentFilePart)
-        {
-            if (currentFilePart is null)
-            {
-                return null;
-            }
-            bool oldNumbering = ah.OldNumberingFormat
-                                || currentFilePart.MarkHeader.OldNumberingFormat;
-            if (oldNumbering)
-            {
-                return FindNextFileWithOldNumbering(currentFilePart.FileInfo);
-            }
-            else
-            {
-                return FindNextFileWithNewNumbering(currentFilePart.FileInfo);
-            }
-        }
-
-        private static FileInfo FindNextFileWithOldNumbering(FileInfo currentFileInfo)
-        {
-            // .rar, .r00, .r01, ...
-            string extension = currentFileInfo.Extension;
-
-            var 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
-            {
-                if (int.TryParse(extension.Substring(2, 2), out int 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);
-            string numString = currentFileInfo.FullName.Substring(startIndex + 5,
-                                                                  currentFileInfo.FullName.IndexOf('.', startIndex + 5) -
-                                                                  startIndex - 5);
-            buffer.Append(".part");
-            if (int.TryParse(numString, out int 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);
-        }
-    }
+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, 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, options);
+                yield return part;
+            }
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        internal static IEnumerable<RarVolume> GetParts(FileInfo fileInfo, Options options)
+        {
+            FileInfoRarArchiveVolume part = new FileInfoRarArchiveVolume(fileInfo, 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, 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
+    }
 }

SharpCompress/Archive/Rar/SeekableStreamFilePart.cs

@@ -0,0 +1,28 @@
+using System.IO;
+using SharpCompress.Common.Rar;
+using SharpCompress.Common.Rar.Headers;
+
+namespace SharpCompress.Archive.Rar
+{
+    internal class SeekableStreamFilePart : RarFilePart
+    {
+        internal SeekableStreamFilePart(MarkHeader mh, FileHeader fh, Stream stream)
+            : base(mh, fh)
+        {
+            Stream = stream;
+        }
+
+        internal Stream Stream { get; private set; }
+
+        internal override Stream GetCompressedStream()
+        {
+            Stream.Position = FileHeader.DataStartPosition;
+            return Stream;
+        }
+
+        internal override string FilePartName
+        {
+            get { return "Unknown Stream - File Entry: " + base.FileHeader.FileName; }
+        }
+    }
+}

SharpCompress/Archive/Rar/StreamRarArchiveVolume.cs

@@ -0,0 +1,34 @@
+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, Options options)
+            : base(StreamingMode.Seekable, stream, options)
+        {
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        public override FileInfo VolumeFile
+        {
+            get { return null; }
+        }
+#endif
+
+        internal override IEnumerable<RarFilePart> ReadFileParts()
+        {
+            return GetVolumeFileParts();
+        }
+
+        internal override RarFilePart CreateFilePart(FileHeader fileHeader, MarkHeader markHeader)
+        {
+            return new SeekableStreamFilePart(markHeader, fileHeader, Stream);
+        }
+    }
+}

SharpCompress/Archive/SevenZip/SevenZipArchive.cs

@@ -1,222 +1,239 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.SevenZip;
-using SharpCompress.Compressors.LZMA.Utilites;
-using SharpCompress.IO;
-using SharpCompress.Readers;
-
-namespace SharpCompress.Archives.SevenZip
-{
-    public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVolume>
-    {
-        private ArchiveDatabase database;
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="readerOptions"></param>
-        public static SevenZipArchive Open(string filePath, ReaderOptions readerOptions = null)
-        {
-            filePath.CheckNotNullOrEmpty("filePath");
-            return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="readerOptions"></param>
-        public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions readerOptions = null)
-        {
-            fileInfo.CheckNotNull("fileInfo");
-            return new SevenZipArchive(fileInfo, readerOptions ?? new ReaderOptions());
-        }
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="readerOptions"></param>
-        public static SevenZipArchive Open(Stream stream, ReaderOptions readerOptions = null)
-        {
-            stream.CheckNotNull("stream");
-            return new SevenZipArchive(stream, readerOptions ?? new ReaderOptions());
-        }
-
-        internal SevenZipArchive(FileInfo fileInfo, ReaderOptions readerOptions)
-            : base(ArchiveType.SevenZip, fileInfo, readerOptions)
-        {
-        }
-
-        protected override IEnumerable<SevenZipVolume> LoadVolumes(FileInfo file)
-        {
-            return new SevenZipVolume(file.OpenRead(), ReaderOptions).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);
-            }
-        }
-
-        internal SevenZipArchive(Stream stream, ReaderOptions readerOptions)
-            : base(ArchiveType.SevenZip, stream.AsEnumerable(), readerOptions)
-        {
-        }
-
-        internal SevenZipArchive()
-            : base(ArchiveType.SevenZip)
-        {
-        }
-
-        protected override IEnumerable<SevenZipVolume> LoadVolumes(IEnumerable<Stream> streams)
-        {
-            foreach (Stream s in streams)
-            {
-                if (!s.CanRead || !s.CanSeek)
-                {
-                    throw new ArgumentException("Stream is not readable and seekable");
-                }
-                SevenZipVolume volume = new SevenZipVolume(s, ReaderOptions);
-                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];
-                yield return new SevenZipArchiveEntry(this, new SevenZipFilePart(stream, database, i, file, ReaderOptions.ArchiveEncoding));
-            }
-        }
-
-        private void LoadFactory(Stream stream)
-        {
-            if (database is null)
-            {
-                stream.Position = 0;
-                var reader = new ArchiveReader();
-                reader.Open(stream);
-                database = reader.ReadDatabase(new PasswordProvider(ReaderOptions.Password));
-            }
-        }
-
-        public static bool IsSevenZipFile(Stream stream)
-        {
-            try
-            {
-                return SignatureMatch(stream);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static ReadOnlySpan<byte> SIGNATURE => new byte[] { (byte)'7', (byte)'z', 0xBC, 0xAF, 0x27, 0x1C };
-
-        private static bool SignatureMatch(Stream stream)
-        {
-            BinaryReader reader = new BinaryReader(stream);
-            ReadOnlySpan<byte> signatureBytes = reader.ReadBytes(6);
-            return signatureBytes.SequenceEqual(SIGNATURE);
-        }
-
-        protected override IReader CreateReaderForSolidExtraction()
-        {
-            return new SevenZipReader(ReaderOptions, 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 sealed class SevenZipReader : AbstractReader<SevenZipEntry, SevenZipVolume>
-        {
-            private readonly SevenZipArchive archive;
-            private CFolder currentFolder;
-            private Stream currentStream;
-            private CFileItem currentItem;
-
-            internal SevenZipReader(ReaderOptions readerOptions, SevenZipArchive archive)
-                : base(readerOptions, ArchiveType.SevenZip)
-            {
-                this.archive = archive;
-            }
-
-            public override SevenZipVolume Volume => archive.Volumes.Single();
-
-            protected 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 is null)
-                    {
-                        currentStream = Stream.Null;
-                    }
-                    else
-                    {
-                        currentStream = archive.database.GetFolderStream(stream, currentFolder, new PasswordProvider(Options.Password));
-                    }
-                    foreach (var entry in group)
-                    {
-                        currentItem = entry.FilePart.Header;
-                        yield return entry;
-                    }
-                }
-            }
-
-            protected override EntryStream GetEntryStream()
-            {
-                return CreateEntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
-            }
-        }
-
-        private class PasswordProvider : IPasswordProvider
-        {
-            private readonly string _password;
-
-            public PasswordProvider(string password)
-            {
-                _password = password;
-            }
-
-            public string CryptoGetTextPassword()
-            {
-                return _password;
-            }
-        }
-    }
-}
+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)
+        {
+        }
+
+        protected override IEnumerable<SevenZipVolume> LoadVolumes(FileInfo file, Options options)
+        {
+            return new SevenZipVolume(file, 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)
+        {
+        }
+
+        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; }
+        }
+
+        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 new EntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
+            }
+        }
+    }
+}

SharpCompress/Archive/SevenZip/SevenZipArchiveEntry.cs

@@ -0,0 +1,44 @@
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.Common.SevenZip;
+
+namespace SharpCompress.Archive.SevenZip
+{
+    public class SevenZipArchiveEntry : SevenZipEntry, IArchiveEntry
+    {
+        private SevenZipArchive archive;
+
+        internal SevenZipArchiveEntry(SevenZipArchive archive, SevenZipFilePart part)
+            : base(part)
+        {
+            this.archive = archive;
+        }
+
+        public Stream OpenEntryStream()
+        {
+            return FilePart.GetCompressedStream();
+        }
+
+        public void WriteTo(Stream stream)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, stream);
+        }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// This is a 7Zip Anti item
+        /// </summary>
+        public bool IsAnti
+        {
+            get { return FilePart.Header.IsAnti; }
+        }
+    }
+}

SharpCompress/Archive/Tar/TarArchive.cs

@@ -1,197 +1,217 @@
-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.Readers;
-using SharpCompress.Readers.Tar;
-using SharpCompress.Writers;
-using SharpCompress.Writers.Tar;
-
-namespace SharpCompress.Archives.Tar
-{
-    public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
-    {
-        /// <summary>
-        /// Constructor expects a filepath to an existing file.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="readerOptions"></param>
-        public static TarArchive Open(string filePath, ReaderOptions? readerOptions = null)
-        {
-            filePath.CheckNotNullOrEmpty(nameof(filePath));
-            return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="readerOptions"></param>
-        public static TarArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
-        {
-            fileInfo.CheckNotNull(nameof(fileInfo));
-            return new TarArchive(fileInfo, readerOptions ?? new ReaderOptions());
-        }
-
-        /// <summary>
-        /// Takes a seekable Stream as a source
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="readerOptions"></param>
-        public static TarArchive Open(Stream stream, ReaderOptions? readerOptions = null)
-        {
-            stream.CheckNotNull(nameof(stream));
-            return new TarArchive(stream, readerOptions ?? new ReaderOptions());
-        }
-
-        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);
-            }
-        }
-
-        public static bool IsTarFile(Stream stream)
-        {
-            try
-            {
-                TarHeader tarHeader = new TarHeader(new ArchiveEncoding());
-                bool readSucceeded = tarHeader.Read(new BinaryReader(stream));
-                bool isEmptyArchive = tarHeader.Name.Length == 0 && tarHeader.Size == 0 && Enum.IsDefined(typeof(EntryType), tarHeader.EntryType);
-                return readSucceeded || isEmptyArchive;
-            }
-            catch
-            {
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Constructor with a FileInfo object to an existing file.
-        /// </summary>
-        /// <param name="fileInfo"></param>
-        /// <param name="readerOptions"></param>
-        internal TarArchive(FileInfo fileInfo, ReaderOptions readerOptions)
-            : base(ArchiveType.Tar, fileInfo, readerOptions)
-        {
-        }
-
-        protected override IEnumerable<TarVolume> LoadVolumes(FileInfo file)
-        {
-            return new TarVolume(file.OpenRead(), ReaderOptions).AsEnumerable();
-        }
-
-        /// <summary>
-        /// Takes multiple seekable Streams for a multi-part archive
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <param name="readerOptions"></param>
-        internal TarArchive(Stream stream, ReaderOptions readerOptions)
-            : base(ArchiveType.Tar, stream, readerOptions)
-        {
-        }
-
-        internal TarArchive()
-            : base(ArchiveType.Tar)
-        {
-        }
-
-        protected override IEnumerable<TarVolume> LoadVolumes(IEnumerable<Stream> streams)
-        {
-            return new TarVolume(streams.First(), ReaderOptions).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, ReaderOptions.ArchiveEncoding))
-            {
-                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 = ReaderOptions.ArchiveEncoding.Decode(bytes).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, WriterOptions options,
-                                       IEnumerable<TarArchiveEntry> oldEntries,
-                                       IEnumerable<TarArchiveEntry> newEntries)
-        {
-            using (var writer = new TarWriter(stream, new TarWriterOptions(options)))
-            {
-                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 !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(EntryType.File);
+                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)
+        {
+            return new TarVolume(file, 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.AsEnumerable(), 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 memoryStream = new MemoryStream();
+                            entry.WriteTo(memoryStream);
+                            memoryStream.Position = 0;
+                            var bytes = memoryStream.ToArray();
+                            header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
+                            previousHeader = null;
+                        }
+                        yield return new TarArchiveEntry(this, new TarFilePart(header, stream), CompressionType.None);
+                    }
+                }
+            }
+        }
+
+        public static TarArchive Create()
+        {
+            return new TarArchive();
+        }
+
+        protected override TarArchiveEntry CreateEntry(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.FilePath, entryStream, entry.LastModifiedTime, entry.Size);
+                    }
+                }
+            }
+        }
+
+        protected override IReader CreateReaderForSolidExtraction()
+        {
+            var stream = Volumes.Single().Stream;
+            stream.Position = 0;
+            return TarReader.Open(stream);
+        }
+    }
+}

SharpCompress/Archive/Tar/TarArchiveEntry.cs

@@ -1,29 +1,41 @@
-using System.IO;
-using System.Linq;
-using SharpCompress.Common;
-using SharpCompress.Common.Tar;
-
-namespace SharpCompress.Archives.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; }
-
-        public bool IsComplete => true;
-
-        #endregion
-    }
+using System.IO;
+using System.Linq;
+using SharpCompress.Common;
+using SharpCompress.Common.Tar;
+
+namespace SharpCompress.Archive.Tar
+{
+    public class TarArchiveEntry : TarEntry, IArchiveEntry
+    {
+        private TarArchive archive;
+
+        internal TarArchiveEntry(TarArchive archive, TarFilePart part, CompressionType compressionType)
+            : base(part, compressionType)
+        {
+            this.archive = archive;
+        }
+
+        public virtual Stream OpenEntryStream()
+        {
+            return Parts.Single().GetCompressedStream();
+        }
+
+        #region IArchiveEntry Members
+
+        public void WriteTo(Stream streamToWriteTo)
+        {
+            if (IsEncrypted)
+            {
+                throw new PasswordProtectedException("Entry is password protected and cannot be extracted.");
+            }
+            this.Extract(archive, streamToWriteTo);
+        }
+
+        public bool IsComplete
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
 }

SharpCompress/Archive/Tar/TarWritableArchiveEntry.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Tar
+{
+    internal class TarWritableArchiveEntry : TarArchiveEntry
+    {
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
+
+        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 uint Crc
+        {
+            get { return 0; }
+        }
+
+        public override string FilePath
+        {
+            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(); }
+        }
+
+        internal Stream Stream { get; private set; }
+
+        public override Stream OpenEntryStream()
+        {
+            return new NonDisposingStream(Stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream)
+            {
+                Stream.Dispose();
+            }
+        }
+    }
+}

SharpCompress/Archive/Zip/ZipArchive.cs

@@ -0,0 +1,241 @@
+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 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.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)
+        {
+            return new ZipVolume(file, 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.AsEnumerable(), 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 = volumes.Single().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.FilePath, entryStream, entry.LastModifiedTime, string.Empty);
+                    }
+                }
+            }
+        }
+
+        protected override ZipArchiveEntry CreateEntry(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);
+        }
+    }
+}

SharpCompress/Archive/Zip/ZipArchiveEntry.cs

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

SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SharpCompress.Common;
+using SharpCompress.IO;
+
+namespace SharpCompress.Archive.Zip
+{
+    internal class ZipWritableArchiveEntry : ZipArchiveEntry
+    {
+        private string path;
+        private long size;
+        private DateTime? lastModified;
+        private bool closeStream;
+
+        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 uint Crc
+        {
+            get { return 0; }
+        }
+
+        public override string FilePath
+        {
+            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(); }
+        }
+
+        internal Stream Stream { get; private set; }
+
+        public override Stream OpenEntryStream()
+        {
+            return new NonDisposingStream(Stream);
+        }
+
+        internal override void Close()
+        {
+            if (closeStream)
+            {
+                Stream.Dispose();
+            }
+        }
+    }
+}

SharpCompress/AssemblyInfo.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+#if PORTABLE
+[assembly: AssemblyTitle("SharpCompress.Portable")]
+[assembly: AssemblyProduct("SharpCompress.Portable")]
+#else
+
+[assembly: AssemblyTitle("SharpCompress")]
+[assembly: AssemblyProduct("SharpCompress")]
+[assembly:
+    InternalsVisibleTo(
+        "SharpCompress.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010005d6ae1b0f6875393da83c920a5b9408f5191aaf4e8b3c2c476ad2a11f5041ecae84ce9298bc4c203637e2fd3a80ad5378a9fa8da1363e98cea45c73969198a4b64510927c910001491cebbadf597b22448ad103b0a4007e339faf8fe8665dcdb70d65b27ac05b1977c0655fad06b372b820ecbdccf10a0f214fee0986dfeded"
+        )]
+[assembly:
+InternalsVisibleTo(
+        "SharpCompress.Test.Portable, PublicKey=002400000480000094000000060200000024000052534131000400000100010005d6ae1b0f6875393da83c920a5b9408f5191aaf4e8b3c2c476ad2a11f5041ecae84ce9298bc4c203637e2fd3a80ad5378a9fa8da1363e98cea45c73969198a4b64510927c910001491cebbadf597b22448ad103b0a4007e339faf8fe8665dcdb70d65b27ac05b1977c0655fad06b372b820ecbdccf10a0f214fee0986dfeded"
+        )]
+#endif

SharpCompress/Common/ArchiveEncoding.cs

@@ -0,0 +1,29 @@
+using System.Globalization;
+using System.Text;
+
+namespace SharpCompress.Common
+{
+    public class ArchiveEncoding
+    {
+        /// <summary>
+        /// Default encoding to use when archive format doesn't specify one.
+        /// </summary>
+        public static Encoding Default;
+
+        /// <summary>
+        /// Encoding used by encryption schemes which don't comply with RFC 2898.
+        /// </summary>
+        public static Encoding Password;
+
+        static ArchiveEncoding()
+        {
+#if PORTABLE || NETFX_CORE
+            Default = Encoding.UTF8;
+            Password = Encoding.UTF8;
+#else
+            Default = Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage);
+            Password = Encoding.Default;
+#endif
+        }
+    }
+}

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)
+        {
+        }
+    }
 }

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; }
-    }
+using System;
+
+namespace SharpCompress.Common
+{
+    public class ArchiveExtractionEventArgs<T> : EventArgs
+    {
+        internal ArchiveExtractionEventArgs(T entry)
+        {
+            Item = entry;
+        }
+
+        public T Item { get; private set; }
+    }
 }

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,
+    }
 }

SharpCompress/Common/CompressedBytesReadEventArgs.cs

@@ -0,0 +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; }
+    }
+}

SharpCompress/Common/CompressionInfo.cs

@@ -0,0 +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};
+        }
+    }
+}

SharpCompress/Common/CompressionType.cs

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

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)
+        {
+        }
+    }
 }

SharpCompress/Common/Entry.cs

@@ -1,89 +1,71 @@
-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 target of a symlink entry internal to the Archive. Will be null if not a symlink.
-        /// </summary>
-        public abstract string? LinkTarget { 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 directory.
-        /// </summary>
-        public abstract bool IsDirectory { get; }
-
-        /// <summary>
-        /// Entry is split among multiple volumes
-        /// </summary>
-        public abstract bool IsSplitAfter { get; }
-
-        /// <inheritdoc/>
-        public override string ToString() => Key;
-
-        internal abstract IEnumerable<FilePart> Parts { get; }
-
-        internal bool IsSolid { get; set; }
-
-        internal virtual void Close()
-        {
-        }
-
-        /// <summary>
-        /// Entry file attribute.
-        /// </summary>
-        public virtual int? Attrib => throw new NotImplementedException();
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace SharpCompress.Common
+{
+    public abstract class Entry : SharpCompress.Common.IEntry
+    {
+        internal bool IsSolid { get; set; }
+
+        /// <summary>
+        /// The File's 32 bit CRC Hash
+        /// </summary>
+        public abstract uint Crc { get; }
+
+        /// <summary>
+        /// The path of the file internal to the Rar Archive.
+        /// </summary>
+        public abstract string FilePath { 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 whend 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; }
+
+        public abstract bool IsSplit { get; }
+
+        internal abstract IEnumerable<FilePart> Parts { get; }
+
+        internal abstract void Close();
+    }
+}

SharpCompress/Common/EntryStream.cs

@@ -0,0 +1,101 @@
+using System;
+using System.IO;
+
+namespace SharpCompress.Common
+{
+    public class EntryStream : Stream
+    {
+        private Stream stream;
+        private bool completed;
+        private bool isDisposed;
+
+        internal EntryStream(Stream stream)
+        {
+            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)
+            {
+                throw new InvalidOperationException(
+                    "EntryStream has not been fully consumed.  Read the entire stream or use 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 System.NotImplementedException();
+        }
+
+        public override long Length
+        {
+            get { throw new System.NotImplementedException(); }
+        }
+
+        public override long Position
+        {
+            get { throw new System.NotImplementedException(); }
+            set { throw new System.NotImplementedException(); }
+        }
+
+        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 System.NotImplementedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

SharpCompress/Common/ExtractOptions.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace SharpCompress.Common
+{
+    [Flags]
+    public enum ExtractOptions
+    {
+        None,
+
+        /// <summary>
+        /// overwrite target if it exists
+        /// </summary>
+        Overwrite,
+
+        /// <summary>
+        /// extract with internal directory structure
+        /// </summary>
+        ExtractFullPath,
+    }
+}

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)
+        {
+        }
+    }
 }

SharpCompress/Common/FilePart.cs

@@ -0,0 +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();
+    }
+}

SharpCompress/Common/FilePartExtractionBeginEventArgs.cs

@@ -0,0 +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; }
+    }
+}

SharpCompress/Common/FlagUtility.cs

@@ -1,108 +1,130 @@
-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);
-        }
-    }
+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);
+        }
+    }
 }

SharpCompress/Common/GZip/GZipEntry.cs

@@ -0,0 +1,90 @@
+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 uint Crc
+        {
+            get { return 0; }
+        }
+
+        public override string FilePath
+        {
+            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));
+        }
+
+        internal override void Close()
+        {
+        }
+    }
+}

SharpCompress/Common/GZip/GZipFilePart.cs

@@ -0,0 +1,103 @@
+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);
+        }
+    }
+}

SharpCompress/Common/GZip/GZipVolume.cs

@@ -0,0 +1,44 @@
+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
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        public override FileInfo VolumeFile
+        {
+            get { return fileInfo; }
+        }
+#endif
+
+        public override bool IsFirstVolume
+        {
+            get { return true; }
+        }
+
+        public override bool IsMultiVolume
+        {
+            get { return true; }
+        }
+    }
+}

SharpCompress/Common/GenericVolume.cs

@@ -0,0 +1,44 @@
+using System.IO;
+
+namespace SharpCompress.Common
+{
+    public class GenericVolume : Volume
+    {
+#if !PORTABLE && !NETFX_CORE
+        private FileInfo fileInfo;
+#endif
+
+        public GenericVolume(Stream stream, Options options)
+            : base(stream, options)
+        {
+        }
+
+#if !PORTABLE && !NETFX_CORE
+        public GenericVolume(FileInfo fileInfo, Options options)
+            : base(fileInfo.OpenRead(), options)
+        {
+            this.fileInfo = fileInfo;
+        }
+#endif
+
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        public override FileInfo VolumeFile
+        {
+            get { return fileInfo; }
+        }
+#endif
+
+        public override bool IsFirstVolume
+        {
+            get { return true; }
+        }
+
+        public override bool IsMultiVolume
+        {
+            get { return true; }
+        }
+    }
+}

SharpCompress/Common/IEntry.cs

@@ -1,22 +1,20 @@
-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; }
-        string? LinkTarget { get; }
-        bool IsDirectory { get; }
-        bool IsEncrypted { get; }
-        bool IsSplitAfter { 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; }
+        uint Crc { get; }
+        DateTime? CreatedTime { get; }
+        string FilePath { get; }
+        bool IsDirectory { get; }
+        bool IsEncrypted { get; }
+        bool IsSplit { get; }
+        DateTime? LastAccessedTime { get; }
+        DateTime? LastModifiedTime { get; }
+        long Size { get; }
+    }
 }

SharpCompress/Common/IStreamListener.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 IStreamListener
+    {
+        void FireFilePartExtractionBegin(string name, long size, long compressedSize);
+        void FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes);
+    }
 }

SharpCompress/Common/IVolume.cs

@@ -0,0 +1,17 @@
+using System;
+#if !PORTABLE && !NETFX_CORE
+using System.IO;
+#endif
+
+namespace SharpCompress.Common
+{
+    public interface IVolume : IDisposable
+    {
+#if !PORTABLE && !NETFX_CORE
+        /// <summary>
+        /// File that backs this volume, if it not stream based
+        /// </summary>
+        FileInfo VolumeFile { get; }
+#endif
+    }
+}

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)
+        {
+        }
+    }
 }

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)
+        {
+        }
+    }
 }

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)
+        {
+        }
+    }
 }

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)
+        {
+        }
+    }
 }

SharpCompress/Common/Options.cs

@@ -0,0 +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,
+    }
+}

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)
+        {
+        }
+    }
 }

SharpCompress/Common/Rar/Headers/AVHeader.cs

@@ -1,29 +1,20 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class SignHeader : RarHeader
-    {
-        protected SignHeader(RarHeader header, RarCrcBinaryReader reader)
-            : base(header, reader, HeaderType.Sign)
-        {
-            if (IsRar5)
-            {
-                throw new InvalidFormatException("unexpected rar5 record");
-            }
-        }
-
-        protected override void ReadFinish(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; }
+    }
 }

SharpCompress/Common/Rar/Headers/ArchiveHeader.cs

@@ -0,0 +1,36 @@
+using SharpCompress.IO;
+
+namespace SharpCompress.Common.Rar.Headers
+{
+    internal class ArchiveHeader : RarHeader
+    {
+        internal const short mainHeaderSizeWithEnc = 7;
+        internal const short mainHeaderSize = 6;
+
+        protected override void ReadFromReader(MarkingBinaryReader reader)
+        {
+            HighPosAv = reader.ReadInt16();
+            PosAv = reader.ReadInt32();
+            if (ArchiveHeaderFlags.HasFlag(ArchiveFlags.ENCRYPTVER))
+            {
+                EncryptionVersion = reader.ReadByte();
+            }
+        }
+
+        internal ArchiveFlags ArchiveHeaderFlags
+        {
+            get { return (ArchiveFlags) base.Flags; }
+        }
+
+        internal short HighPosAv { get; private set; }
+
+        internal int PosAv { get; private set; }
+
+        internal byte EncryptionVersion { get; private set; }
+
+        public bool HasPassword
+        {
+            get { return ArchiveHeaderFlags.HasFlag(ArchiveFlags.PASSWORD); }
+        }
+    }
+}

SharpCompress/Common/Rar/Headers/CommentHeader.cs

@@ -0,0 +1,22 @@
+using SharpCompress.IO;
+
+namespace SharpCompress.Common.Rar.Headers
+{
+    internal class CommentHeader : RarHeader
+    {
+        protected override void ReadFromReader(MarkingBinaryReader reader)
+        {
+            UnpSize = reader.ReadInt16();
+            UnpVersion = reader.ReadByte();
+            UnpMethod = reader.ReadByte();
+            CommCRC = reader.ReadInt16();
+        }
+
+        internal short UnpSize { get; private set; }
+
+        internal byte UnpVersion { get; private set; }
+
+        internal byte UnpMethod { get; private set; }
+        internal short CommCRC { get; private set; }
+    }
+}

SharpCompress/Common/Rar/Headers/EndArchiveHeader.cs

@@ -0,0 +1,28 @@
+using SharpCompress.IO;
+
+namespace SharpCompress.Common.Rar.Headers
+{
+    internal class EndArchiveHeader : RarHeader
+    {
+        protected override void ReadFromReader(MarkingBinaryReader reader)
+        {
+            if (EndArchiveFlags.HasFlag(EndArchiveFlags.EARC_DATACRC))
+            {
+                ArchiveCRC = reader.ReadInt32();
+            }
+            if (EndArchiveFlags.HasFlag(EndArchiveFlags.EARC_VOLNUMBER))
+            {
+                VolumeNumber = reader.ReadInt16();
+            }
+        }
+
+        internal EndArchiveFlags EndArchiveFlags
+        {
+            get { return (EndArchiveFlags) base.Flags; }
+        }
+
+        internal int? ArchiveCRC { get; private set; }
+
+        internal short? VolumeNumber { get; private set; }
+    }
+}