Bug fix for recursive call introduced in 0.28

Not so elegant perhaps for checking 7z encryption

.config/dotnet-tools.json

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

.gitattributes

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

.github/workflows/dotnetcore.yml

@@ -0,0 +1,24 @@
+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.101
+    - run: dotnet run -p build/build.csproj
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.os }}-sharpcompress.nupkg
+        path: artifacts/*
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.os }}-sharpcompress.snupkg
+        path: artifacts/*

.gitignore

@@ -1,11 +1,20 @@
-**/bin/*
-**/obj/*
-_ReSharper.SharpCompress/
-bin/
-*.suo
-*.user
-TestArchives/Scratch/
-TestArchives/Scratch2/
-TestResults/
-*.nupkg
-packages/*/
+**/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

FORMATS.md

@@ -0,0 +1,60 @@
+# 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           |
+| LZip (single file) (5) | LZip (LZMA)                                       | Both                | LZipArchive     | LZipReader | LZipWriter    |
+
+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.

NuGet/sharpcompress.nuspec

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

README.md

@@ -1,57 +1,186 @@
-SharpCompress
-=============
+# SharpCompress
 
-Github mirror of http://sharpcompress.codeplex.com
+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.
 
-SharpCompress is a compression library for .NET/Mono/Silverlight/WP7 that can unrar, un7zip, unzip, untar unbzip2 and ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip are implemented.
+The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream).
 
-The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream). 
+GitHub Actions Build -
+[![GitHubActions](https://github.com/adamhathcock/sharpcompress/workflows/SharpCompress/badge.svg)](https://circleci.com/gh/adamhathcock/sharpcompress)
 
-A Simple Request
+## 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
 
 Hi everyone. I hope you're using SharpCompress and finding it useful. Please give me feedback on what you'd like to see changed especially as far as usability goes. New feature suggestions are always welcome as well. I would also like to know what projects SharpCompress is being used in. I like seeing how it is used to give me ideas for future versions. Thanks!
 
-Want to contribute?
+Please do not email me directly to ask for help. If you think there is a real issue, please report it here.
+
+## Want to contribute?
 
 I'm always looking for help or ideas. Please submit code or email with ideas. Unfortunately, just letting me know you'd like to help is not enough because I really have no overall plan of what needs to be done. I'll definitely accept code submissions and add you as a member of the project!
 
-TODOs (always lots):
-* RAR 5 support
+## TODOs (always lots)
+
+* RAR 5 decryption support
 * 7Zip writing
-* Zip64
+* Zip64 (Need writing and extend Reading)
 * Multi-volume Zip support.
 
-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 Log
 
-Version 0.10.3:
-==============
-- Finally fixed Disposal issue when creating a new archive with the Archive API
+### Version 0.18
 
-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)
+* [Now on Github releases](https://github.com/adamhathcock/sharpcompress/releases/tag/0.18)
 
-Version 0.10.1:
-==============
-- Fixed 7Zip extraction performance problem
+### Version 0.17.1
 
-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)
+* Fix - [Bug Fix for .NET Core on Windows](https://github.com/adamhathcock/sharpcompress/pull/257)
 
-Some Help/Discussion:
-https://sharpcompress.codeplex.com/discussions
+### 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
 
 7Zip implementation based on: https://code.google.com/p/managed-lzma/
 

SharpCompress.Test/ArchiveTests.cs

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

@@ -1,61 +0,0 @@
-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.Key));
-            }
-            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.Key));
-            }
-            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/Properties/AssemblyInfo.cs

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

SharpCompress.Test/Properties/Resources.Designer.cs

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

SharpCompress.Test/Properties/Resources.resx

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

SharpCompress.Test/Properties/Settings.Designer.cs

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

SharpCompress.Test/Properties/Settings.settings

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

SharpCompress.Test/Rar/RarArchiveTests.cs

@@ -1,246 +0,0 @@
-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_EncryptedFileAndHeader_Archive()
-        {
-            ReadRarPassword("Rar.encrypted_filesAndHeader.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_EncryptedFileOnly_Archive()
-        {
-            ReadRarPassword("Rar.encrypted_filesOnly.rar", "test");
-
-        }
-
-        [TestMethod]
-        public void Rar_Encrypted_Archive()
-        {
-            ReadRarPassword("Encrypted.rar", "test");
-        }
-
-        private void ReadRarPassword(string testArchive, string password)
-        {
-            ResetScratch();
-            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, testArchive)))
-            using (var archive = RarArchive.Open(stream, Options.KeepStreamsOpen, password))
-            {
-                foreach (var entry in archive.Entries)
-                {
-                    if (!entry.IsDirectory)
-                    {
-                        Assert.AreEqual(entry.CompressionType, CompressionType.Rar);
-                        entry.WriteToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                    }
-                }
-            }
-            VerifyFiles();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(InvalidFormatException))]
-        public void Rar_Multi_Archive_Encrypted()
-        {
-            ArchiveFileReadPassword("EncryptedParts.part01.rar", "test");
-        }
-
-        protected void ArchiveFileReadPassword(string archiveName, string password)
-        {
-            ResetScratch();
-            using (var archive = RarArchive.Open(Path.Combine(TEST_ARCHIVES_PATH, archiveName), Options.None, password))
-            {
-                foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                {
-                    entry.WriteToDirectory(SCRATCH_FILES_PATH,
-                                            ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                }
-            }
-            VerifyFiles();
-        }
-
-        [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.IsSolid);
-                    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.IsSolid);
-                    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

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

@@ -1,255 +0,0 @@
-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_Encrypted()
-        {
-            var testArchives = new string[] { "EncryptedParts.part01.rar",
-                "EncryptedParts.part02.rar",
-                "EncryptedParts.part03.rar",
-                "EncryptedParts.part04.rar",
-                "EncryptedParts.part05.rar",
-                "EncryptedParts.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.Key);
-                            string folder = Path.GetDirectoryName(reader.Entry.Key);
-                            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.Key.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.Key.Contains("jpg"))
-                    {
-                        Assert.AreEqual(reader.Entry.CompressionType, CompressionType.Rar);
-                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, ExtractOptions.ExtractFullPath | ExtractOptions.Overwrite);
-                    }
-                }
-            }
-        }
-    }
-}

SharpCompress.Test/ReaderTests.cs

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

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

SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs

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

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

SharpCompress.Test/SharpCompress.Test.csproj

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

SharpCompress.Test/Tar/TarArchiveTests.cs

@@ -1,149 +0,0 @@
-
-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 Tar_NonUstarArchiveWithLongNameDoesNotSkipEntriesAfterTheLongOne()
-        {
-            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
-            using (var archive = TarArchive.Open(unmodified))
-            {
-                Assert.AreEqual(5, archive.Entries.Count);
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "very long filename/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "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"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 1.txt"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 2.txt"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 3.txt"));
-            }
-        }
-
-        [TestMethod]
-        public void Tar_VeryLongFilepathReadback()
-        {
-            string archive = "Tar_VeryLongFilepathReadback.tar";
-
-            ResetScratch();
-
-            // create a very long filename
-            string longFilename = "";
-            for (int i = 0; i < 600; i = longFilename.Length)
-                longFilename += i.ToString("D10") + "-";
-            longFilename += ".txt";
-
-            // Step 1: create a tar file containing a file with a long name
-            using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive)))
-            using (var writer = SharpCompress.Writer.WriterFactory.Open(stream, ArchiveType.Tar, CompressionType.None))
-            using (Stream inputStream = new MemoryStream())
-            {
-                StreamWriter sw = new StreamWriter(inputStream);
-                sw.Write("dummy filecontent");
-                sw.Flush();
-
-                inputStream.Position = 0;
-                writer.Write(longFilename, inputStream, null);
-            }
-
-            // Step 2: check if the written tar file can be read correctly
-            string unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive);
-            using (var archive2 = TarArchive.Open(unmodified))
-            {
-                Assert.AreEqual(1, archive2.Entries.Count);
-                Assert.IsTrue(archive2.Entries.Any(entry => entry.Key == longFilename));
-
-                foreach (var entry in archive2.Entries)
-                    Assert.AreEqual("dummy filecontent", new StreamReader(entry.OpenEntryStream()).ReadLine());
-            }
-        }
-
-        [TestMethod]
-        public void Tar_UstarArchivePathReadLongName()
-        {
-            string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "ustar with long names.tar");
-            using(var archive = TarArchive.Open(unmodified))
-            {
-                Assert.AreEqual(6, archive.Entries.Count);
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Some file with veeeeeeeeeery loooooooooong name"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Some file with veeeeeeeeeery loooooooooong name"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Directory with veeeeeeeeeery loooooooooong name/"));
-                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "Directory/Directory with veeeeeeeeeery loooooooooong name/Directory with veeeeeeeeeery loooooooooong name/Some file with veeeeeeeeeery loooooooooong name"));
-            }
-        }
-
-        [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_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_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.Key.EndsWith("jpg")).Single();
-                archive.RemoveEntry(entry);
-                archive.SaveTo(scratchPath, CompressionType.None);
-            }
-            CompareArchivesByPath(modified, scratchPath);
-        }
-    }
-}

SharpCompress.Test/Tar/TarReaderTests.cs

@@ -1,92 +0,0 @@
-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.Key);
-                            string folder = Path.GetDirectoryName(reader.Entry.Key);
-                            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.Key);
-                        }
-                    }
-                }
-                Assert.AreEqual(names.Count, 3);
-            }
-        }
-    }
-}

SharpCompress.Test/Tar/TarWriterTests.cs

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

@@ -1,167 +0,0 @@
-using System;
-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
-{
-    [TestClass]
-    public class TestBase
-    {
-        protected static string SOLUTION_BASE_PATH=null;
-        protected static string TEST_ARCHIVES_PATH;
-        protected static string ORIGINAL_FILES_PATH;
-        protected static string MISC_TEST_FILES_PATH;
-        protected static string SCRATCH_FILES_PATH;
-        protected static string SCRATCH2_FILES_PATH;
-        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.Key, archive2.Entry.Key);
-                }
-                Assert.IsFalse(archive2.MoveToNextEntry());
-            }
-        }
-
-        private static readonly object testLock = new object();
-
-        [AssemblyInitialize]
-        public static void InitializePaths(TestContext ctx)
-        {
-            SOLUTION_BASE_PATH = Path.GetDirectoryName(Path.GetDirectoryName(ctx.TestDir));
-            TEST_ARCHIVES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Archives");
-            ORIGINAL_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Original");
-            MISC_TEST_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "MiscTest");
-            SCRATCH_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Scratch");
-            SCRATCH2_FILES_PATH = Path.Combine(SOLUTION_BASE_PATH, "TestArchives", "Scratch2");
-        }
-    }
-}

SharpCompress.Test/TestStream.cs

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

@@ -1,36 +0,0 @@
-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/ZipReaderTests.cs

@@ -1,224 +0,0 @@
-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.shfbproj

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

SharpCompress.sln

@@ -1,71 +1,44 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
-	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
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Unsigned", "SharpCompress\SharpCompress.Unsigned.csproj", "{27D535CB-2FD3-4621-8C9A-46161FC77A5D}"
-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
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{27D535CB-2FD3-4621-8C9A-46161FC77A5D} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-	EndGlobalSection
-EndGlobal
+
+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

SharpCompress.sln.DotSettings

@@ -1,6 +1,132 @@
 <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/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>
+	<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>

SharpCompress/Archive/ArchiveFactory.cs

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

SharpCompress/Archive/GZip/GZipWritableArchiveEntry.cs

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

SharpCompress/Archive/IArchiveEntry.Extensions.cs

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

SharpCompress/Archive/IWritableArchive.Extensions.cs

@@ -1,84 +0,0 @@
-using System;
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public static class IWritableArchiveExtensions
-    {
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   Stream stream, CompressionType compressionType)
-        {
-            writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
-        }
-
-#if !PORTABLE && !NETFX_CORE
-
-        public static void AddEntry(this IWritableArchive writableArchive,
-                                                     string entryPath, string filePath)
-        {
-            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(this IWritableArchive writableArchive,
-                                                   string filePath, CompressionType compressionType)
-        {
-            writableArchive.SaveTo(new FileInfo(filePath), new CompressionInfo {Type = compressionType});
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   FileInfo fileInfo, CompressionType compressionType)
-        {
-            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
-            {
-                writableArchive.SaveTo(stream, new CompressionInfo {Type = compressionType});
-            }
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   string filePath, CompressionInfo compressionInfo)
-        {
-            writableArchive.SaveTo(new FileInfo(filePath), compressionInfo);
-        }
-
-        public static void SaveTo(this IWritableArchive writableArchive,
-                                                   FileInfo fileInfo, CompressionInfo compressionInfo)
-        {
-            using (var stream = fileInfo.Open(FileMode.Create, FileAccess.Write))
-            {
-                writableArchive.SaveTo(stream, compressionInfo);
-            }
-        }
-
-        public static void AddAllFromDirectory(
-            this IWritableArchive writableArchive,
-            string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
-        {
-#if NET2
-            foreach (var path in Directory.GetFiles(filePath, searchPattern, searchOption))
-#else
-            foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))
-#endif
-            {
-                var fileInfo = new FileInfo(path);
-                writableArchive.AddEntry(path.Substring(filePath.Length), fileInfo.OpenRead(), true, fileInfo.Length,
-                                         fileInfo.LastWriteTime);
-            }
-        }
-        public static IArchiveEntry AddEntry(this IWritableArchive writableArchive, string key, FileInfo fileInfo)
-        {
-            if (!fileInfo.Exists)
-            {
-                throw new ArgumentException("FileInfo does not exist.");
-            }
-            return writableArchive.AddEntry(key, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
-        }
-#endif
-    }
-}

SharpCompress/Archive/IWritableArchive.cs

@@ -1,15 +0,0 @@
-using System;
-using System.IO;
-using SharpCompress.Common;
-
-namespace SharpCompress.Archive
-{
-    public interface IWritableArchive : IArchive
-    {
-        void RemoveEntry(IArchiveEntry entry);
-
-        IArchiveEntry AddEntry(string key, Stream source, bool closeStream, long size = 0, DateTime? modified = null);
-
-        void SaveTo(Stream stream, CompressionInfo compressionType);
-    }
-}

SharpCompress/Archive/Rar/FileInfoRarArchiveVolume.cs

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

SharpCompress/Archive/Rar/RarArchive.cs

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

SharpCompress/Archive/Rar/SeekableFilePart.cs

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

SharpCompress/Archive/Tar/TarWritableArchiveEntry.cs

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

SharpCompress/Archive/Zip/ZipWritableArchiveEntry.cs

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

SharpCompress/AssemblyInfo.cs

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

SharpCompress/Common/ArchiveEncoding.cs

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

SharpCompress/Common/CompressedBytesReadEventArgs.cs

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

@@ -1,30 +0,0 @@
-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/ExtractOptions.cs

@@ -1,20 +0,0 @@
-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/FilePart.cs

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

@@ -1,22 +0,0 @@
-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/GZip/GZipEntry.cs

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

SharpCompress/Common/GZip/GZipFilePart.cs

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

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

SharpCompress/Common/Options.cs

@@ -1,23 +0,0 @@
-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/Rar/Headers/ArchiveHeader.cs

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

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

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

SharpCompress/Common/Rar/Headers/FileHeader.cs

@@ -1,233 +0,0 @@
-using System;
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class FileHeader : RarHeader
-    {
-        private const byte SALT_SIZE = 8;
-
-        private const byte NEWLHD_SIZE = 32;
-
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-            uint lowUncompressedSize = reader.ReadUInt32();
-
-            HostOS = (HostOS)reader.ReadByte();
-
-            FileCRC = reader.ReadUInt32();
-
-            FileLastModifiedTime = Utility.DosDateToDateTime(reader.ReadInt32());
-
-            RarVersion = reader.ReadByte();
-            PackingMethod = reader.ReadByte();
-
-            short nameSize = reader.ReadInt16();
-
-            FileAttributes = reader.ReadInt32();
-
-            uint highCompressedSize = 0;
-            uint highUncompressedkSize = 0;
-            if (FileFlags.HasFlag(FileFlags.LARGE))
-            {
-                highCompressedSize = reader.ReadUInt32();
-                highUncompressedkSize = reader.ReadUInt32();
-            }
-            else
-            {
-                if (lowUncompressedSize == 0xffffffff)
-                {
-                    lowUncompressedSize = 0xffffffff;
-                    highUncompressedkSize = int.MaxValue;
-                }
-            }
-            CompressedSize = UInt32To64(highCompressedSize, AdditionalSize);
-            UncompressedSize = UInt32To64(highUncompressedkSize, lowUncompressedSize);
-
-            nameSize = nameSize > 4 * 1024 ? (short)(4 * 1024) : nameSize;
-
-            byte[] fileNameBytes = reader.ReadBytes(nameSize);
-
-            switch (HeaderType)
-            {
-                case HeaderType.FileHeader:
-                    {
-                        if (FileFlags.HasFlag(FileFlags.UNICODE))
-                        {
-                            int length = 0;
-                            while (length < fileNameBytes.Length
-                                   && fileNameBytes[length] != 0)
-                            {
-                                length++;
-                            }
-                            if (length != nameSize)
-                            {
-                                length++;
-                                FileName = FileNameDecoder.Decode(fileNameBytes, length);
-                            }
-                            else
-                            {
-                                FileName = DecodeDefault(fileNameBytes);
-                            }
-                        }
-                        else
-                        {
-                            FileName = DecodeDefault(fileNameBytes);
-                        }
-                        FileName = ConvertPath(FileName, HostOS);
-                    }
-                    break;
-                case HeaderType.NewSubHeader:
-                    {
-                        int datasize = HeaderSize - NEWLHD_SIZE - nameSize;
-                        if (FileFlags.HasFlag(FileFlags.SALT))
-                        {
-                            datasize -= SALT_SIZE;
-                        }
-                        if (datasize > 0)
-                        {
-                            SubData = reader.ReadBytes(datasize);
-                        }
-
-                        if (NewSubHeaderType.SUBHEAD_TYPE_RR.Equals(fileNameBytes))
-                        {
-                            RecoverySectors = SubData[8] + (SubData[9] << 8)
-                                              + (SubData[10] << 16) + (SubData[11] << 24);
-                        }
-                    }
-                    break;
-            }
-
-            if (FileFlags.HasFlag(FileFlags.SALT))
-            {
-                Salt = reader.ReadBytes(SALT_SIZE);
-            }
-            if (FileFlags.HasFlag(FileFlags.EXTTIME))
-            {
-                // verify that the end of the header hasn't been reached before reading the Extended Time.
-                //  some tools incorrectly omit Extended Time despite specifying FileFlags.EXTTIME, which most parsers tolerate.
-                if (ReadBytes + reader.CurrentReadByteCount <= HeaderSize - 2)
-                {
-                    ushort extendedFlags = reader.ReadUInt16();
-                    FileLastModifiedTime = ProcessExtendedTime(extendedFlags, FileLastModifiedTime, reader, 0);
-                    FileCreatedTime = ProcessExtendedTime(extendedFlags, null, reader, 1);
-                    FileLastAccessedTime = ProcessExtendedTime(extendedFlags, null, reader, 2);
-                    FileArchivedTime = ProcessExtendedTime(extendedFlags, null, reader, 3);
-                }
-            }
-        }
-
-        //only the full .net framework will do other code pages than unicode/utf8
-        private string DecodeDefault(byte[] bytes)
-        {
-            return ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length);
-        }
-
-        private long UInt32To64(uint x, uint y)
-        {
-            long l = x;
-            l <<= 32;
-            return l + y;
-        }
-
-        private static DateTime? ProcessExtendedTime(ushort extendedFlags, DateTime? time, MarkingBinaryReader reader,
-                                                     int i)
-        {
-            uint rmode = (uint)extendedFlags >> (3 - i) * 4;
-            if ((rmode & 8) == 0)
-            {
-                return null;
-            }
-            if (i != 0)
-            {
-                uint DosTime = reader.ReadUInt32();
-                time = Utility.DosDateToDateTime(DosTime);
-            }
-            if ((rmode & 4) == 0)
-            {
-                time = time.Value.AddSeconds(1);
-            }
-            uint nanosecondHundreds = 0;
-            int count = (int)rmode & 3;
-            for (int j = 0; j < count; j++)
-            {
-                byte b = reader.ReadByte();
-                nanosecondHundreds |= (((uint)b) << ((j + 3 - count) * 8));
-            }
-            //10^-7 to 10^-3
-            return time.Value.AddMilliseconds(nanosecondHundreds * Math.Pow(10, -4));
-        }
-
-        private static string ConvertPath(string path, HostOS os)
-        {
-#if PORTABLE || NETFX_CORE
-            return path.Replace('\\', '/');
-#else
-            switch (os)
-            {
-                case HostOS.MacOS:
-                case HostOS.Unix:
-                    {
-                        if (Path.DirectorySeparatorChar == '\\')
-                        {
-                            return path.Replace('/', '\\');
-                        }
-                    }
-                    break;
-                default:
-                    {
-                        if (Path.DirectorySeparatorChar == '/')
-                        {
-                            return path.Replace('\\', '/');
-                        }
-                    }
-                    break;
-            }
-            return path;
-#endif
-        }
-
-        internal long DataStartPosition { get; set; }
-        internal HostOS HostOS { get; private set; }
-
-        internal uint FileCRC { get; private set; }
-
-        internal DateTime? FileLastModifiedTime { get; private set; }
-
-        internal DateTime? FileCreatedTime { get; private set; }
-
-        internal DateTime? FileLastAccessedTime { get; private set; }
-
-        internal DateTime? FileArchivedTime { get; private set; }
-
-        internal byte RarVersion { get; private set; }
-
-        internal byte PackingMethod { get; private set; }
-
-        internal int FileAttributes { get; private set; }
-
-        internal FileFlags FileFlags
-        {
-            get { return (FileFlags)base.Flags; }
-        }
-
-        internal long CompressedSize { get; private set; }
-        internal long UncompressedSize { get; private set; }
-
-        internal string FileName { get; private set; }
-
-        internal byte[] SubData { get; private set; }
-
-        internal int RecoverySectors { get; private set; }
-
-        internal byte[] Salt { get; private set; }
-
-        public override string ToString()
-        {
-            return FileName;
-        }
-
-        public Stream PackedStream { get; set; }
-    }
-}

SharpCompress/Common/Rar/Headers/Flags.cs

@@ -1,85 +0,0 @@
-using System;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal enum HeaderType
-    {
-        MarkHeader = 0x72,
-        ArchiveHeader = 0x73,
-        FileHeader = 0x74,
-        CommHeader = 0x75,
-        AvHeader = 0x76,
-        SubHeader = 0x77,
-        ProtectHeader = 0x78,
-        SignHeader = 0x79,
-        NewSubHeader = 0x7a,
-        EndArchiveHeader = 0x7b,
-    }
-
-    internal enum HeaderFlags : short
-    {
-        LONG_BLOCK = -0x8000,
-    }
-
-    [Flags]
-    internal enum ArchiveFlags
-    {
-        VOLUME = 0x0001,
-        COMMENT = 0x0002,
-        LOCK = 0x0004,
-        SOLID = 0x0008,
-        NEWNUMBERING = 0x0010,
-        AV = 0x0020,
-        PROTECT = 0x0040,
-        PASSWORD = 0x0080,
-        FIRSTVOLUME = 0x0100,
-        ENCRYPTVER = 0x0200,
-    }
-
-    internal enum HostOS
-    {
-        MSDOS = 0,
-        OS2 = 1,
-        Win32 = 2,
-        Unix = 3,
-        MacOS = 4,
-        BeOS = 5
-    }
-
-    [Flags]
-    internal enum FileFlags : ushort
-    {
-        SPLIT_BEFORE = 0x0001,
-        SPLIT_AFTER = 0x0002,
-        PASSWORD = 0x0004,
-        COMMENT = 0x0008,
-        SOLID = 0x0010,
-
-        WINDOWMASK = 0x00e0,
-        WINDOW64 = 0x0000,
-        WINDOW128 = 0x0020,
-        WINDOW256 = 0x0040,
-        WINDOW512 = 0x0060,
-        WINDOW1024 = 0x0080,
-        WINDOW2048 = 0x00a0,
-        WINDOW4096 = 0x00c0,
-        DIRECTORY = 0x00e0,
-
-        LARGE = 0x0100,
-        UNICODE = 0x0200,
-        SALT = 0x0400,
-        VERSION = 0x0800,
-        EXTTIME = 0x1000,
-        EXTFLAGS = 0x2000,
-    }
-
-
-    [Flags]
-    internal enum EndArchiveFlags
-    {
-        EARC_NEXT_VOLUME = 0x0001,
-        EARC_DATACRC = 0x0002,
-        EARC_REVSPACE = 0x0004,
-        EARC_VOLNUMBER = 0x0008,
-    }
-}

SharpCompress/Common/Rar/Headers/MarkHeader.cs

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

SharpCompress/Common/Rar/Headers/NewSubHeader.cs

@@ -1,59 +0,0 @@
-using System;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class NewSubHeaderType : IEquatable<NewSubHeaderType>
-    {
-        internal static readonly NewSubHeaderType SUBHEAD_TYPE_CMT = new NewSubHeaderType('C', 'M', 'T');
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_ACL = new NewSubHeaderType(new byte[]{'A','C','L'});
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_STREAM = new NewSubHeaderType(new byte[]{'S','T','M'});
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_UOWNER = new NewSubHeaderType(new byte[]{'U','O','W'});
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_AV = new NewSubHeaderType(new byte[]{'A','V'});
-
-        internal static readonly NewSubHeaderType SUBHEAD_TYPE_RR = new NewSubHeaderType('R', 'R');
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_OS2EA = new NewSubHeaderType(new byte[]{'E','A','2'});
-
-        //internal static final NewSubHeaderType SUBHEAD_TYPE_BEOSEA = new NewSubHeaderType(new byte[]{'E','A','B','E'});
-
-        private byte[] bytes;
-
-        private NewSubHeaderType(params char[] chars)
-        {
-            bytes = new byte[chars.Length];
-            for (int i = 0; i < chars.Length; ++i)
-            {
-                bytes[i] = (byte) chars[i];
-            }
-        }
-
-        internal bool Equals(byte[] bytes)
-        {
-            if (this.bytes.Length != bytes.Length)
-            {
-                return false;
-            }
-            for (int i = 0; i < bytes.Length; ++i)
-            {
-                if (this.bytes[i] != bytes[i])
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        #region IEquatable<NewSubHeaderType> Members
-
-        public bool Equals(NewSubHeaderType other)
-        {
-            return Equals(other.bytes);
-        }
-
-        #endregion
-    }
-}

SharpCompress/Common/Rar/Headers/ProtectHeader.cs

@@ -1,22 +0,0 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    // ProtectHeader is part of the Recovery Record feature
-    internal class ProtectHeader : RarHeader
-    {
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-            Version = reader.ReadByte();
-            RecSectors = reader.ReadUInt16();
-            TotalBlocks = reader.ReadUInt32();
-            Mark = reader.ReadBytes(8);
-        }
-
-        internal uint DataSize { get { return AdditionalSize; } }
-        internal byte Version { get; private set; }
-        internal ushort RecSectors { get; private set; }
-        internal uint TotalBlocks { get; private set; }
-        internal byte[] Mark { get; private set; }
-    }
-}

SharpCompress/Common/Rar/Headers/RarHeader.cs

@@ -1,95 +0,0 @@
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class RarHeader
-    {
-        internal const short BaseBlockSize = 7;
-        internal const short LONG_BLOCK = -0x8000;
-
-        private void FillBase(RarHeader baseHeader)
-        {
-            HeadCRC = baseHeader.HeadCRC;
-            HeaderType = baseHeader.HeaderType;
-            Flags = baseHeader.Flags;
-            HeaderSize = baseHeader.HeaderSize;
-            AdditionalSize = baseHeader.AdditionalSize;
-            ReadBytes = baseHeader.ReadBytes;
-        }
-
-        internal static RarHeader Create(MarkingBinaryReader reader)
-        {
-            try
-            {
-                RarHeader header = new RarHeader();
-
-                reader.Mark();
-                header.ReadFromReader(reader);
-                header.ReadBytes += reader.CurrentReadByteCount;
-
-                return header;
-            }
-            catch (EndOfStreamException)
-            {
-                return null;
-            }
-        }
-        protected virtual void ReadFromReader(MarkingBinaryReader reader)
-        {
-            HeadCRC = reader.ReadInt16();
-            HeaderType = (HeaderType)(reader.ReadByte() & 0xff);
-            Flags = reader.ReadInt16();
-            HeaderSize = reader.ReadInt16();
-            if (FlagUtility.HasFlag(Flags, LONG_BLOCK))
-            {
-                AdditionalSize = reader.ReadUInt32();
-            }
-        }
-
-        internal T PromoteHeader<T>(MarkingBinaryReader reader)
-            where T : RarHeader, new()
-        {
-            T header = new T();
-            header.FillBase(this);
-
-            reader.Mark();
-            header.ReadFromReader(reader);
-            header.ReadBytes += reader.CurrentReadByteCount;
-
-            int headerSizeDiff = header.HeaderSize - (int)header.ReadBytes;
-
-            if (headerSizeDiff > 0)
-            {
-                reader.ReadBytes(headerSizeDiff);
-            }
-
-            return header;
-        }
-
-        protected virtual void PostReadingBytes(MarkingBinaryReader reader)
-        {
-        }
-
-        /// <summary>
-        /// This is the number of bytes read when reading the header
-        /// </summary>
-        protected long ReadBytes { get; private set; }
-
-        protected short HeadCRC { get; private set; }
-
-        internal HeaderType HeaderType { get; private set; }
-
-        /// <summary>
-        /// Untyped flags.  These should be typed when Promoting to another header
-        /// </summary>
-        protected short Flags { get; private set; }
-
-        protected short HeaderSize { get; private set; }
-
-        /// <summary>
-        /// This additional size of the header could be file data
-        /// </summary>
-        protected uint AdditionalSize { get; private set; }
-    }
-}

SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs

@@ -1,251 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class RarHeaderFactory
-    {
-        private const int MAX_SFX_SIZE = 0x80000 - 16; //archive.cpp line 136
-
-        internal RarHeaderFactory(StreamingMode mode, Options options, string password = null)
-        {
-            StreamingMode = mode;
-            Options = options;
-            Password = password;
-        }
-
-        private Options Options { get; set; }
-        public string Password { get; private set; }
-        internal StreamingMode StreamingMode { get; private set; }
-        internal bool IsEncrypted { get; private set; }
-        
-        internal IEnumerable<RarHeader> ReadHeaders(Stream stream)
-        {
-            if (Options.HasFlag(Options.LookForHeader))
-            {
-                stream = CheckSFX(stream);
-            }
-
-            RarHeader header;
-            while ((header = ReadNextHeader(stream)) != null)
-            {
-                yield return header;
-                if (header.HeaderType == HeaderType.EndArchiveHeader)
-                {
-                    yield break; // the end?
-                }
-            }
-        }
-
-        private Stream CheckSFX(Stream stream)
-        {
-            RewindableStream rewindableStream = GetRewindableStream(stream);
-            stream = rewindableStream;
-            BinaryReader reader = new BinaryReader(rewindableStream);
-            try
-            {
-                int count = 0;
-                while (true)
-                {
-                    byte firstByte = reader.ReadByte();
-                    if (firstByte == 0x52)
-                    {
-                        MemoryStream buffer = new MemoryStream();
-                        byte[] nextThreeBytes = reader.ReadBytes(3);
-                        if ((nextThreeBytes[0] == 0x45)
-                            && (nextThreeBytes[1] == 0x7E)
-                            && (nextThreeBytes[2] == 0x5E))
-                        {
-                            //old format and isvalid
-                            buffer.WriteByte(0x52);
-                            buffer.Write(nextThreeBytes, 0, 3);
-                            rewindableStream.Rewind(buffer);
-                            break;
-                        }
-                        byte[] secondThreeBytes = reader.ReadBytes(3);
-                        if ((nextThreeBytes[0] == 0x61)
-                            && (nextThreeBytes[1] == 0x72)
-                            && (nextThreeBytes[2] == 0x21)
-                            && (secondThreeBytes[0] == 0x1A)
-                            && (secondThreeBytes[1] == 0x07)
-                            && (secondThreeBytes[2] == 0x00))
-                        {
-                            //new format and isvalid
-                            buffer.WriteByte(0x52);
-                            buffer.Write(nextThreeBytes, 0, 3);
-                            buffer.Write(secondThreeBytes, 0, 3);
-                            rewindableStream.Rewind(buffer);
-                            break;
-                        }
-                        buffer.Write(nextThreeBytes, 0, 3);
-                        buffer.Write(secondThreeBytes, 0, 3);
-                        rewindableStream.Rewind(buffer);
-                    }
-                    if (count > MAX_SFX_SIZE)
-                    {
-                        break;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                if (!Options.HasFlag(Options.KeepStreamsOpen))
-                {
-#if NET2
-                    reader.Close();
-#else
-                    reader.Dispose();
-#endif
-                }
-                throw new InvalidFormatException("Error trying to read rar signature.", e);
-            }
-            return stream;
-        }
-
-        private RewindableStream GetRewindableStream(Stream stream)
-        {
-            RewindableStream rewindableStream = stream as RewindableStream;
-            if (rewindableStream == null)
-            {
-                rewindableStream = new RewindableStream(stream);
-            }
-            return rewindableStream;
-        }
-
-
-        private RarHeader ReadNextHeader(Stream stream)
-        {
-#if PORTABLE
-            var reader = new MarkingBinaryReader(stream);
-#else
-            var reader = new RarCryptoBinaryReader(stream, Password);
-            
-            if (IsEncrypted)
-            {
-                if (Password == null)
-                {
-                    throw new CryptographicException("Encrypted Rar archive has no password specified.");
-                }
-                reader.SkipQueue();
-                byte[] salt = reader.ReadBytes(8);
-                reader.InitializeAes(salt);
-            }
-#endif
-
-            RarHeader header = RarHeader.Create(reader);
-            if (header == null)
-            {
-                return null;
-            }
-            switch (header.HeaderType)
-            {
-                case HeaderType.ArchiveHeader:
-                    {
-                        var ah = header.PromoteHeader<ArchiveHeader>(reader);
-                        IsEncrypted = ah.HasPassword;
-                        return ah;
-                    }
-                case HeaderType.MarkHeader:
-                    {
-                        return header.PromoteHeader<MarkHeader>(reader);
-                    }
-
-                case HeaderType.ProtectHeader:
-                    {
-                        ProtectHeader ph = header.PromoteHeader<ProtectHeader>(reader);
-                        
-                        // skip the recovery record data, we do not use it.
-                        switch (StreamingMode)
-                        {
-                            case StreamingMode.Seekable:
-                                {
-                                    reader.BaseStream.Position += ph.DataSize;
-                                }
-                                break;
-                            case StreamingMode.Streaming:
-                                {
-                                    reader.BaseStream.Skip(ph.DataSize);
-                                }
-                                break;
-                            default:
-                                {
-                                    throw new InvalidFormatException("Invalid StreamingMode");
-                                }
-                        }
-
-                        return ph;
-                    }
-
-                case HeaderType.NewSubHeader:
-                    {
-                        FileHeader fh = header.PromoteHeader<FileHeader>(reader);
-                        switch (StreamingMode)
-                        {
-                            case StreamingMode.Seekable:
-                                {
-                                    fh.DataStartPosition = reader.BaseStream.Position;
-                                    reader.BaseStream.Position += fh.CompressedSize;
-                                }
-                                break;
-                            case StreamingMode.Streaming:
-                                {
-                                    //skip the data because it's useless?
-                                    reader.BaseStream.Skip(fh.CompressedSize);
-                                }
-                                break;
-                            default:
-                                {
-                                    throw new InvalidFormatException("Invalid StreamingMode");
-                                }
-                        }
-                        return fh;
-                    }
-                case HeaderType.FileHeader:
-                    {
-                        FileHeader fh = header.PromoteHeader<FileHeader>(reader);
-                        switch (StreamingMode)
-                        {
-                            case StreamingMode.Seekable:
-                                {
-                                    fh.DataStartPosition = reader.BaseStream.Position;
-                                    reader.BaseStream.Position += fh.CompressedSize;
-                                }
-                                break;
-                            case StreamingMode.Streaming:
-                                {
-                                    var ms = new ReadOnlySubStream(reader.BaseStream, fh.CompressedSize);
-                                    if (fh.Salt == null)
-                                    {
-                                        fh.PackedStream = ms;
-                                    }
-                                    else
-                                    {
-#if PORTABLE
-                                        throw new NotSupportedException("Encrypted Rar files aren't supported in portable distro.");
-#else
-                                        fh.PackedStream = new RarCryptoWrapper(ms, Password,  fh.Salt);
-#endif
-                                    }
-                                }
-                                break;
-                            default:
-                                {
-                                    throw new InvalidFormatException("Invalid StreamingMode");
-                                }
-                        }
-                        return fh;
-                    }
-                case HeaderType.EndArchiveHeader:
-                    {
-                        return header.PromoteHeader<EndArchiveHeader>(reader);
-                    }
-                default:
-                    {
-                        throw new InvalidFormatException("Invalid Rar Header: " + header.HeaderType.ToString());
-                    }
-            }
-        }
-    }
-}

SharpCompress/Common/Rar/Headers/SignHeader.cs

@@ -1,23 +0,0 @@
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar.Headers
-{
-    internal class AVHeader : RarHeader
-    {
-        protected override void ReadFromReader(MarkingBinaryReader reader)
-        {
-            UnpackVersion = reader.ReadByte();
-            Method = reader.ReadByte();
-            AVVersion = reader.ReadByte();
-            AVInfoCRC = reader.ReadInt32();
-        }
-
-        internal int AVInfoCRC { get; private set; }
-
-        internal byte UnpackVersion { get; private set; }
-
-        internal byte Method { get; private set; }
-
-        internal byte AVVersion { get; private set; }
-    }
-}

SharpCompress/Common/Rar/RarCryptoBinaryReader.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarCryptoBinaryReader : MarkingBinaryReader
-    {
-        private RarRijndael rijndael;
-        private byte[] salt;
-        private readonly string password;
-        private readonly Queue<byte> data = new Queue<byte>();
-
-        public RarCryptoBinaryReader(Stream stream, string password )
-            : base(stream)
-        {
-            this.password = password;
-        }
-
-        protected bool UseEncryption
-        {
-            get { return salt != null; }
-        }
-
-        internal void InitializeAes(byte[] salt)
-        {
-            this.salt = salt;
-            rijndael = RarRijndael.InitializeFrom(password, salt);
-        }
-
-        public override byte[] ReadBytes(int count)
-        {
-            if (UseEncryption)
-            {
-                return ReadAndDecryptBytes(count);
-            }
-            return base.ReadBytes(count);
-        }
-
-        private byte[] ReadAndDecryptBytes(int count)
-        {
-            int queueSize = data.Count;
-            int sizeToRead = count - queueSize;
-
-            if (sizeToRead > 0)
-            {
-                int alignedSize = sizeToRead + ((~sizeToRead + 1) & 0xf);
-                for (int i = 0; i < alignedSize / 16; i++)
-                {
-                    //long ax = System.currentTimeMillis();
-                    byte[] cipherText = base.ReadBytes(16);
-                    var readBytes = rijndael.ProcessBlock(cipherText);
-                    foreach (var readByte in readBytes)
-                        data.Enqueue(readByte);
-
-                }
-
-            }
-
-            var decryptedBytes = new byte[count];
-
-            for (int i = 0; i < count; i++)
-            {
-                decryptedBytes[i] = data.Dequeue();
-            }
-            return decryptedBytes;
-        }
-
-        public void ClearQueue()
-        {
-            data.Clear();
-        }
-
-        public void SkipQueue()
-        {
-            var position = BaseStream.Position;
-            BaseStream.Position = position + data.Count;
-            ClearQueue();
-        }
-    }
-}

SharpCompress/Common/Rar/RarRijndael.Portable.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Parameters;
-
-namespace SharpCompress.Common.Rar
-{
-    internal class RarRijndael : IDisposable
-    {
-        internal const int CRYPTO_BLOCK_SIZE = 16;
-
-        private readonly string password;
-        private readonly byte[] salt;
-        private byte[] aesInitializationVector;
-        private RijndaelEngine rijndael;
-
-        private RarRijndael(string password, byte[] salt)
-        {
-            this.password = password;
-            this.salt = salt;
-        }
-
-        private byte[] ComputeHash(byte[] input)
-        {
-            var sha = new Sha1Digest();
-            sha.BlockUpdate(input, 0, input.Length);
-            byte[] result = new byte[sha.GetDigestSize()];
-            sha.DoFinal(result, 0);
-            return result;
-        }
-
-        private void Initialize()
-        {
-
-            rijndael = new RijndaelEngine();
-            aesInitializationVector = new byte[CRYPTO_BLOCK_SIZE];
-            int rawLength = 2 * password.Length;
-            byte[] rawPassword = new byte[rawLength + 8];
-            byte[] passwordBytes = Encoding.UTF8.GetBytes(password);
-            for (int i = 0; i < password.Length; i++)
-            {
-                rawPassword[i * 2] = passwordBytes[i];
-                rawPassword[i * 2 + 1] = 0;
-            }
-            for (int i = 0; i < salt.Length; i++)
-            {
-                rawPassword[i + rawLength] = salt[i];
-            }
-
-
-            const int noOfRounds = (1 << 18);
-            IList<byte> bytes = new List<byte>();
-            byte[] digest;
-
-            //TODO slow code below, find ways to optimize
-            for (int i = 0; i < noOfRounds; i++)
-            {
-                bytes.AddRange(rawPassword);
-
-                bytes.AddRange(new[] { (byte)i, (byte)(i >> 8), (byte)(i >> CRYPTO_BLOCK_SIZE) });
-                if (i % (noOfRounds / CRYPTO_BLOCK_SIZE) == 0)
-                {
-                    digest = ComputeHash(bytes.ToArray());
-                    aesInitializationVector[i / (noOfRounds / CRYPTO_BLOCK_SIZE)] = digest[19];
-                }
-            }
-
-            digest = ComputeHash(bytes.ToArray());
-            //slow code ends
-
-            byte[] aesKey = new byte[CRYPTO_BLOCK_SIZE];
-            for (int i = 0; i < 4; i++)
-                for (int j = 0; j < 4; j++)
-                    aesKey[i * 4 + j] = (byte)
-                        (((digest[i * 4] * 0x1000000) & 0xff000000 |
-                        (uint)((digest[i * 4 + 1] * 0x10000) & 0xff0000) |
-                          (uint)((digest[i * 4 + 2] * 0x100) & 0xff00) |
-                          (uint)(digest[i * 4 + 3] & 0xff)) >> (j * 8));
-
-
-            rijndael.Init(false, new KeyParameter(aesKey));
-
-        }
-
-        public static RarRijndael InitializeFrom(string password, byte[] salt)
-        {
-            var rijndael = new RarRijndael(password, salt);
-            rijndael.Initialize();
-            return rijndael;
-        }
-
-        public byte[] ProcessBlock(byte[] cipherText)
-        {
-            var plainText = new byte[CRYPTO_BLOCK_SIZE];
-            var decryptedBytes = new List<byte>();
-            rijndael.ProcessBlock(cipherText, 0, plainText, 0);
-
-            for (int j = 0; j < plainText.Length; j++)
-                decryptedBytes.Add((byte)(plainText[j] ^ aesInitializationVector[j % 16])); //32:114, 33:101
-
-            for (int j = 0; j < aesInitializationVector.Length; j++)
-                aesInitializationVector[j] = cipherText[j];
-            return decryptedBytes.ToArray();
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}

SharpCompress/Common/Rar/RarRijndael.cs

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

SharpCompress/Common/ReaderExtractionEventArgs.cs

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

SharpCompress/Common/SevenZip/ArchiveDatabase.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Compressor.LZMA;
-using SharpCompress.Compressor.LZMA.Utilites;
-
-namespace SharpCompress.Common.SevenZip
-{
-    internal class ArchiveDatabase
-    {
-        internal byte MajorVersion;
-        internal byte MinorVersion;
-        internal long StartPositionAfterHeader;
-        internal long DataStartPosition;
-
-        internal List<long> PackSizes = new List<long>();
-        internal List<uint?> PackCRCs = new List<uint?>();
-        internal List<CFolder> Folders = new List<CFolder>();
-        internal List<int> NumUnpackStreamsVector;
-        internal List<CFileItem> Files = new List<CFileItem>();
-
-        internal List<long> PackStreamStartPositions = new List<long>();
-        internal List<int> FolderStartFileIndex = new List<int>();
-        internal List<int> FileIndexToFolderIndexMap = new List<int>();
-
-        internal void Clear()
-        {
-            PackSizes.Clear();
-            PackCRCs.Clear();
-            Folders.Clear();
-            NumUnpackStreamsVector = null;
-            Files.Clear();
-
-            PackStreamStartPositions.Clear();
-            FolderStartFileIndex.Clear();
-            FileIndexToFolderIndexMap.Clear();
-        }
-
-        internal bool IsEmpty()
-        {
-            return PackSizes.Count == 0
-                   && PackCRCs.Count == 0
-                   && Folders.Count == 0
-                   && NumUnpackStreamsVector.Count == 0
-                   && Files.Count == 0;
-        }
-
-        private void FillStartPos()
-        {
-            PackStreamStartPositions.Clear();
-
-            long startPos = 0;
-            for (int i = 0; i < PackSizes.Count; i++)
-            {
-                PackStreamStartPositions.Add(startPos);
-                startPos += PackSizes[i];
-            }
-        }
-
-        private void FillFolderStartFileIndex()
-        {
-            FolderStartFileIndex.Clear();
-            FileIndexToFolderIndexMap.Clear();
-
-            int folderIndex = 0;
-            int indexInFolder = 0;
-            for (int i = 0; i < Files.Count; i++)
-            {
-                CFileItem file = Files[i];
-
-                bool emptyStream = !file.HasStream;
-
-                if (emptyStream && indexInFolder == 0)
-                {
-                    FileIndexToFolderIndexMap.Add(-1);
-                    continue;
-                }
-
-                if (indexInFolder == 0)
-                {
-                    // v3.13 incorrectly worked with empty folders
-                    // v4.07: Loop for skipping empty folders
-                    for (; ; )
-                    {
-                        if (folderIndex >= Folders.Count)
-                            throw new InvalidOperationException();
-
-                        FolderStartFileIndex.Add(i); // check it
-
-                        if (NumUnpackStreamsVector[folderIndex] != 0)
-                            break;
-
-                        folderIndex++;
-                    }
-                }
-
-                FileIndexToFolderIndexMap.Add(folderIndex);
-
-                if (emptyStream)
-                    continue;
-
-                indexInFolder++;
-
-                if (indexInFolder >= NumUnpackStreamsVector[folderIndex])
-                {
-                    folderIndex++;
-                    indexInFolder = 0;
-                }
-            }
-        }
-
-        public void Fill()
-        {
-            FillStartPos();
-            FillFolderStartFileIndex();
-        }
-
-        internal long GetFolderStreamPos(CFolder folder, int indexInFolder)
-        {
-            int index = folder.FirstPackStreamId + indexInFolder;
-            return DataStartPosition + PackStreamStartPositions[index];
-        }
-
-        internal long GetFolderFullPackSize(int folderIndex)
-        {
-            int packStreamIndex = Folders[folderIndex].FirstPackStreamId;
-            CFolder folder = Folders[folderIndex];
-
-            long size = 0;
-            for (int i = 0; i < folder.PackStreams.Count; i++)
-                size += PackSizes[packStreamIndex + i];
-
-            return size;
-        }
-
-        internal Stream GetFolderStream(Stream stream, CFolder folder, IPasswordProvider pw)
-        {
-            int packStreamIndex = folder.FirstPackStreamId;
-            long folderStartPackPos = GetFolderStreamPos(folder, 0);
-            List<long> packSizes = new List<long>();
-            for (int j = 0; j < folder.PackStreams.Count; j++)
-                packSizes.Add(PackSizes[packStreamIndex + j]);
-
-            return DecoderStreamHelper.CreateDecoderStream(stream, folderStartPackPos, packSizes.ToArray(), folder, pw);
-        }
-
-        private long GetFolderPackStreamSize(int folderIndex, int streamIndex)
-        {
-            return PackSizes[Folders[folderIndex].FirstPackStreamId + streamIndex];
-        }
-
-        private long GetFilePackSize(int fileIndex)
-        {
-            int folderIndex = FileIndexToFolderIndexMap[fileIndex];
-            if (folderIndex != -1)
-                if (FolderStartFileIndex[folderIndex] == fileIndex)
-                    return GetFolderFullPackSize(folderIndex);
-            return 0;
-        }
-    }
-}

SharpCompress/Common/SevenZip/CCoderInfo.cs

@@ -1,10 +0,0 @@
-namespace SharpCompress.Common.SevenZip
-{
-    internal class CCoderInfo
-    {
-        internal CMethodId MethodId;
-        internal byte[] Props;
-        internal int NumInStreams;
-        internal int NumOutStreams;
-    }
-}

SharpCompress/Common/SevenZip/CFolder.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using SharpCompress.Compressor.LZMA;
-
-namespace SharpCompress.Common.SevenZip
-{
-    internal class CFolder
-    {
-        internal List<CCoderInfo> Coders = new List<CCoderInfo>();
-        internal List<CBindPair> BindPairs = new List<CBindPair>();
-        internal List<int> PackStreams = new List<int>();
-        internal int FirstPackStreamId;
-        internal List<long> UnpackSizes = new List<long>();
-        internal uint? UnpackCRC;
-
-        internal bool UnpackCRCDefined
-        {
-            get { return UnpackCRC != null; }
-        }
-
-        public long GetUnpackSize()
-        {
-            if (UnpackSizes.Count == 0)
-                return 0;
-
-            for (int i = UnpackSizes.Count - 1; i >= 0; i--)
-                if (FindBindPairForOutStream(i) < 0)
-                    return UnpackSizes[i];
-
-            throw new Exception();
-        }
-
-        public int GetNumOutStreams()
-        {
-            int count = 0;
-            for (int i = 0; i < Coders.Count; i++)
-                count += Coders[i].NumOutStreams;
-
-            return count;
-        }
-
-        public int FindBindPairForInStream(int inStreamIndex)
-        {
-            for (int i = 0; i < BindPairs.Count; i++)
-                if (BindPairs[i].InIndex == inStreamIndex)
-                    return i;
-
-            return -1;
-        }
-
-        public int FindBindPairForOutStream(int outStreamIndex)
-        {
-            for (int i = 0; i < BindPairs.Count; i++)
-                if (BindPairs[i].OutIndex == outStreamIndex)
-                    return i;
-
-            return -1;
-        }
-
-        public int FindPackStreamArrayIndex(int inStreamIndex)
-        {
-            for (int i = 0; i < PackStreams.Count; i++)
-                if (PackStreams[i] == inStreamIndex)
-                    return i;
-
-            return -1;
-        }
-
-        public bool IsEncrypted()
-        {
-            for (int i = Coders.Count - 1; i >= 0; i--)
-                if (Coders[i].MethodId == CMethodId.kAES)
-                    return true;
-
-            return false;
-        }
-
-        public bool CheckStructure()
-        {
-            const int kNumCodersMax = 32; // don't change it
-            const int kMaskSize = 32; // it must be >= kNumCodersMax
-            const int kNumBindsMax = 32;
-
-            if (Coders.Count > kNumCodersMax || BindPairs.Count > kNumBindsMax)
-                return false;
-
-            {
-                var v = new BitVector(BindPairs.Count + PackStreams.Count);
-
-                for (int i = 0; i < BindPairs.Count; i++)
-                    if (v.GetAndSet(BindPairs[i].InIndex))
-                        return false;
-
-                for (int i = 0; i < PackStreams.Count; i++)
-                    if (v.GetAndSet(PackStreams[i]))
-                        return false;
-            }
-
-            {
-                var v = new BitVector(UnpackSizes.Count);
-                for (int i = 0; i < BindPairs.Count; i++)
-                    if (v.GetAndSet(BindPairs[i].OutIndex))
-                        return false;
-            }
-
-            uint[] mask = new uint[kMaskSize];
-
-            {
-                List<int> inStreamToCoder = new List<int>();
-                List<int> outStreamToCoder = new List<int>();
-                for (int i = 0; i < Coders.Count; i++)
-                {
-                    CCoderInfo coder = Coders[i];
-                    for (int j = 0; j < coder.NumInStreams; j++)
-                        inStreamToCoder.Add(i);
-                    for (int j = 0; j < coder.NumOutStreams; j++)
-                        outStreamToCoder.Add(i);
-                }
-
-                for (int i = 0; i < BindPairs.Count; i++)
-                {
-                    CBindPair bp = BindPairs[i];
-                    mask[inStreamToCoder[bp.InIndex]] |= (1u << outStreamToCoder[bp.OutIndex]);
-                }
-            }
-
-            for (int i = 0; i < kMaskSize; i++)
-                for (int j = 0; j < kMaskSize; j++)
-                    if (((1u << j) & mask[i]) != 0)
-                        mask[i] |= mask[j];
-
-            for (int i = 0; i < kMaskSize; i++)
-                if (((1u << i) & mask[i]) != 0)
-                    return false;
-
-            return true;
-        }
-    }
-}

SharpCompress/Common/SevenZip/CMethodId.cs

@@ -1,55 +0,0 @@
-namespace SharpCompress.Common.SevenZip
-{
-    internal struct CMethodId
-    {
-        public const ulong kCopyId = 0;
-        public const ulong kLzmaId = 0x030101;
-        public const ulong kLzma2Id = 0x21;
-        public const ulong kAESId = 0x06F10701;
-
-        public static readonly CMethodId kCopy = new CMethodId(kCopyId);
-        public static readonly CMethodId kLzma = new CMethodId(kLzmaId);
-        public static readonly CMethodId kLzma2 = new CMethodId(kLzma2Id);
-        public static readonly CMethodId kAES = new CMethodId(kAESId);
-
-        public readonly ulong Id;
-
-        public CMethodId(ulong id)
-        {
-            this.Id = id;
-        }
-
-        public override int GetHashCode()
-        {
-            return Id.GetHashCode();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is CMethodId && (CMethodId) obj == this;
-        }
-
-        public bool Equals(CMethodId other)
-        {
-            return Id == other.Id;
-        }
-
-        public static bool operator ==(CMethodId left, CMethodId right)
-        {
-            return left.Id == right.Id;
-        }
-
-        public static bool operator !=(CMethodId left, CMethodId right)
-        {
-            return left.Id != right.Id;
-        }
-
-        public int GetLength()
-        {
-            int bytes = 0;
-            for (ulong value = Id; value != 0; value >>= 8)
-                bytes++;
-            return bytes;
-        }
-    }
-}

SharpCompress/Common/SevenZip/SevenZipEntry.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace SharpCompress.Common.SevenZip
-{
-    public class SevenZipEntry : Entry
-    {
-        internal SevenZipEntry(SevenZipFilePart filePart)
-        {
-            this.FilePart = filePart;
-        }
-
-        internal SevenZipFilePart FilePart { get; private set; }
-
-        public override CompressionType CompressionType
-        {
-            get { return FilePart.CompressionType; }
-        }
-
-        public override long Crc
-        {
-            get { return FilePart.Header.Crc ?? 0; }
-        }
-
-        public override string Key
-        {
-            get { return FilePart.Header.Name; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return 0; }
-        }
-
-        public override long Size
-        {
-            get { return (long) FilePart.Header.Size; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return FilePart.Header.MTime; }
-        }
-
-        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 FilePart.Header.IsDir; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { return FilePart.AsEnumerable<FilePart>(); }
-        }
-    }
-}

SharpCompress/Common/SevenZip/SevenZipFilePart.cs

@@ -1,109 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.SevenZip
-{
-    internal class SevenZipFilePart : FilePart
-    {
-        private CompressionType? type;
-        private Stream stream;
-        private ArchiveDatabase database;
-
-        internal SevenZipFilePart(Stream stream, ArchiveDatabase database, int index, CFileItem fileEntry)
-        {
-            this.stream = stream;
-            this.database = database;
-            Index = index;
-            Header = fileEntry;
-            if (Header.HasStream)
-            {
-                Folder = database.Folders[database.FileIndexToFolderIndexMap[index]];
-            }
-        }
-
-        internal Stream BaseStream { get; private set; }
-        internal CFileItem Header { get; private set; }
-        internal CFolder Folder { get; private set; }
-        internal int Index { get; private set; }
-
-        internal override string FilePartName
-        {
-            get { return Header.Name; }
-        }
-
-        internal override Stream GetRawStream()
-        {
-            return null;
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            if (!Header.HasStream)
-            {
-                return null;
-            }
-            var folderStream = database.GetFolderStream(stream, Folder, null);
-
-            int firstFileIndex = database.FolderStartFileIndex[database.Folders.IndexOf(Folder)];
-            int skipCount = Index - firstFileIndex;
-            long skipSize = 0;
-            for (int i = 0; i < skipCount; i++)
-            {
-                skipSize += database.Files[firstFileIndex + i].Size;
-            }
-            if (skipSize > 0)
-            {
-                folderStream.Skip(skipSize);
-            }
-            return new ReadOnlySubStream(folderStream, Header.Size);
-        }
-
-        public CompressionType CompressionType
-        {
-            get
-            {
-                if (type == null)
-                {
-                    type = GetCompression();
-                }
-                return type.Value;
-            }
-        }
-
-        //copied from DecoderRegistry
-        private const uint k_Copy = 0x0;
-        private const uint k_Delta = 3;
-        private const uint k_LZMA2 = 0x21;
-        private const uint k_LZMA = 0x030101;
-        private const uint k_PPMD = 0x030401;
-        private const uint k_BCJ = 0x03030103;
-        private const uint k_BCJ2 = 0x0303011B;
-        private const uint k_Deflate = 0x040108;
-        private const uint k_BZip2 = 0x040202;
-
-        internal CompressionType GetCompression()
-        {
-            var coder = Folder.Coders.First();
-            switch (coder.MethodId.Id)
-            {
-                case k_LZMA:
-                case k_LZMA2:
-                    {
-                        return CompressionType.LZMA;
-                    }
-                case k_PPMD:
-                    {
-                        return CompressionType.PPMd;
-                    }
-                case k_BZip2:
-                    {
-                        return CompressionType.BZip2;
-                    }
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-    }
-}

SharpCompress/Common/SevenZip/SevenZipVolume.cs

@@ -1,12 +0,0 @@
-using System.IO;
-
-namespace SharpCompress.Common.SevenZip
-{
-    public class SevenZipVolume : Volume
-    {
-        public SevenZipVolume(Stream stream, Options options)
-            : base(stream, options)
-        {
-        }
-    }
-}

SharpCompress/Common/Tar/Headers/TarHeader.cs

@@ -1,250 +0,0 @@
-using System;
-using System.IO;
-#if !PORTABLE
-using System.Net;
-#endif
-using System.Text;
-
-namespace SharpCompress.Common.Tar.Headers
-{
-    internal enum EntryType : byte
-    {
-        File = 0,
-        OldFile = (byte) '0',
-        HardLink = (byte) '1',
-        SymLink = (byte) '2',
-        CharDevice = (byte) '3',
-        BlockDevice = (byte) '4',
-        Directory = (byte) '5',
-        Fifo = (byte) '6',
-        LongLink = (byte) 'K',
-        LongName = (byte) 'L',
-        SparseFile = (byte) 'S',
-        VolumeHeader = (byte) 'V',
-    }
-
-    internal class TarHeader
-    {
-        internal static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-
-        internal string Name { get; set; }
-        //internal int Mode { get; set; }
-        //internal int UserId { get; set; }
-        //internal string UserName { get; set; }
-        //internal int GroupId { get; set; }
-        //internal string GroupName { get; set; }
-        internal long Size { get; set; }
-        internal DateTime LastModifiedTime { get; set; }
-        internal EntryType EntryType { get; set; }
-        internal Stream PackedStream { get; set; }
-
-        internal void Write(Stream output)
-        {
-            byte[] buffer = new byte[512];
-
-            WriteOctalBytes(511, buffer, 100, 8);   // file mode
-            WriteOctalBytes(0, buffer, 108, 8);     // owner ID
-            WriteOctalBytes(0, buffer, 116, 8);     // group ID
-
-            //Encoding.UTF8.GetBytes("magic").CopyTo(buffer, 257);
-            if (Name.Length > 100)
-            {
-                // Set mock filename and filetype to indicate the next block is the actual name of the file
-                WriteStringBytes("././@LongLink", buffer, 0, 100);
-                buffer[156] = (byte)EntryType.LongName;
-                WriteOctalBytes(Name.Length + 1, buffer, 124, 12);
-            }
-            else
-            {
-                WriteStringBytes(Name, buffer, 0, 100);
-                WriteOctalBytes(Size, buffer, 124, 12);
-                var time = (long)(LastModifiedTime.ToUniversalTime() - Epoch).TotalSeconds;
-                WriteOctalBytes(time, buffer, 136, 12);
-                buffer[156] = (byte)EntryType;
-
-                if (Size >= 0x1FFFFFFFF)
-                {
-#if PORTABLE || NETFX_CORE
-                byte[] bytes = BitConverter.GetBytes(Utility.HostToNetworkOrder(Size));
-#else
-                    byte[] bytes = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(Size));
-#endif
-                    var bytes12 = new byte[12];
-                    bytes.CopyTo(bytes12, 12 - bytes.Length);
-                    bytes12[0] |= 0x80;
-                    bytes12.CopyTo(buffer, 124);
-                }
-            }
-
-            int crc = RecalculateChecksum(buffer);
-            WriteOctalBytes(crc, buffer, 148, 8);
-
-            output.Write(buffer, 0, buffer.Length);
-
-            if (Name.Length > 100)
-            {
-                WriteLongFilenameHeader(output);
-                Name = Name.Substring(0, 100);
-                Write(output);
-            }
-        }
-        private void WriteLongFilenameHeader(Stream output)
-        {
-            byte[] nameBytes = ArchiveEncoding.Default.GetBytes(Name);
-            output.Write(nameBytes, 0, nameBytes.Length);
-
-            // pad to multiple of 512 bytes, and make sure a terminating null is added
-            int numPaddingBytes = 512 - (nameBytes.Length % 512);
-            if (numPaddingBytes == 0)
-                numPaddingBytes = 512;
-            output.Write(new byte[numPaddingBytes], 0, numPaddingBytes);
-        }
-
-        internal bool Read(BinaryReader reader)
-        {
-            byte[] buffer = reader.ReadBytes(512);
-            if (buffer.Length == 0)
-            {
-                return false;
-            }
-            if (buffer.Length < 512)
-            {
-                throw new InvalidOperationException();
-            }
-            Name = ArchiveEncoding.Default.GetString(buffer, 0, 100).TrimNulls();
-
-            //Mode = ReadASCIIInt32Base8(buffer, 100, 7);
-            //UserId = ReadASCIIInt32Base8(buffer, 108, 7);
-            //GroupId = ReadASCIIInt32Base8(buffer, 116, 7);
-            EntryType = (EntryType) buffer[156];
-            if ((buffer[124] & 0x80) == 0x80) // if size in binary
-            {
-                long sizeBigEndian = BitConverter.ToInt64(buffer, 0x80);
-#if PORTABLE || NETFX_CORE
-                    Size = Utility.NetworkToHostOrder(sizeBigEndian);
-#else
-                Size = IPAddress.NetworkToHostOrder(sizeBigEndian);
-#endif
-            }
-            else
-            {
-                Size = ReadASCIIInt64Base8(buffer, 124, 11);
-            }
-            long unixTimeStamp = ReadASCIIInt64Base8(buffer, 136, 11);
-            LastModifiedTime = Epoch.AddSeconds(unixTimeStamp).ToLocalTime();
-
-
-            Magic = ArchiveEncoding.Default.GetString(buffer, 257, 6).TrimNulls();
-
-            if (!string.IsNullOrEmpty(Magic) && "ustar".Equals(Magic))
-            {
-                string namePrefix = ArchiveEncoding.Default.GetString(buffer, 345, 157);
-                namePrefix = namePrefix.TrimNulls();
-                if (!string.IsNullOrEmpty(namePrefix))
-                {
-                    Name = namePrefix + "/" + Name;
-                }
-            }
-            if (EntryType != EntryType.LongName && Name.Length == 0)
-            {
-                return false;
-            }
-            return true;
-        }
-
-        private static void WriteStringBytes(string name, byte[] buffer, int offset, int length)
-        {
-            int i;
-
-            for (i = 0; i < length - 1 && i < name.Length; ++i)
-            {
-                buffer[offset + i] = (byte) name[i];
-            }
-
-            for (; i < length; ++i)
-            {
-                buffer[offset + i] = 0;
-            }
-        }
-
-        private static void WriteOctalBytes(long value, byte[] buffer, int offset, int length)
-        {
-            string val = Convert.ToString(value, 8);
-            int shift = length - val.Length - 1;
-            for (int i = 0; i < shift; i++)
-            {
-                buffer[offset + i] = (byte) ' ';
-            }
-            for (int i = 0; i < val.Length; i++)
-            {
-                buffer[offset + i + shift] = (byte) val[i];
-            }
-        }
-
-        private static int ReadASCIIInt32Base8(byte[] buffer, int offset, int count)
-        {
-            string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
-            if (string.IsNullOrEmpty(s))
-            {
-                return 0;
-            }
-            return Convert.ToInt32(s, 8);
-        }
-
-        private static long ReadASCIIInt64Base8(byte[] buffer, int offset, int count)
-        {
-            string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
-            if (string.IsNullOrEmpty(s))
-            {
-                return 0;
-            }
-            return Convert.ToInt64(s, 8);
-        }
-
-        private static long ReadASCIIInt64(byte[] buffer, int offset, int count)
-        {
-            string s = Encoding.UTF8.GetString(buffer, offset, count).TrimNulls();
-            if (string.IsNullOrEmpty(s))
-            {
-                return 0;
-            }
-            return Convert.ToInt64(s);
-        }
-
-        internal static int RecalculateChecksum(byte[] buf)
-        {
-            // Set default value for checksum. That is 8 spaces.
-            Encoding.UTF8.GetBytes("        ").CopyTo(buf, 148);
-
-            // Calculate checksum
-            int headerChecksum = 0;
-            foreach (byte b in buf)
-            {
-                headerChecksum += b;
-            }
-            return headerChecksum;
-        }
-
-        internal static int RecalculateAltChecksum(byte[] buf)
-        {
-            Encoding.UTF8.GetBytes("        ").CopyTo(buf, 148);
-            int headerChecksum = 0;
-            foreach (byte b in buf)
-            {
-                if ((b & 0x80) == 0x80)
-                {
-                    headerChecksum -= b ^ 0x80;
-                }
-                else
-                {
-                    headerChecksum += b;
-                }
-            }
-            return headerChecksum;
-        }
-
-        public long? DataStartPosition { get; set; }
-
-        public string Magic { get; set; }
-    }
-}

SharpCompress/Common/Tar/TarEntry.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common.Tar.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Tar
-{
-    public class TarEntry : Entry
-    {
-        private readonly TarFilePart filePart;
-        private readonly CompressionType type;
-
-        internal TarEntry(TarFilePart filePart, CompressionType type)
-        {
-            this.filePart = filePart;
-            this.type = type;
-        }
-
-        public override CompressionType CompressionType
-        {
-            get { return type; }
-        }
-
-        public override long Crc
-        {
-            get { return 0; }
-        }
-
-        public override string Key
-        {
-            get { return filePart.Header.Name; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return filePart.Header.Size; }
-        }
-
-        public override long Size
-        {
-            get { return filePart.Header.Size; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return filePart.Header.LastModifiedTime; }
-        }
-
-        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 filePart.Header.EntryType == EntryType.Directory; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { return filePart.AsEnumerable<FilePart>(); }
-        }
-
-        internal static IEnumerable<TarEntry> GetEntries(StreamingMode mode, Stream stream,
-                                                         CompressionType compressionType)
-        {
-            foreach (TarHeader h in TarHeaderFactory.ReadHeader(mode, stream))
-            {
-                if (h != null)
-                {
-                    if (mode == StreamingMode.Seekable)
-                    {
-                        yield return new TarEntry(new TarFilePart(h, stream), compressionType);
-                    }
-                    else
-                    {
-                        yield return new TarEntry(new TarFilePart(h, null), compressionType);
-                    }
-                }
-            }
-        }
-    }
-}

SharpCompress/Common/Tar/TarFilePart.cs

@@ -1,39 +0,0 @@
-using System.IO;
-using SharpCompress.Common.Tar.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Tar
-{
-    internal class TarFilePart : FilePart
-    {
-        private readonly Stream seekableStream;
-
-        internal TarFilePart(TarHeader header, Stream seekableStream)
-        {
-            this.seekableStream = seekableStream;
-            Header = header;
-        }
-
-        internal TarHeader Header { get; private set; }
-
-        internal override string FilePartName
-        {
-            get { return Header.Name; }
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            if (seekableStream != null)
-            {
-                seekableStream.Position = Header.DataStartPosition.Value;
-                return new ReadOnlySubStream(seekableStream, Header.Size);
-            }
-            return Header.PackedStream;
-        }
-
-        internal override Stream GetRawStream()
-        {
-            return null;
-        }
-    }
-}

SharpCompress/Common/Tar/TarReadOnlySubStream.cs

@@ -1,105 +0,0 @@
-using System.IO;
-
-namespace SharpCompress.Common.Tar
-{
-    internal class TarReadOnlySubStream : Stream
-    {
-        private bool isDisposed;
-        private long amountRead;
-
-        public TarReadOnlySubStream(Stream stream, long bytesToRead)
-        {
-            Stream = stream;
-            BytesLeftToRead = bytesToRead;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            if (disposing)
-            {
-                long skipBytes = amountRead % 512;
-                if (skipBytes == 0)
-                {
-                    return;
-                }
-                skipBytes = 512 - skipBytes;
-                if (skipBytes == 0)
-                {
-                    return;
-                }
-                var buffer = new byte[skipBytes];
-                Stream.ReadFully(buffer);
-            }
-        }
-
-        private long BytesLeftToRead { get; set; }
-
-        public Stream Stream { get; private set; }
-
-        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.NotSupportedException();
-        }
-
-        public override long Length
-        {
-            get { throw new System.NotSupportedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new System.NotSupportedException(); }
-            set { throw new System.NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (BytesLeftToRead < count)
-            {
-                count = (int)BytesLeftToRead;
-            }
-            int read = Stream.Read(buffer, offset, count);
-            if (read > 0)
-            {
-                BytesLeftToRead -= read;
-                amountRead += read;
-            }
-            return read;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new System.NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new System.NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new System.NotSupportedException();
-        }
-    }
-}

SharpCompress/Common/Tar/TarVolume.cs

@@ -1,12 +0,0 @@
-using System.IO;
-
-namespace SharpCompress.Common.Tar
-{
-    public class TarVolume : Volume
-    {
-        public TarVolume(Stream stream, Options options)
-            : base(stream, options)
-        {
-        }
-    }
-}

SharpCompress/Common/Volume.cs

@@ -1,51 +0,0 @@
-using System.IO;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common
-{
-    public abstract class Volume : IVolume
-    {
-        private readonly Stream actualStream;
-
-        internal Volume(Stream stream, Options options)
-        {
-            actualStream = stream;
-            Options = options;
-        }
-
-        internal Stream Stream
-        {
-            get { return new NonDisposingStream(actualStream); }
-        }
-
-        internal Options Options { get; private set; }
-
-        /// <summary>
-        /// RarArchive is the first volume of a multi-part archive.
-        /// Only Rar 3.0 format and higher
-        /// </summary>
-        public virtual bool IsFirstVolume
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// RarArchive is part of a multi-part archive.
-        /// </summary>
-        public virtual bool IsMultiVolume
-        {
-            get { return true; }
-        }
-
-        private bool disposed;
-
-        public void Dispose()
-        {
-            if (!Options.HasFlag(Options.KeepStreamsOpen) && !disposed)
-            {
-                actualStream.Dispose();
-                disposed = true;
-            }
-        }
-    }
-}

SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs

@@ -1,88 +0,0 @@
-using System.IO;
-using System.Linq;
-
-namespace SharpCompress.Common.Zip.Headers
-{
-    internal class DirectoryEntryHeader : ZipFileEntry
-    {
-        public DirectoryEntryHeader()
-            : base(ZipHeaderType.DirectoryEntry)
-        {
-        }
-
-        internal override void Read(BinaryReader reader)
-        {
-            Version = reader.ReadUInt16();
-            VersionNeededToExtract = reader.ReadUInt16();
-            Flags = (HeaderFlags) reader.ReadUInt16();
-            CompressionMethod = (ZipCompressionMethod) reader.ReadUInt16();
-            LastModifiedTime = reader.ReadUInt16();
-            LastModifiedDate = reader.ReadUInt16();
-            Crc = reader.ReadUInt32();
-            CompressedSize = reader.ReadUInt32();
-            UncompressedSize = reader.ReadUInt32();
-            ushort nameLength = reader.ReadUInt16();
-            ushort extraLength = reader.ReadUInt16();
-            ushort commentLength = reader.ReadUInt16();
-            DiskNumberStart = reader.ReadUInt16();
-            InternalFileAttributes = reader.ReadUInt16();
-            ExternalFileAttributes = reader.ReadUInt32();
-            RelativeOffsetOfEntryHeader = reader.ReadUInt32();
-
-            byte[] name = reader.ReadBytes(nameLength);
-            Name = DecodeString(name);
-            byte[] extra = reader.ReadBytes(extraLength);
-            byte[] comment = reader.ReadBytes(commentLength);
-            Comment = DecodeString(comment);
-            LoadExtra(extra);
-
-            var unicodePathExtra = Extra.FirstOrDefault(u => u.Type == ExtraDataType.UnicodePathExtraField);
-            if (unicodePathExtra != null)
-            {
-                Name = ((ExtraUnicodePathExtraField)unicodePathExtra).UnicodeName;
-            }
-        }
-
-        internal override void Write(BinaryWriter writer)
-        {
-            writer.Write(Version);
-            writer.Write(VersionNeededToExtract);
-            writer.Write((ushort) Flags);
-            writer.Write((ushort) CompressionMethod);
-            writer.Write(LastModifiedTime);
-            writer.Write(LastModifiedDate);
-            writer.Write(Crc);
-            writer.Write(CompressedSize);
-            writer.Write(UncompressedSize);
-
-            byte[] nameBytes = EncodeString(Name);
-            writer.Write((ushort) nameBytes.Length);
-            //writer.Write((ushort)Extra.Length);
-            writer.Write((ushort) 0);
-            writer.Write((ushort) Comment.Length);
-
-            writer.Write(DiskNumberStart);
-            writer.Write(InternalFileAttributes);
-            writer.Write(ExternalFileAttributes);
-            writer.Write(RelativeOffsetOfEntryHeader);
-
-            writer.Write(nameBytes);
-            // writer.Write(Extra);
-            writer.Write(Comment);
-        }
-
-        internal ushort Version { get; private set; }
-
-        public ushort VersionNeededToExtract { get; set; }
-
-        public uint RelativeOffsetOfEntryHeader { get; set; }
-
-        public uint ExternalFileAttributes { get; set; }
-
-        public ushort InternalFileAttributes { get; set; }
-
-        public ushort DiskNumberStart { get; set; }
-
-        public string Comment { get; private set; }
-    }
-}

SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs

@@ -1,61 +0,0 @@
-using System.IO;
-using System.Linq;
-
-namespace SharpCompress.Common.Zip.Headers
-{
-    internal class LocalEntryHeader : ZipFileEntry
-    {
-        public LocalEntryHeader()
-            : base(ZipHeaderType.LocalEntry)
-        {
-        }
-
-        internal override void Read(BinaryReader reader)
-        {
-            Version = reader.ReadUInt16();
-            Flags = (HeaderFlags) reader.ReadUInt16();
-            CompressionMethod = (ZipCompressionMethod) reader.ReadUInt16();
-            LastModifiedTime = reader.ReadUInt16();
-            LastModifiedDate = reader.ReadUInt16();
-            Crc = reader.ReadUInt32();
-            CompressedSize = reader.ReadUInt32();
-            UncompressedSize = reader.ReadUInt32();
-            ushort nameLength = reader.ReadUInt16();
-            ushort extraLength = reader.ReadUInt16();
-            byte[] name = reader.ReadBytes(nameLength);
-            byte[] extra = reader.ReadBytes(extraLength);
-            Name = DecodeString(name);
-            LoadExtra(extra);
-
-            var unicodePathExtra = Extra.FirstOrDefault(u => u.Type == ExtraDataType.UnicodePathExtraField);
-            if (unicodePathExtra!=null)
-            {
-                Name = ((ExtraUnicodePathExtraField) unicodePathExtra).UnicodeName;
-            }
-        }
-
-        internal override void Write(BinaryWriter writer)
-        {
-            writer.Write(Version);
-            writer.Write((ushort) Flags);
-            writer.Write((ushort) CompressionMethod);
-            writer.Write(LastModifiedTime);
-            writer.Write(LastModifiedDate);
-            writer.Write(Crc);
-            writer.Write(CompressedSize);
-            writer.Write(UncompressedSize);
-
-            byte[] nameBytes = EncodeString(Name);
-
-            writer.Write((ushort) nameBytes.Length);
-            writer.Write((ushort) 0);
-            //if (Extra != null)
-            //{
-            //    writer.Write(Extra);
-            //}
-            writer.Write(nameBytes);
-        }
-
-        internal ushort Version { get; private set; }
-    }
-}

SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Text;
-
-namespace SharpCompress.Common.Zip.Headers
-{
-    internal enum ExtraDataType : ushort
-    {
-        WinZipAes = 0x9901,
-
-        NotImplementedExtraData = 0xFFFF,
-        // Third Party Mappings
-        // -Info-ZIP Unicode Path Extra Field
-        UnicodePathExtraField = 0x7075
-    }
-
-    internal class ExtraData
-    {
-        internal ExtraDataType Type { get; set; }
-        internal ushort Length { get; set; }
-        internal byte[] DataBytes { get; set; }
-    }
-
-    internal class ExtraUnicodePathExtraField : ExtraData
-    {
-        internal byte Version
-        {
-            get { return this.DataBytes[0]; }
-        }
-
-        internal byte[] NameCRC32
-        {
-            get
-            {
-                var crc = new byte[4];
-                Buffer.BlockCopy(this.DataBytes, 1, crc, 0, 4);
-                return crc;
-            }
-        }
-
-        internal string UnicodeName
-        {
-            get
-            {
-                // PathNamelength = dataLength - Version(1 byte) - NameCRC32(4 bytes)
-                var length = this.Length - 5;
-                var nameStr = Encoding.UTF8.GetString(this.DataBytes, 5, length);
-                return nameStr;
-            }
-        }
-    }
-
-    internal static class LocalEntryHeaderExtraFactory
-    {
-        internal static ExtraData Create(ExtraDataType type,ushort length, byte[] extraData)
-        {
-            switch (type)
-            {
-                case ExtraDataType.UnicodePathExtraField:
-                    return new ExtraUnicodePathExtraField()
-                    {
-                        Type = type,
-                        Length = length,
-                        DataBytes = extraData
-                    };
-                default:
-                    return new ExtraData
-                    {
-                        Type = type,
-                        Length = length,
-                        DataBytes = extraData
-                    };
-            }
-        }
-    }
-}

SharpCompress/Common/Zip/Headers/ZipFileEntry.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace SharpCompress.Common.Zip.Headers
-{
-    internal abstract class ZipFileEntry : ZipHeader
-    {
-        protected ZipFileEntry(ZipHeaderType type)
-            : base(type)
-        {
-            Extra = new List<ExtraData>();
-        }
-
-        internal bool IsDirectory
-        {
-            get { return Name.EndsWith("/"); }
-        }
-
-        protected string DecodeString(byte[] str)
-        {
-            if (FlagUtility.HasFlag(Flags, HeaderFlags.UTF8))
-            {
-                return Encoding.UTF8.GetString(str, 0, str.Length);
-            }
-
-            return ArchiveEncoding.Default.GetString(str, 0, str.Length);
-        }
-
-        protected byte[] EncodeString(string str)
-        {
-            if (FlagUtility.HasFlag(Flags, HeaderFlags.UTF8))
-            {
-                return Encoding.UTF8.GetBytes(str);
-            }
-            return ArchiveEncoding.Default.GetBytes(str);
-        }
-
-        internal Stream PackedStream { get; set; }
-
-        internal string Name { get; set; }
-
-        internal HeaderFlags Flags { get; set; }
-
-        internal ZipCompressionMethod CompressionMethod { get; set; }
-
-        internal uint CompressedSize { get; set; }
-
-        internal long? DataStartPosition { get; set; }
-
-        internal uint UncompressedSize { get; set; }
-
-        internal List<ExtraData> Extra { get; set; }
-
-        internal PkwareTraditionalEncryptionData PkwareTraditionalEncryptionData { get; set; }
-#if !PORTABLE && !NETFX_CORE
-        internal WinzipAesEncryptionData WinzipAesEncryptionData { get; set; }
-#endif
-
-        internal ushort LastModifiedDate { get; set; }
-
-        internal ushort LastModifiedTime { get; set; }
-
-        internal uint Crc { get; set; }
-
-        protected void LoadExtra(byte[] extra)
-        {
-            for (int i = 0; i < extra.Length-4;)
-            {
-                ExtraDataType type = (ExtraDataType) BitConverter.ToUInt16(extra, i);
-                if (!Enum.IsDefined(typeof (ExtraDataType), type))
-                {
-                    type = ExtraDataType.NotImplementedExtraData;
-                }
-
-                ushort length = BitConverter.ToUInt16(extra, i + 2);
-                byte[] data = new byte[length];
-                Buffer.BlockCopy(extra, i + 4, data, 0, length);
-                Extra.Add(LocalEntryHeaderExtraFactory.Create(type,length,data));
-
-                i += length + 4;
-            }
-        }
-
-        internal ZipFilePart Part { get; set; }
-    }
-}

SharpCompress/Common/Zip/SeekableZipFilePart.cs

@@ -1,45 +0,0 @@
-using System.IO;
-using SharpCompress.Common.Zip.Headers;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class SeekableZipFilePart : ZipFilePart
-    {
-        private bool isLocalHeaderLoaded;
-        private readonly SeekableZipHeaderFactory headerFactory;
-
-        internal SeekableZipFilePart(SeekableZipHeaderFactory headerFactory, DirectoryEntryHeader header, Stream stream)
-            : base(header, stream)
-        {
-            this.headerFactory = headerFactory;
-        }
-
-        internal override Stream GetCompressedStream()
-        {
-            if (!isLocalHeaderLoaded)
-            {
-                LoadLocalHeader();
-                isLocalHeaderLoaded = true;
-            }
-            return base.GetCompressedStream();
-        }
-
-        internal string Comment
-        {
-            get { return (Header as DirectoryEntryHeader).Comment; }
-        }
-
-        private void LoadLocalHeader()
-        {
-            bool hasData = Header.HasData;
-            Header = headerFactory.GetLocalHeader(BaseStream, Header as DirectoryEntryHeader);
-            Header.HasData = hasData;
-        }
-
-        protected override Stream CreateBaseStream()
-        {
-            BaseStream.Position = Header.DataStartPosition.Value;
-            return BaseStream;
-        }
-    }
-}

SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common.Zip.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class SeekableZipHeaderFactory : ZipHeaderFactory
-    {
-        private const int MAX_ITERATIONS_FOR_DIRECTORY_HEADER = 1000;
-
-        internal SeekableZipHeaderFactory(string password)
-            : base(StreamingMode.Seekable, password)
-        {
-        }
-
-        internal IEnumerable<DirectoryEntryHeader> ReadSeekableHeader(Stream stream)
-        {
-            long offset = 0;
-            uint signature;
-            BinaryReader reader = new BinaryReader(stream);
-
-            int iterationCount = 0;
-            do
-            {
-                if ((stream.Length + offset) - 4 < 0)
-                {
-                    throw new ArchiveException("Failed to locate the Zip Header");
-                }
-                stream.Seek(offset - 4, SeekOrigin.End);
-                signature = reader.ReadUInt32();
-                offset--;
-                iterationCount++;
-                if (iterationCount > MAX_ITERATIONS_FOR_DIRECTORY_HEADER)
-                {
-                    throw new ArchiveException(
-                        "Could not find Zip file Directory at the end of the file.  File may be corrupted.");
-                }
-            } while (signature != DIRECTORY_END_HEADER_BYTES);
-
-            var entry = new DirectoryEndHeader();
-            entry.Read(reader);
-            stream.Seek(entry.DirectoryStartOffsetRelativeToDisk, SeekOrigin.Begin);
-
-            DirectoryEntryHeader directoryEntryHeader = null;
-            long position = stream.Position;
-            while (true)
-            {
-                stream.Position = position;
-                signature = reader.ReadUInt32();
-                directoryEntryHeader = ReadHeader(signature, reader) as DirectoryEntryHeader;
-                position = stream.Position;
-                if (directoryEntryHeader == null)
-                {
-                    yield break;
-                }
-                //entry could be zero bytes so we need to know that.
-                directoryEntryHeader.HasData = directoryEntryHeader.CompressedSize != 0;
-                yield return directoryEntryHeader;
-            }
-        }
-
-        internal LocalEntryHeader GetLocalHeader(Stream stream, DirectoryEntryHeader directoryEntryHeader)
-        {
-            stream.Seek(directoryEntryHeader.RelativeOffsetOfEntryHeader, SeekOrigin.Begin);
-            BinaryReader reader = new BinaryReader(stream);
-            uint signature = reader.ReadUInt32();
-            var localEntryHeader = ReadHeader(signature, reader) as LocalEntryHeader;
-            if (localEntryHeader == null)
-            {
-                throw new InvalidOperationException();
-            }
-            return localEntryHeader;
-        }
-    }
-}

SharpCompress/Common/Zip/StreamingZipHeaderFactory.cs

@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using SharpCompress.Common.Zip.Headers;
-using SharpCompress.IO;
-
-namespace SharpCompress.Common.Zip
-{
-    internal class StreamingZipHeaderFactory : ZipHeaderFactory
-    {
-        internal StreamingZipHeaderFactory(string password)
-            : base(StreamingMode.Streaming, password)
-        {
-        }
-
-        internal IEnumerable<ZipHeader> ReadStreamHeader(Stream stream)
-        {
-            RewindableStream rewindableStream;
-            if (stream is RewindableStream)
-            {
-                rewindableStream = stream as RewindableStream;
-            }
-            else
-            {
-                rewindableStream = new RewindableStream(stream);
-            }
-            while (true)
-            {
-                ZipHeader header = null;
-                BinaryReader reader = new BinaryReader(rewindableStream);
-                if (lastEntryHeader != null &&
-                    FlagUtility.HasFlag(lastEntryHeader.Flags, HeaderFlags.UsePostDataDescriptor))
-                {
-                    reader = (lastEntryHeader.Part as StreamingZipFilePart).FixStreamedFileLocation(ref rewindableStream);
-                    long pos = rewindableStream.Position;
-                    uint crc = reader.ReadUInt32();
-                    if (crc == POST_DATA_DESCRIPTOR)
-                    {
-                        crc = reader.ReadUInt32();
-                    }
-                    lastEntryHeader.Crc = crc;
-                    lastEntryHeader.CompressedSize = reader.ReadUInt32();
-                    lastEntryHeader.UncompressedSize = reader.ReadUInt32();
-                    lastEntryHeader.DataStartPosition = pos - lastEntryHeader.CompressedSize;
-                }
-                lastEntryHeader = null;
-                uint headerBytes = reader.ReadUInt32();
-                header = ReadHeader(headerBytes, reader);
-
-                //entry could be zero bytes so we need to know that.
-                if (header.ZipHeaderType == ZipHeaderType.LocalEntry)
-                {
-                    bool isRecording = rewindableStream.IsRecording;
-                    if (!isRecording)
-                    {
-                        rewindableStream.StartRecording();
-                    }
-                    uint nextHeaderBytes = reader.ReadUInt32();
-                    header.HasData = !IsHeader(nextHeaderBytes);
-                    rewindableStream.Rewind(!isRecording);
-                }
-                yield return header;
-            }
-        }
-    }
-}

SharpCompress/Common/Zip/WinzipAesCryptoStream.Portable.cs

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

SharpCompress/Common/Zip/WinzipAesEncryptionData.Portable.cs

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

SharpCompress/Common/Zip/WinzipAesEncryptionData.cs

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

SharpCompress/Common/Zip/ZipEntry.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using SharpCompress.Common.Zip.Headers;
-
-namespace SharpCompress.Common.Zip
-{
-    public class ZipEntry : Entry
-    {
-        private readonly ZipFilePart filePart;
-        private readonly DateTime? lastModifiedTime;
-
-        internal ZipEntry(ZipFilePart filePart)
-        {
-            if (filePart != null)
-            {
-                this.filePart = filePart;
-                lastModifiedTime = Utility.DosDateToDateTime(filePart.Header.LastModifiedDate,
-                                                             filePart.Header.LastModifiedTime);
-            }
-        }
-
-        public override CompressionType CompressionType
-        {
-            get
-            {
-                switch (filePart.Header.CompressionMethod)
-                {
-                    case ZipCompressionMethod.BZip2:
-                        {
-                            return CompressionType.BZip2;
-                        }
-                    case ZipCompressionMethod.Deflate:
-                        {
-                            return CompressionType.Deflate;
-                        }
-                    case ZipCompressionMethod.LZMA:
-                        {
-                            return CompressionType.LZMA;
-                        }
-                    case ZipCompressionMethod.PPMd:
-                        {
-                            return CompressionType.PPMd;
-                        }
-                    case ZipCompressionMethod.None:
-                        {
-                            return CompressionType.None;
-                        }
-                    default:
-                        {
-                            return CompressionType.Unknown;
-                        }
-                }
-            }
-        }
-
-        public override long Crc
-        {
-            get { return filePart.Header.Crc; }
-        }
-
-        public override string Key
-        {
-            get { return filePart.Header.Name; }
-        }
-
-        public override long CompressedSize
-        {
-            get { return filePart.Header.CompressedSize; }
-        }
-
-        public override long Size
-        {
-            get { return filePart.Header.UncompressedSize; }
-        }
-
-        public override DateTime? LastModifiedTime
-        {
-            get { return lastModifiedTime; }
-        }
-
-        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 FlagUtility.HasFlag(filePart.Header.Flags, HeaderFlags.Encrypted); }
-        }
-
-        public override bool IsDirectory
-        {
-            get { return filePart.Header.IsDirectory; }
-        }
-
-        public override bool IsSplit
-        {
-            get { return false; }
-        }
-
-        internal override IEnumerable<FilePart> Parts
-        {
-            get { return filePart.AsEnumerable<FilePart>(); }
-        }
-    }
-}

SharpCompress/Common/Zip/ZipVolume.cs

@@ -1,14 +0,0 @@
-using System.IO;
-
-namespace SharpCompress.Common.Zip
-{
-    public class ZipVolume : Volume
-    {
-        public ZipVolume(Stream stream, Options options)
-            : base(stream, options)
-        {
-        }
-
-        public string Comment { get; internal set; }
-    }
-}

SharpCompress/Compressor/BZip2/BZip2Constants.cs

@@ -1,101 +0,0 @@
-/*
- * Copyright 2001,2004-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * This package is based on the work done by Keiron Liddle, Aftex Software
- * <keiron@aftexsw.com> to whom the Ant project is very grateful for his
- * great code.
- */
-
-namespace SharpCompress.Compressor.BZip2
-{
-    /**
-    * Base class for both the compress and decompress classes.
-    * Holds common arrays, and static data.
-    *
-    * @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
-    */
-
-    internal class BZip2Constants
-    {
-        public const int baseBlockSize = 100000;
-        public const int MAX_ALPHA_SIZE = 258;
-        public const int MAX_CODE_LEN = 23;
-        public const int RUNA = 0;
-        public const int RUNB = 1;
-        public const int N_GROUPS = 6;
-        public const int G_SIZE = 50;
-        public const int N_ITERS = 4;
-        public const int MAX_SELECTORS = (2 + (900000/G_SIZE));
-        public const int NUM_OVERSHOOT_BYTES = 20;
-
-        public static int[] rNums =
-            {
-                619, 720, 127, 481, 931, 816, 813, 233, 566, 247,
-                985, 724, 205, 454, 863, 491, 741, 242, 949, 214,
-                733, 859, 335, 708, 621, 574, 73, 654, 730, 472,
-                419, 436, 278, 496, 867, 210, 399, 680, 480, 51,
-                878, 465, 811, 169, 869, 675, 611, 697, 867, 561,
-                862, 687, 507, 283, 482, 129, 807, 591, 733, 623,
-                150, 238, 59, 379, 684, 877, 625, 169, 643, 105,
-                170, 607, 520, 932, 727, 476, 693, 425, 174, 647,
-                73, 122, 335, 530, 442, 853, 695, 249, 445, 515,
-                909, 545, 703, 919, 874, 474, 882, 500, 594, 612,
-                641, 801, 220, 162, 819, 984, 589, 513, 495, 799,
-                161, 604, 958, 533, 221, 400, 386, 867, 600, 782,
-                382, 596, 414, 171, 516, 375, 682, 485, 911, 276,
-                98, 553, 163, 354, 666, 933, 424, 341, 533, 870,
-                227, 730, 475, 186, 263, 647, 537, 686, 600, 224,
-                469, 68, 770, 919, 190, 373, 294, 822, 808, 206,
-                184, 943, 795, 384, 383, 461, 404, 758, 839, 887,
-                715, 67, 618, 276, 204, 918, 873, 777, 604, 560,
-                951, 160, 578, 722, 79, 804, 96, 409, 713, 940,
-                652, 934, 970, 447, 318, 353, 859, 672, 112, 785,
-                645, 863, 803, 350, 139, 93, 354, 99, 820, 908,
-                609, 772, 154, 274, 580, 184, 79, 626, 630, 742,
-                653, 282, 762, 623, 680, 81, 927, 626, 789, 125,
-                411, 521, 938, 300, 821, 78, 343, 175, 128, 250,
-                170, 774, 972, 275, 999, 639, 495, 78, 352, 126,
-                857, 956, 358, 619, 580, 124, 737, 594, 701, 612,
-                669, 112, 134, 694, 363, 992, 809, 743, 168, 974,
-                944, 375, 748, 52, 600, 747, 642, 182, 862, 81,
-                344, 805, 988, 739, 511, 655, 814, 334, 249, 515,
-                897, 955, 664, 981, 649, 113, 974, 459, 893, 228,
-                433, 837, 553, 268, 926, 240, 102, 654, 459, 51,
-                686, 754, 806, 760, 493, 403, 415, 394, 687, 700,
-                946, 670, 656, 610, 738, 392, 760, 799, 887, 653,
-                978, 321, 576, 617, 626, 502, 894, 679, 243, 440,
-                680, 879, 194, 572, 640, 724, 926, 56, 204, 700,
-                707, 151, 457, 449, 797, 195, 791, 558, 945, 679,
-                297, 59, 87, 824, 713, 663, 412, 693, 342, 606,
-                134, 108, 571, 364, 631, 212, 174, 643, 304, 329,
-                343, 97, 430, 751, 497, 314, 983, 374, 822, 928,
-                140, 206, 73, 263, 980, 736, 876, 478, 430, 305,
-                170, 514, 364, 692, 829, 82, 855, 953, 676, 246,
-                369, 970, 294, 750, 807, 827, 150, 790, 288, 923,
-                804, 378, 215, 828, 592, 281, 565, 555, 710, 82,
-                896, 831, 547, 261, 524, 462, 293, 465, 502, 56,
-                661, 821, 976, 991, 658, 869, 905, 758, 745, 193,
-                768, 550, 608, 933, 378, 286, 215, 979, 792, 961,
-                61, 688, 793, 644, 986, 403, 106, 366, 905, 644,
-                372, 567, 466, 434, 645, 210, 389, 550, 919, 135,
-                780, 773, 635, 389, 707, 100, 626, 958, 165, 504,
-                920, 176, 193, 713, 857, 265, 203, 50, 668, 108,
-                645, 990, 626, 197, 510, 357, 358, 850, 858, 364,
-                936, 638
-            };
-    }
-}

SharpCompress/Compressor/BZip2/CRC.cs

@@ -1,203 +0,0 @@
-/*
- * Copyright 2001,2004-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * This package is based on the work done by Keiron Liddle), Aftex Software
- * <keiron@aftexsw.com> to whom the Ant project is very grateful for his
- * great code.
- */
-
-namespace SharpCompress.Compressor.BZip2
-{
-    /**
-      * A simple class the hold and calculate the CRC for sanity checking
-      * of the data.
-      *
-      * @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
-      */
-
-    internal class CRC
-    {
-        public static int[] crc32Table =
-            {
-                unchecked((int) 0x00000000), unchecked((int) 0x04c11db7), unchecked((int) 0x09823b6e),
-                unchecked((int) 0x0d4326d9),
-                unchecked((int) 0x130476dc), unchecked((int) 0x17c56b6b), unchecked((int) 0x1a864db2),
-                unchecked((int) 0x1e475005),
-                unchecked((int) 0x2608edb8), unchecked((int) 0x22c9f00f), unchecked((int) 0x2f8ad6d6),
-                unchecked((int) 0x2b4bcb61),
-                unchecked((int) 0x350c9b64), unchecked((int) 0x31cd86d3), unchecked((int) 0x3c8ea00a),
-                unchecked((int) 0x384fbdbd),
-                unchecked((int) 0x4c11db70), unchecked((int) 0x48d0c6c7), unchecked((int) 0x4593e01e),
-                unchecked((int) 0x4152fda9),
-                unchecked((int) 0x5f15adac), unchecked((int) 0x5bd4b01b), unchecked((int) 0x569796c2),
-                unchecked((int) 0x52568b75),
-                unchecked((int) 0x6a1936c8), unchecked((int) 0x6ed82b7f), unchecked((int) 0x639b0da6),
-                unchecked((int) 0x675a1011),
-                unchecked((int) 0x791d4014), unchecked((int) 0x7ddc5da3), unchecked((int) 0x709f7b7a),
-                unchecked((int) 0x745e66cd),
-                unchecked((int) 0x9823b6e0), unchecked((int) 0x9ce2ab57), unchecked((int) 0x91a18d8e),
-                unchecked((int) 0x95609039),
-                unchecked((int) 0x8b27c03c), unchecked((int) 0x8fe6dd8b), unchecked((int) 0x82a5fb52),
-                unchecked((int) 0x8664e6e5),
-                unchecked((int) 0xbe2b5b58), unchecked((int) 0xbaea46ef), unchecked((int) 0xb7a96036),
-                unchecked((int) 0xb3687d81),
-                unchecked((int) 0xad2f2d84), unchecked((int) 0xa9ee3033), unchecked((int) 0xa4ad16ea),
-                unchecked((int) 0xa06c0b5d),
-                unchecked((int) 0xd4326d90), unchecked((int) 0xd0f37027), unchecked((int) 0xddb056fe),
-                unchecked((int) 0xd9714b49),
-                unchecked((int) 0xc7361b4c), unchecked((int) 0xc3f706fb), unchecked((int) 0xceb42022),
-                unchecked((int) 0xca753d95),
-                unchecked((int) 0xf23a8028), unchecked((int) 0xf6fb9d9f), unchecked((int) 0xfbb8bb46),
-                unchecked((int) 0xff79a6f1),
-                unchecked((int) 0xe13ef6f4), unchecked((int) 0xe5ffeb43), unchecked((int) 0xe8bccd9a),
-                unchecked((int) 0xec7dd02d),
-                unchecked((int) 0x34867077), unchecked((int) 0x30476dc0), unchecked((int) 0x3d044b19),
-                unchecked((int) 0x39c556ae),
-                unchecked((int) 0x278206ab), unchecked((int) 0x23431b1c), unchecked((int) 0x2e003dc5),
-                unchecked((int) 0x2ac12072),
-                unchecked((int) 0x128e9dcf), unchecked((int) 0x164f8078), unchecked((int) 0x1b0ca6a1),
-                unchecked((int) 0x1fcdbb16),
-                unchecked((int) 0x018aeb13), unchecked((int) 0x054bf6a4), unchecked((int) 0x0808d07d),
-                unchecked((int) 0x0cc9cdca),
-                unchecked((int) 0x7897ab07), unchecked((int) 0x7c56b6b0), unchecked((int) 0x71159069),
-                unchecked((int) 0x75d48dde),
-                unchecked((int) 0x6b93dddb), unchecked((int) 0x6f52c06c), unchecked((int) 0x6211e6b5),
-                unchecked((int) 0x66d0fb02),
-                unchecked((int) 0x5e9f46bf), unchecked((int) 0x5a5e5b08), unchecked((int) 0x571d7dd1),
-                unchecked((int) 0x53dc6066),
-                unchecked((int) 0x4d9b3063), unchecked((int) 0x495a2dd4), unchecked((int) 0x44190b0d),
-                unchecked((int) 0x40d816ba),
-                unchecked((int) 0xaca5c697), unchecked((int) 0xa864db20), unchecked((int) 0xa527fdf9),
-                unchecked((int) 0xa1e6e04e),
-                unchecked((int) 0xbfa1b04b), unchecked((int) 0xbb60adfc), unchecked((int) 0xb6238b25),
-                unchecked((int) 0xb2e29692),
-                unchecked((int) 0x8aad2b2f), unchecked((int) 0x8e6c3698), unchecked((int) 0x832f1041),
-                unchecked((int) 0x87ee0df6),
-                unchecked((int) 0x99a95df3), unchecked((int) 0x9d684044), unchecked((int) 0x902b669d),
-                unchecked((int) 0x94ea7b2a),
-                unchecked((int) 0xe0b41de7), unchecked((int) 0xe4750050), unchecked((int) 0xe9362689),
-                unchecked((int) 0xedf73b3e),
-                unchecked((int) 0xf3b06b3b), unchecked((int) 0xf771768c), unchecked((int) 0xfa325055),
-                unchecked((int) 0xfef34de2),
-                unchecked((int) 0xc6bcf05f), unchecked((int) 0xc27dede8), unchecked((int) 0xcf3ecb31),
-                unchecked((int) 0xcbffd686),
-                unchecked((int) 0xd5b88683), unchecked((int) 0xd1799b34), unchecked((int) 0xdc3abded),
-                unchecked((int) 0xd8fba05a),
-                unchecked((int) 0x690ce0ee), unchecked((int) 0x6dcdfd59), unchecked((int) 0x608edb80),
-                unchecked((int) 0x644fc637),
-                unchecked((int) 0x7a089632), unchecked((int) 0x7ec98b85), unchecked((int) 0x738aad5c),
-                unchecked((int) 0x774bb0eb),
-                unchecked((int) 0x4f040d56), unchecked((int) 0x4bc510e1), unchecked((int) 0x46863638),
-                unchecked((int) 0x42472b8f),
-                unchecked((int) 0x5c007b8a), unchecked((int) 0x58c1663d), unchecked((int) 0x558240e4),
-                unchecked((int) 0x51435d53),
-                unchecked((int) 0x251d3b9e), unchecked((int) 0x21dc2629), unchecked((int) 0x2c9f00f0),
-                unchecked((int) 0x285e1d47),
-                unchecked((int) 0x36194d42), unchecked((int) 0x32d850f5), unchecked((int) 0x3f9b762c),
-                unchecked((int) 0x3b5a6b9b),
-                unchecked((int) 0x0315d626), unchecked((int) 0x07d4cb91), unchecked((int) 0x0a97ed48),
-                unchecked((int) 0x0e56f0ff),
-                unchecked((int) 0x1011a0fa), unchecked((int) 0x14d0bd4d), unchecked((int) 0x19939b94),
-                unchecked((int) 0x1d528623),
-                unchecked((int) 0xf12f560e), unchecked((int) 0xf5ee4bb9), unchecked((int) 0xf8ad6d60),
-                unchecked((int) 0xfc6c70d7),
-                unchecked((int) 0xe22b20d2), unchecked((int) 0xe6ea3d65), unchecked((int) 0xeba91bbc),
-                unchecked((int) 0xef68060b),
-                unchecked((int) 0xd727bbb6), unchecked((int) 0xd3e6a601), unchecked((int) 0xdea580d8),
-                unchecked((int) 0xda649d6f),
-                unchecked((int) 0xc423cd6a), unchecked((int) 0xc0e2d0dd), unchecked((int) 0xcda1f604),
-                unchecked((int) 0xc960ebb3),
-                unchecked((int) 0xbd3e8d7e), unchecked((int) 0xb9ff90c9), unchecked((int) 0xb4bcb610),
-                unchecked((int) 0xb07daba7),
-                unchecked((int) 0xae3afba2), unchecked((int) 0xaafbe615), unchecked((int) 0xa7b8c0cc),
-                unchecked((int) 0xa379dd7b),
-                unchecked((int) 0x9b3660c6), unchecked((int) 0x9ff77d71), unchecked((int) 0x92b45ba8),
-                unchecked((int) 0x9675461f),
-                unchecked((int) 0x8832161a), unchecked((int) 0x8cf30bad), unchecked((int) 0x81b02d74),
-                unchecked((int) 0x857130c3),
-                unchecked((int) 0x5d8a9099), unchecked((int) 0x594b8d2e), unchecked((int) 0x5408abf7),
-                unchecked((int) 0x50c9b640),
-                unchecked((int) 0x4e8ee645), unchecked((int) 0x4a4ffbf2), unchecked((int) 0x470cdd2b),
-                unchecked((int) 0x43cdc09c),
-                unchecked((int) 0x7b827d21), unchecked((int) 0x7f436096), unchecked((int) 0x7200464f),
-                unchecked((int) 0x76c15bf8),
-                unchecked((int) 0x68860bfd), unchecked((int) 0x6c47164a), unchecked((int) 0x61043093),
-                unchecked((int) 0x65c52d24),
-                unchecked((int) 0x119b4be9), unchecked((int) 0x155a565e), unchecked((int) 0x18197087),
-                unchecked((int) 0x1cd86d30),
-                unchecked((int) 0x029f3d35), unchecked((int) 0x065e2082), unchecked((int) 0x0b1d065b),
-                unchecked((int) 0x0fdc1bec),
-                unchecked((int) 0x3793a651), unchecked((int) 0x3352bbe6), unchecked((int) 0x3e119d3f),
-                unchecked((int) 0x3ad08088),
-                unchecked((int) 0x2497d08d), unchecked((int) 0x2056cd3a), unchecked((int) 0x2d15ebe3),
-                unchecked((int) 0x29d4f654),
-                unchecked((int) 0xc5a92679), unchecked((int) 0xc1683bce), unchecked((int) 0xcc2b1d17),
-                unchecked((int) 0xc8ea00a0),
-                unchecked((int) 0xd6ad50a5), unchecked((int) 0xd26c4d12), unchecked((int) 0xdf2f6bcb),
-                unchecked((int) 0xdbee767c),
-                unchecked((int) 0xe3a1cbc1), unchecked((int) 0xe760d676), unchecked((int) 0xea23f0af),
-                unchecked((int) 0xeee2ed18),
-                unchecked((int) 0xf0a5bd1d), unchecked((int) 0xf464a0aa), unchecked((int) 0xf9278673),
-                unchecked((int) 0xfde69bc4),
-                unchecked((int) 0x89b8fd09), unchecked((int) 0x8d79e0be), unchecked((int) 0x803ac667),
-                unchecked((int) 0x84fbdbd0),
-                unchecked((int) 0x9abc8bd5), unchecked((int) 0x9e7d9662), unchecked((int) 0x933eb0bb),
-                unchecked((int) 0x97ffad0c),
-                unchecked((int) 0xafb010b1), unchecked((int) 0xab710d06), unchecked((int) 0xa6322bdf),
-                unchecked((int) 0xa2f33668),
-                unchecked((int) 0xbcb4666d), unchecked((int) 0xb8757bda), unchecked((int) 0xb5365d03),
-                unchecked((int) 0xb1f740b4)
-            };
-
-        public CRC()
-        {
-            InitialiseCRC();
-        }
-
-        internal void InitialiseCRC()
-        {
-            globalCrc = unchecked((int) 0xffffffff);
-        }
-
-        internal int GetFinalCRC()
-        {
-            return ~globalCrc;
-        }
-
-        internal int GetGlobalCRC()
-        {
-            return globalCrc;
-        }
-
-        internal void SetGlobalCRC(int newCrc)
-        {
-            globalCrc = newCrc;
-        }
-
-        internal void UpdateCRC(int inCh)
-        {
-            int temp = (globalCrc >> 24) ^ inCh;
-            if (temp < 0)
-            {
-                temp = 256 + temp;
-            }
-            globalCrc = (globalCrc << 8) ^ CRC.crc32Table[temp];
-        }
-
-        internal int globalCrc;
-    }
-}

SharpCompress/Compressor/Deflate/Tree.cs

@@ -1,464 +0,0 @@
-// Tree.cs
-// ------------------------------------------------------------------
-//
-// Copyright (c) 2009 Dino Chiesa and Microsoft Corporation.  
-// All rights reserved.
-//
-// This code module is part of DotNetZip, a zipfile class library.
-//
-// ------------------------------------------------------------------
-//
-// This code is licensed under the Microsoft Public License. 
-// See the file License.txt for the license details.
-// More info on: http://dotnetzip.codeplex.com
-//
-// ------------------------------------------------------------------
-//
-// last saved (in emacs): 
-// Time-stamp: <2009-October-28 13:29:50>
-//
-// ------------------------------------------------------------------
-//
-// This module defines classes for zlib compression and
-// decompression. This code is derived from the jzlib implementation of
-// zlib. In keeping with the license for jzlib, the copyright to that
-// code is below.
-//
-// ------------------------------------------------------------------
-// 
-// Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright 
-// notice, this list of conditions and the following disclaimer in 
-// the documentation and/or other materials provided with the distribution.
-// 
-// 3. The names of the authors may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-// INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-// -----------------------------------------------------------------------
-//
-// This program is based on zlib-1.1.3; credit to authors
-// Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
-// and contributors of zlib.
-//
-// -----------------------------------------------------------------------
-
-
-using System;
-
-namespace SharpCompress.Compressor.Deflate
-{
-    internal sealed partial class DeflateManager
-    {
-        #region Nested type: Tree
-
-        private sealed class Tree
-        {
-            internal const int Buf_size = 8*2;
-            private static readonly int HEAP_SIZE = (2*InternalConstants.L_CODES + 1);
-
-
-            internal static readonly sbyte[] bl_order = new sbyte[]
-                                                            {
-                                                                16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2,
-                                                                14,
-                                                                1, 15
-                                                            };
-
-
-            // The lengths of the bit length codes are sent in order of decreasing
-            // probability, to avoid transmitting the lengths for unused bit
-            // length codes.
-
-            // see definition of array dist_code below
-            //internal const int DIST_CODE_LEN = 512;
-
-            private static readonly sbyte[] _dist_code = new sbyte[]
-                                                             {
-                                                                 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
-                                                                 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-                                                                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                                                                 10, 10,
-                                                                 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-                                                                 11, 11,
-                                                                 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-                                                                 12, 12,
-                                                                 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-                                                                 12, 12,
-                                                                 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-                                                                 13, 13,
-                                                                 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-                                                                 13, 13,
-                                                                 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-                                                                 14, 14,
-                                                                 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-                                                                 14, 14,
-                                                                 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-                                                                 14, 14,
-                                                                 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-                                                                 14, 14,
-                                                                 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-                                                                 15, 15,
-                                                                 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-                                                                 15, 15,
-                                                                 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-                                                                 15, 15,
-                                                                 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-                                                                 15, 15,
-                                                                 0, 0, 16, 17, 18, 18, 19, 19, 20, 20, 20, 20, 21, 21,
-                                                                 21, 21,
-                                                                 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23,
-                                                                 23, 23,
-                                                                 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-                                                                 24, 24,
-                                                                 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-                                                                 25, 25,
-                                                                 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-                                                                 26, 26,
-                                                                 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-                                                                 26, 26,
-                                                                 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-                                                                 27, 27,
-                                                                 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-                                                                 27, 27,
-                                                                 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-                                                                 28, 28,
-                                                                 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-                                                                 28, 28,
-                                                                 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-                                                                 28, 28,
-                                                                 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-                                                                 28, 28,
-                                                                 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-                                                                 29, 29,
-                                                                 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-                                                                 29, 29,
-                                                                 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-                                                                 29, 29,
-                                                                 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-                                                                 29, 29
-                                                             };
-
-            internal static readonly sbyte[] LengthCode = new sbyte[]
-                                                              {
-                                                                  0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-                                                                  12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15
-                                                                  , 15, 15,
-                                                                  16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17
-                                                                  , 17, 17,
-                                                                  18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19
-                                                                  , 19, 19,
-                                                                  20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20
-                                                                  , 20, 20,
-                                                                  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21
-                                                                  , 21, 21,
-                                                                  22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22
-                                                                  , 22, 22,
-                                                                  23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23
-                                                                  , 23, 23,
-                                                                  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
-                                                                  , 24, 24,
-                                                                  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
-                                                                  , 24, 24,
-                                                                  25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25
-                                                                  , 25, 25,
-                                                                  25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25
-                                                                  , 25, 25,
-                                                                  26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26
-                                                                  , 26, 26,
-                                                                  26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26
-                                                                  , 26, 26,
-                                                                  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27
-                                                                  , 27, 27,
-                                                                  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27
-                                                                  , 27, 28
-                                                              };
-
-
-            internal static readonly int[] LengthBase = new[]
-                                                            {
-                                                                0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28,
-                                                                32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0
-                                                            };
-
-
-            internal static readonly int[] DistanceBase = new[]
-                                                              {
-                                                                  0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128,
-                                                                  192,
-                                                                  256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144
-                                                                  , 8192, 12288, 16384, 24576
-                                                              };
-
-
-            internal short[] dyn_tree; // the dynamic tree
-            internal int max_code; // largest code with non zero frequency
-            internal StaticTree staticTree; // the corresponding static tree
-
-            /// <summary>
-            /// Map from a distance to a distance code.
-            /// </summary>
-            /// <remarks> 
-            /// No side effects. _dist_code[256] and _dist_code[257] are never used.
-            /// </remarks>
-            internal static int DistanceCode(int dist)
-            {
-                return (dist < 256)
-                           ? _dist_code[dist]
-                           : _dist_code[256 + SharedUtils.URShift(dist, 7)];
-            }
-
-            // Compute the optimal bit lengths for a tree and update the total bit length
-            // for the current block.
-            // IN assertion: the fields freq and dad are set, heap[heap_max] and
-            //    above are the tree nodes sorted by increasing frequency.
-            // OUT assertions: the field len is set to the optimal bit length, the
-            //     array bl_count contains the frequencies for each bit length.
-            //     The length opt_len is updated; static_len is also updated if stree is
-            //     not null.
-            internal void gen_bitlen(DeflateManager s)
-            {
-                short[] tree = dyn_tree;
-                short[] stree = staticTree.treeCodes;
-                int[] extra = staticTree.extraBits;
-                int base_Renamed = staticTree.extraBase;
-                int max_length = staticTree.maxLength;
-                int h; // heap index
-                int n, m; // iterate over the tree elements
-                int bits; // bit length
-                int xbits; // extra bits
-                short f; // frequency
-                int overflow = 0; // number of elements with bit length too large
-
-                for (bits = 0; bits <= InternalConstants.MAX_BITS; bits++)
-                    s.bl_count[bits] = 0;
-
-                // In a first pass, compute the optimal bit lengths (which may
-                // overflow in the case of the bit length tree).
-                tree[s.heap[s.heap_max]*2 + 1] = 0; // root of the heap
-
-                for (h = s.heap_max + 1; h < HEAP_SIZE; h++)
-                {
-                    n = s.heap[h];
-                    bits = tree[tree[n*2 + 1]*2 + 1] + 1;
-                    if (bits > max_length)
-                    {
-                        bits = max_length;
-                        overflow++;
-                    }
-                    tree[n*2 + 1] = (short) bits;
-                    // We overwrite tree[n*2+1] which is no longer needed
-
-                    if (n > max_code)
-                        continue; // not a leaf node
-
-                    s.bl_count[bits]++;
-                    xbits = 0;
-                    if (n >= base_Renamed)
-                        xbits = extra[n - base_Renamed];
-                    f = tree[n*2];
-                    s.opt_len += f*(bits + xbits);
-                    if (stree != null)
-                        s.static_len += f*(stree[n*2 + 1] + xbits);
-                }
-                if (overflow == 0)
-                    return;
-
-                // This happens for example on obj2 and pic of the Calgary corpus
-                // Find the first bit length which could increase:
-                do
-                {
-                    bits = max_length - 1;
-                    while (s.bl_count[bits] == 0)
-                        bits--;
-                    s.bl_count[bits]--; // move one leaf down the tree
-                    s.bl_count[bits + 1] = (short) (s.bl_count[bits + 1] + 2); // move one overflow item as its brother
-                    s.bl_count[max_length]--;
-                    // The brother of the overflow item also moves one step up,
-                    // but this does not affect bl_count[max_length]
-                    overflow -= 2;
-                } while (overflow > 0);
-
-                for (bits = max_length; bits != 0; bits--)
-                {
-                    n = s.bl_count[bits];
-                    while (n != 0)
-                    {
-                        m = s.heap[--h];
-                        if (m > max_code)
-                            continue;
-                        if (tree[m*2 + 1] != bits)
-                        {
-                            s.opt_len = (int) (s.opt_len + (bits - (long) tree[m*2 + 1])*tree[m*2]);
-                            tree[m*2 + 1] = (short) bits;
-                        }
-                        n--;
-                    }
-                }
-            }
-
-            // Construct one Huffman tree and assigns the code bit strings and lengths.
-            // Update the total bit length for the current block.
-            // IN assertion: the field freq is set for all tree elements.
-            // OUT assertions: the fields len and code are set to the optimal bit length
-            //     and corresponding code. The length opt_len is updated; static_len is
-            //     also updated if stree is not null. The field max_code is set.
-            internal void build_tree(DeflateManager s)
-            {
-                short[] tree = dyn_tree;
-                short[] stree = staticTree.treeCodes;
-                int elems = staticTree.elems;
-                int n, m; // iterate over heap elements
-                int max_code = -1; // largest code with non zero frequency
-                int node; // new node being created
-
-                // Construct the initial heap, with least frequent element in
-                // heap[1]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-                // heap[0] is not used.
-                s.heap_len = 0;
-                s.heap_max = HEAP_SIZE;
-
-                for (n = 0; n < elems; n++)
-                {
-                    if (tree[n*2] != 0)
-                    {
-                        s.heap[++s.heap_len] = max_code = n;
-                        s.depth[n] = 0;
-                    }
-                    else
-                    {
-                        tree[n*2 + 1] = 0;
-                    }
-                }
-
-                // The pkzip format requires that at least one distance code exists,
-                // and that at least one bit should be sent even if there is only one
-                // possible code. So to avoid special checks later on we force at least
-                // two codes of non zero frequency.
-                while (s.heap_len < 2)
-                {
-                    node = s.heap[++s.heap_len] = (max_code < 2 ? ++max_code : 0);
-                    tree[node*2] = 1;
-                    s.depth[node] = 0;
-                    s.opt_len--;
-                    if (stree != null)
-                        s.static_len -= stree[node*2 + 1];
-                    // node is 0 or 1 so it does not have extra bits
-                }
-                this.max_code = max_code;
-
-                // The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-                // establish sub-heaps of increasing lengths:
-
-                for (n = s.heap_len/2; n >= 1; n--)
-                    s.pqdownheap(tree, n);
-
-                // Construct the Huffman tree by repeatedly combining the least two
-                // frequent nodes.
-
-                node = elems; // next internal node of the tree
-                do
-                {
-                    // n = node of least frequency
-                    n = s.heap[1];
-                    s.heap[1] = s.heap[s.heap_len--];
-                    s.pqdownheap(tree, 1);
-                    m = s.heap[1]; // m = node of next least frequency
-
-                    s.heap[--s.heap_max] = n; // keep the nodes sorted by frequency
-                    s.heap[--s.heap_max] = m;
-
-                    // Create a new node father of n and m
-                    tree[node*2] = unchecked((short) (tree[n*2] + tree[m*2]));
-                    s.depth[node] = (sbyte) (Math.Max((byte) s.depth[n], (byte) s.depth[m]) + 1);
-                    tree[n*2 + 1] = tree[m*2 + 1] = (short) node;
-
-                    // and insert the new node in the heap
-                    s.heap[1] = node++;
-                    s.pqdownheap(tree, 1);
-                } while (s.heap_len >= 2);
-
-                s.heap[--s.heap_max] = s.heap[1];
-
-                // At this point, the fields freq and dad are set. We can now
-                // generate the bit lengths.
-
-                gen_bitlen(s);
-
-                // The field len is now set, we can generate the bit codes
-                gen_codes(tree, max_code, s.bl_count);
-            }
-
-            // Generate the codes for a given tree and bit counts (which need not be
-            // optimal).
-            // IN assertion: the array bl_count contains the bit length statistics for
-            // the given tree and the field len is set for all tree elements.
-            // OUT assertion: the field code is set for all tree elements of non
-            //     zero code length.
-            internal static void gen_codes(short[] tree, int max_code, short[] bl_count)
-            {
-                var next_code = new short[InternalConstants.MAX_BITS + 1]; // next code value for each bit length
-                short code = 0; // running code value
-                int bits; // bit index
-                int n; // code index
-
-                // The distribution counts are first used to generate the code values
-                // without bit reversal.
-                for (bits = 1; bits <= InternalConstants.MAX_BITS; bits++)
-                    unchecked
-                    {
-                        next_code[bits] = code = (short) ((code + bl_count[bits - 1]) << 1);
-                    }
-
-                // Check that the bit counts in bl_count are consistent. The last code
-                // must be all ones.
-                //Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-                //        "inconsistent bit counts");
-                //Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-                for (n = 0; n <= max_code; n++)
-                {
-                    int len = tree[n*2 + 1];
-                    if (len == 0)
-                        continue;
-                    // Now reverse the bits
-                    tree[n*2] = unchecked((short) (bi_reverse(next_code[len]++, len)));
-                }
-            }
-
-            // Reverse the first len bits of a code, using straightforward code (a faster
-            // method would use a table)
-            // IN assertion: 1 <= len <= 15
-            internal static int bi_reverse(int code, int len)
-            {
-                int res = 0;
-                do
-                {
-                    res |= code & 1;
-                    code >>= 1; //SharedUtils.URShift(code, 1);
-                    res <<= 1;
-                } while (--len > 0);
-                return res >> 1;
-            }
-        }
-
-        #endregion
-    }
-}

SharpCompress/Compressor/Deflate/Zlib.cs

@@ -1,495 +0,0 @@
-// Zlib.cs
-// ------------------------------------------------------------------
-//
-// Copyright (c) 2009 Dino Chiesa and Microsoft Corporation.  
-// All rights reserved.
-//
-// This code module is part of DotNetZip, a zipfile class library.
-//
-// ------------------------------------------------------------------
-//
-// This code is licensed under the Microsoft Public License. 
-// See the file License.txt for the license details.
-// More info on: http://dotnetzip.codeplex.com
-//
-// ------------------------------------------------------------------
-//
-// last saved (in emacs): 
-// Time-stamp: <2009-November-07 05:26:55>
-//
-// ------------------------------------------------------------------
-//
-// This module defines classes for ZLIB compression and
-// decompression. This code is derived from the jzlib implementation of
-// zlib, but significantly modified.  The object model is not the same,
-// and many of the behaviors are new or different.  Nonetheless, in
-// keeping with the license for jzlib, the copyright to that code is
-// included below.
-//
-// ------------------------------------------------------------------
-// 
-// Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright 
-// notice, this list of conditions and the following disclaimer in 
-// the documentation and/or other materials provided with the distribution.
-// 
-// 3. The names of the authors may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-// INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-// -----------------------------------------------------------------------
-//
-// This program is based on zlib-1.1.3; credit to authors
-// Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
-// and contributors of zlib.
-//
-// -----------------------------------------------------------------------
-
-
-namespace SharpCompress.Compressor.Deflate
-{
-    /// <summary>
-    /// The compression level to be used when using a DeflateStream or ZlibStream with CompressionMode.Compress.
-    /// </summary>
-    public enum CompressionLevel
-    {
-        /// <summary>
-        /// None means that the data will be simply stored, with no change at all.
-        /// If you are producing ZIPs for use on Mac OSX, be aware that archives produced with CompressionLevel.None
-        /// cannot be opened with the default zip reader. Use a different CompressionLevel.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Same as None.
-        /// </summary>
-        Level0 = 0,
-
-        /// <summary>
-        /// The fastest but least effective compression.
-        /// </summary>
-        BestSpeed = 1,
-
-        /// <summary>
-        /// A synonym for BestSpeed.
-        /// </summary>
-        Level1 = 1,
-
-        /// <summary>
-        /// A little slower, but better, than level 1.
-        /// </summary>
-        Level2 = 2,
-
-        /// <summary>
-        /// A little slower, but better, than level 2.
-        /// </summary>
-        Level3 = 3,
-
-        /// <summary>
-        /// A little slower, but better, than level 3.
-        /// </summary>
-        Level4 = 4,
-
-        /// <summary>
-        /// A little slower than level 4, but with better compression.
-        /// </summary>
-        Level5 = 5,
-
-        /// <summary>
-        /// The default compression level, with a good balance of speed and compression efficiency.   
-        /// </summary>
-        Default = 6,
-
-        /// <summary>
-        /// A synonym for Default.
-        /// </summary>
-        Level6 = 6,
-
-        /// <summary>
-        /// Pretty good compression!
-        /// </summary>
-        Level7 = 7,
-
-        /// <summary>
-        ///  Better compression than Level7!
-        /// </summary>
-        Level8 = 8,
-
-        /// <summary>
-        /// The "best" compression, where best means greatest reduction in size of the input data stream. 
-        /// This is also the slowest compression.
-        /// </summary>
-        BestCompression = 9,
-
-        /// <summary>
-        /// A synonym for BestCompression.
-        /// </summary>
-        Level9 = 9,
-    }
-
-    /// <summary>
-    /// Describes options for how the compression algorithm is executed.  Different strategies
-    /// work better on different sorts of data.  The strategy parameter can affect the compression
-    /// ratio and the speed of compression but not the correctness of the compresssion.
-    /// </summary>
-    public enum CompressionStrategy
-    {
-        /// <summary>
-        /// The default strategy is probably the best for normal data. 
-        /// </summary>
-        Default = 0,
-
-        /// <summary>
-        /// The <c>Filtered</c> strategy is intended to be used most effectively with data produced by a
-        /// filter or predictor.  By this definition, filtered data consists mostly of small
-        /// values with a somewhat random distribution.  In this case, the compression algorithm
-        /// is tuned to compress them better.  The effect of <c>Filtered</c> is to force more Huffman
-        /// coding and less string matching; it is a half-step between <c>Default</c> and <c>HuffmanOnly</c>.
-        /// </summary>
-        Filtered = 1,
-
-        /// <summary>
-        /// Using <c>HuffmanOnly</c> will force the compressor to do Huffman encoding only, with no
-        /// string matching.
-        /// </summary>
-        HuffmanOnly = 2,
-    }
-
-
-    /// <summary>
-    /// A general purpose exception class for exceptions in the Zlib library.
-    /// </summary>
-    public class ZlibException : System.Exception
-    {
-        /// <summary>
-        /// The ZlibException class captures exception information generated
-        /// by the Zlib library. 
-        /// </summary>
-        public ZlibException()
-            : base()
-        {
-        }
-
-        /// <summary>
-        /// This ctor collects a message attached to the exception.
-        /// </summary>
-        /// <param name="s"></param>
-        public ZlibException(System.String s)
-            : base(s)
-        {
-        }
-    }
-
-
-    internal class SharedUtils
-    {
-        /// <summary>
-        /// Performs an unsigned bitwise right shift with the specified number
-        /// </summary>
-        /// <param name="number">Number to operate on</param>
-        /// <param name="bits">Ammount of bits to shift</param>
-        /// <returns>The resulting number from the shift operation</returns>
-        public static int URShift(int number, int bits)
-        {
-            return (int) ((uint) number >> bits);
-        }
-
-#if NOT
-    /// <summary>
-    /// Performs an unsigned bitwise right shift with the specified number
-    /// </summary>
-    /// <param name="number">Number to operate on</param>
-    /// <param name="bits">Ammount of bits to shift</param>
-    /// <returns>The resulting number from the shift operation</returns>
-        public static long URShift(long number, int bits)
-        {
-            return (long) ((UInt64)number >> bits);
-        }
-#endif
-
-        /// <summary>
-        ///   Reads a number of characters from the current source TextReader and writes
-        ///   the data to the target array at the specified index.
-        /// </summary>
-        ///
-        /// <param name="sourceTextReader">The source TextReader to read from</param>
-        /// <param name="target">Contains the array of characteres read from the source TextReader.</param>
-        /// <param name="start">The starting index of the target array.</param>
-        /// <param name="count">The maximum number of characters to read from the source TextReader.</param>
-        /// 
-        /// <returns>
-        ///   The number of characters read. The number will be less than or equal to
-        ///   count depending on the data available in the source TextReader. Returns -1
-        ///   if the end of the stream is reached.
-        /// </returns>
-        public static System.Int32 ReadInput(System.IO.TextReader sourceTextReader, byte[] target, int start, int count)
-        {
-            // Returns 0 bytes if not enough space in target
-            if (target.Length == 0) return 0;
-
-            char[] charArray = new char[target.Length];
-            int bytesRead = sourceTextReader.Read(charArray, start, count);
-
-            // Returns -1 if EOF
-            if (bytesRead == 0) return -1;
-
-            for (int index = start; index < start + bytesRead; index++)
-                target[index] = (byte) charArray[index];
-
-            return bytesRead;
-        }
-
-
-        internal static byte[] ToByteArray(System.String sourceString)
-        {
-            return System.Text.UTF8Encoding.UTF8.GetBytes(sourceString);
-        }
-
-
-        internal static char[] ToCharArray(byte[] byteArray)
-        {
-            return System.Text.UTF8Encoding.UTF8.GetChars(byteArray);
-        }
-    }
-
-    internal static class InternalConstants
-    {
-        internal static readonly int MAX_BITS = 15;
-        internal static readonly int BL_CODES = 19;
-        internal static readonly int D_CODES = 30;
-        internal static readonly int LITERALS = 256;
-        internal static readonly int LENGTH_CODES = 29;
-        internal static readonly int L_CODES = (LITERALS + 1 + LENGTH_CODES);
-
-        // Bit length codes must not exceed MAX_BL_BITS bits
-        internal static readonly int MAX_BL_BITS = 7;
-
-        // repeat previous bit length 3-6 times (2 bits of repeat count)
-        internal static readonly int REP_3_6 = 16;
-
-        // repeat a zero length 3-10 times  (3 bits of repeat count)
-        internal static readonly int REPZ_3_10 = 17;
-
-        // repeat a zero length 11-138 times  (7 bits of repeat count)
-        internal static readonly int REPZ_11_138 = 18;
-    }
-
-    internal sealed class StaticTree
-    {
-        internal static readonly short[] lengthAndLiteralsTreeCodes = new short[]
-                                                                          {
-                                                                              12, 8, 140, 8, 76, 8, 204, 8, 44, 8, 172,
-                                                                              8, 108, 8, 236, 8,
-                                                                              28, 8, 156, 8, 92, 8, 220, 8, 60, 8, 188,
-                                                                              8, 124, 8, 252, 8,
-                                                                              2, 8, 130, 8, 66, 8, 194, 8, 34, 8, 162, 8
-                                                                              , 98, 8, 226, 8,
-                                                                              18, 8, 146, 8, 82, 8, 210, 8, 50, 8, 178,
-                                                                              8, 114, 8, 242, 8,
-                                                                              10, 8, 138, 8, 74, 8, 202, 8, 42, 8, 170,
-                                                                              8, 106, 8, 234, 8,
-                                                                              26, 8, 154, 8, 90, 8, 218, 8, 58, 8, 186,
-                                                                              8, 122, 8, 250, 8,
-                                                                              6, 8, 134, 8, 70, 8, 198, 8, 38, 8, 166, 8
-                                                                              , 102, 8, 230, 8,
-                                                                              22, 8, 150, 8, 86, 8, 214, 8, 54, 8, 182,
-                                                                              8, 118, 8, 246, 8,
-                                                                              14, 8, 142, 8, 78, 8, 206, 8, 46, 8, 174,
-                                                                              8, 110, 8, 238, 8,
-                                                                              30, 8, 158, 8, 94, 8, 222, 8, 62, 8, 190,
-                                                                              8, 126, 8, 254, 8,
-                                                                              1, 8, 129, 8, 65, 8, 193, 8, 33, 8, 161, 8
-                                                                              , 97, 8, 225, 8,
-                                                                              17, 8, 145, 8, 81, 8, 209, 8, 49, 8, 177,
-                                                                              8, 113, 8, 241, 8,
-                                                                              9, 8, 137, 8, 73, 8, 201, 8, 41, 8, 169, 8
-                                                                              , 105, 8, 233, 8,
-                                                                              25, 8, 153, 8, 89, 8, 217, 8, 57, 8, 185,
-                                                                              8, 121, 8, 249, 8,
-                                                                              5, 8, 133, 8, 69, 8, 197, 8, 37, 8, 165, 8
-                                                                              , 101, 8, 229, 8,
-                                                                              21, 8, 149, 8, 85, 8, 213, 8, 53, 8, 181,
-                                                                              8, 117, 8, 245, 8,
-                                                                              13, 8, 141, 8, 77, 8, 205, 8, 45, 8, 173,
-                                                                              8, 109, 8, 237, 8,
-                                                                              29, 8, 157, 8, 93, 8, 221, 8, 61, 8, 189,
-                                                                              8, 125, 8, 253, 8,
-                                                                              19, 9, 275, 9, 147, 9, 403, 9, 83, 9, 339,
-                                                                              9, 211, 9, 467, 9,
-                                                                              51, 9, 307, 9, 179, 9, 435, 9, 115, 9, 371
-                                                                              , 9, 243, 9, 499, 9,
-                                                                              11, 9, 267, 9, 139, 9, 395, 9, 75, 9, 331,
-                                                                              9, 203, 9, 459, 9,
-                                                                              43, 9, 299, 9, 171, 9, 427, 9, 107, 9, 363
-                                                                              , 9, 235, 9, 491, 9,
-                                                                              27, 9, 283, 9, 155, 9, 411, 9, 91, 9, 347,
-                                                                              9, 219, 9, 475, 9,
-                                                                              59, 9, 315, 9, 187, 9, 443, 9, 123, 9, 379
-                                                                              , 9, 251, 9, 507, 9,
-                                                                              7, 9, 263, 9, 135, 9, 391, 9, 71, 9, 327,
-                                                                              9, 199, 9, 455, 9,
-                                                                              39, 9, 295, 9, 167, 9, 423, 9, 103, 9, 359
-                                                                              , 9, 231, 9, 487, 9,
-                                                                              23, 9, 279, 9, 151, 9, 407, 9, 87, 9, 343,
-                                                                              9, 215, 9, 471, 9,
-                                                                              55, 9, 311, 9, 183, 9, 439, 9, 119, 9, 375
-                                                                              , 9, 247, 9, 503, 9,
-                                                                              15, 9, 271, 9, 143, 9, 399, 9, 79, 9, 335,
-                                                                              9, 207, 9, 463, 9,
-                                                                              47, 9, 303, 9, 175, 9, 431, 9, 111, 9, 367
-                                                                              , 9, 239, 9, 495, 9,
-                                                                              31, 9, 287, 9, 159, 9, 415, 9, 95, 9, 351,
-                                                                              9, 223, 9, 479, 9,
-                                                                              63, 9, 319, 9, 191, 9, 447, 9, 127, 9, 383
-                                                                              , 9, 255, 9, 511, 9,
-                                                                              0, 7, 64, 7, 32, 7, 96, 7, 16, 7, 80, 7,
-                                                                              48, 7, 112, 7,
-                                                                              8, 7, 72, 7, 40, 7, 104, 7, 24, 7, 88, 7,
-                                                                              56, 7, 120, 7,
-                                                                              4, 7, 68, 7, 36, 7, 100, 7, 20, 7, 84, 7,
-                                                                              52, 7, 116, 7,
-                                                                              3, 8, 131, 8, 67, 8, 195, 8, 35, 8, 163, 8
-                                                                              , 99, 8, 227, 8
-                                                                          };
-
-        internal static readonly short[] distTreeCodes = new short[]
-                                                             {
-                                                                 0, 5, 16, 5, 8, 5, 24, 5, 4, 5, 20, 5, 12, 5, 28, 5,
-                                                                 2, 5, 18, 5, 10, 5, 26, 5, 6, 5, 22, 5, 14, 5, 30, 5,
-                                                                 1, 5, 17, 5, 9, 5, 25, 5, 5, 5, 21, 5, 13, 5, 29, 5,
-                                                                 3, 5, 19, 5, 11, 5, 27, 5, 7, 5, 23, 5
-                                                             };
-
-        // extra bits for each bit length code
-        internal static readonly int[] extra_blbits = new int[]
-                                                          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7};
-
-
-        internal static readonly StaticTree Literals;
-        internal static readonly StaticTree Distances;
-        internal static readonly StaticTree BitLengths;
-
-        internal short[] treeCodes; // static tree or null
-        internal int[] extraBits; // extra bits for each code or null
-        internal int extraBase; // base index for extra_bits
-        internal int elems; // max number of elements in the tree
-        internal int maxLength; // max bit length for the codes
-
-        private StaticTree(short[] treeCodes, int[] extraBits, int extraBase, int elems, int maxLength)
-        {
-            this.treeCodes = treeCodes;
-            this.extraBits = extraBits;
-            this.extraBase = extraBase;
-            this.elems = elems;
-            this.maxLength = maxLength;
-        }
-
-        static StaticTree()
-        {
-            Literals = new StaticTree(lengthAndLiteralsTreeCodes, DeflateManager.ExtraLengthBits,
-                                      InternalConstants.LITERALS + 1, InternalConstants.L_CODES,
-                                      InternalConstants.MAX_BITS);
-            Distances = new StaticTree(distTreeCodes, DeflateManager.ExtraDistanceBits, 0, InternalConstants.D_CODES,
-                                       InternalConstants.MAX_BITS);
-            BitLengths = new StaticTree(null, extra_blbits, 0, InternalConstants.BL_CODES, InternalConstants.MAX_BL_BITS);
-        }
-    }
-
-
-    /// <summary>
-    /// Computes an Adler-32 checksum. 
-    /// </summary>
-    /// <remarks>
-    /// The Adler checksum is similar to a CRC checksum, but faster to compute, though less
-    /// reliable.  It is used in producing RFC1950 compressed streams.  The Adler checksum
-    /// is a required part of the "ZLIB" standard.  Applications will almost never need to
-    /// use this class directly.
-    /// </remarks>
-    internal sealed class Adler
-    {
-        // largest prime smaller than 65536
-        private static readonly int BASE = 65521;
-        // NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
-        private static readonly int NMAX = 5552;
-
-        internal static uint Adler32(uint adler, byte[] buf, int index, int len)
-        {
-            if (buf == null)
-                return 1;
-
-            int s1 = (int) (adler & 0xffff);
-            int s2 = (int) ((adler >> 16) & 0xffff);
-
-            while (len > 0)
-            {
-                int k = len < NMAX ? len : NMAX;
-                len -= k;
-                while (k >= 16)
-                {
-                    //s1 += (buf[index++] & 0xff); s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    s1 += buf[index++];
-                    s2 += s1;
-                    k -= 16;
-                }
-                if (k != 0)
-                {
-                    do
-                    {
-                        s1 += buf[index++];
-                        s2 += s1;
-                    } while (--k != 0);
-                }
-                s1 %= BASE;
-                s2 %= BASE;
-            }
-            return (uint) ((s2 << 16) | s1);
-        }
-    }
-}

SharpCompress/Compressor/Filters/BCJ2Filter.cs

@@ -1,219 +0,0 @@
-using System;
-using System.IO;
-
-namespace SharpCompress.Compressor.Filters
-{
-    internal class BCJ2Filter : Stream
-    {
-        private readonly Stream baseStream;
-        private readonly byte[] input = new byte[4096];
-        private int inputOffset = 0;
-        private int inputCount = 0;
-        private bool endReached = false;
-
-        private long position = 0;
-        private byte[] output = new byte[4];
-        private int outputOffset = 0;
-        private int outputCount = 0;
-
-        private byte[] control;
-        private byte[] data1;
-        private byte[] data2;
-
-        private int controlPos = 0;
-        private int data1Pos = 0;
-        private int data2Pos = 0;
-
-        private ushort[] p = new ushort[256 + 2];
-        private uint range, code;
-        private byte prevByte = 0;
-        private bool isDisposed;
-
-        private const int kNumTopBits = 24;
-        private const int kTopValue = 1 << kNumTopBits;
-
-        private const int kNumBitModelTotalBits = 11;
-        private const int kBitModelTotal = 1 << kNumBitModelTotalBits;
-        private const int kNumMoveBits = 5;
-
-        private static bool IsJ(byte b0, byte b1)
-        {
-            return (b1 & 0xFE) == 0xE8 || IsJcc(b0, b1);
-        }
-
-        private static bool IsJcc(byte b0, byte b1)
-        {
-            return b0 == 0x0F && (b1 & 0xF0) == 0x80;
-        }
-
-        public BCJ2Filter(byte[] control, byte[] data1, byte[] data2, Stream baseStream)
-        {
-            this.control = control;
-            this.data1 = data1;
-            this.data2 = data2;
-            this.baseStream = baseStream;
-
-            int i;
-            for (i = 0; i < p.Length; i++)
-                p[i] = kBitModelTotal >> 1;
-
-            code = 0;
-            range = 0xFFFFFFFF;
-            for (i = 0; i < 5; i++)
-                code = (code << 8) | control[controlPos++];
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            base.Dispose(disposing);
-            baseStream.Dispose();
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override void Flush()
-        {
-            throw new NotSupportedException();
-        }
-
-        public override long Length
-        {
-            get { return baseStream.Length + data1.Length + data2.Length; }
-        }
-
-        public override long Position
-        {
-            get { return position; }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int size = 0;
-            byte b = 0;
-
-            while (!endReached && size < count)
-            {
-                while (outputOffset < outputCount)
-                {
-                    b = output[outputOffset++];
-                    buffer[offset++] = b;
-                    size++;
-                    position++;
-
-                    prevByte = b;
-                    if (size == count)
-                        return size;
-                }
-
-                if (inputOffset == inputCount)
-                {
-                    inputOffset = 0;
-                    inputCount = baseStream.Read(input, 0, input.Length);
-                    if (inputCount == 0)
-                    {
-                        endReached = true;
-                        break;
-                    }
-                }
-
-                b = input[inputOffset++];
-                buffer[offset++] = b;
-                size++;
-                position++;
-
-                if (!IsJ(prevByte, b))
-                    prevByte = b;
-                else
-                {
-                    int prob;
-                    if (b == 0xE8)
-                        prob = prevByte;
-                    else if (b == 0xE9)
-                        prob = 256;
-                    else
-                        prob = 257;
-
-                    uint bound = (range >> kNumBitModelTotalBits) * p[prob];
-                    if (code < bound)
-                    {
-                        range = bound;
-                        p[prob] += (ushort)((kBitModelTotal - p[prob]) >> kNumMoveBits);
-                        if (range < kTopValue)
-                        {
-                            range <<= 8;
-                            code = (code << 8) | control[controlPos++];
-                        }
-                        prevByte = b;
-                    }
-                    else
-                    {
-                        range -= bound;
-                        code -= bound;
-                        p[prob] -= (ushort)(p[prob] >> kNumMoveBits);
-                        if (range < kTopValue)
-                        {
-                            range <<= 8;
-                            code = (code << 8) | control[controlPos++];
-                        }
-
-                        uint dest;
-                        if (b == 0xE8)
-                            dest =
-                                (uint)
-                                ((data1[data1Pos++] << 24) | (data1[data1Pos++] << 16) | (data1[data1Pos++] << 8) |
-                                 data1[data1Pos++]);
-                        else
-                            dest =
-                                (uint)
-                                ((data2[data2Pos++] << 24) | (data2[data2Pos++] << 16) | (data2[data2Pos++] << 8) |
-                                 data2[data2Pos++]);
-                        dest -= (uint)(position + 4);
-
-                        output[0] = (byte)dest;
-                        output[1] = (byte)(dest >> 8);
-                        output[2] = (byte)(dest >> 16);
-                        output[3] = (byte)(dest >> 24);
-                        outputOffset = 0;
-                        outputCount = 4;
-                    }
-                }
-            }
-
-            return size;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}