Removing .NET 2.0 support and LinqBridge dies a firey death

Merge pull request #69 from pnewman8/master
Skip entry stream on dispose
2026-02-04 05:25:00 +00:00 · 2015-07-27 09:48:36 +01:00 · 2015-07-20 16:27:55 +01:00 · 2015-07-15 18:13:46 +01:00 · 2015-07-15 13:44:20 +01:00 · 2015-06-12 12:06:21 +01:00
10 changed files with 42 additions and 422 deletions
--- a/NuGet/sharpcompress.nuspec
+++ b/NuGet/sharpcompress.nuspec
@@ -2,11 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>sharpcompress</id>
-        <version>0.11.0</version>
+        <version>0.11.1</version>
        <title>SharpCompress - Pure C# Decompression/Compression</title>
        <authors>Adam Hathcock</authors>
        <owners>Adam Hathcock</owners>
-        <licenseUrl>http://sharpcompress.codeplex.com/license</licenseUrl>
+        <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>
@@ -14,16 +14,11 @@
        <language>en-US</language>
        <tags>rar unrar zip unzip bzip2 gzip tar 7zip</tags>
        <dependencies>
-            <group />
-            <group targetFramework="net20">
-                <dependency id="LinqBridge" version="1.3.0" />
-            </group>
        </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" />
-        <file src="..\bin\NET2\SharpCompress.dll" target="lib\net20\SharpCompress.dll" />
    </files>
 </package>
--- a/SharpCompress.sln
+++ b/SharpCompress.sln
@@ -22,8 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.PortableTest"
 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.NET2", "SharpCompress\SharpCompress.NET2.csproj", "{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Unsigned", "SharpCompress\SharpCompress.Unsigned.csproj", "{27D535CB-2FD3-4621-8C9A-46161FC77A5D}"
 EndProject
 Global
@@ -56,10 +54,6 @@ Global
 		{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
-		{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}.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
--- a/SharpCompress/Archive/SevenZip/SevenZipArchive.cs
+++ b/SharpCompress/Archive/SevenZip/SevenZipArchive.cs
@@ -236,7 +236,7 @@ namespace SharpCompress.Archive.SevenZip

            protected override EntryStream GetEntryStream()
            {
-                return new EntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
+                return CreateEntryStream(new ReadOnlySubStream(currentStream, currentItem.Size));
            }
        }
    }
--- a/SharpCompress/Common/EntryStream.cs
+++ b/SharpCompress/Common/EntryStream.cs
@@ -1,16 +1,19 @@
 using System;
 using System.IO;
+using SharpCompress.Reader;

 namespace SharpCompress.Common
 {
    public class EntryStream : Stream
    {
+        public IReader Reader { get; private set; }
        private Stream stream;
        private bool completed;
        private bool isDisposed;

-        internal EntryStream(Stream stream)
+        internal EntryStream(IReader reader, Stream stream)
        {
+            this.Reader = reader;
            this.stream = stream;
        }

@@ -28,10 +31,9 @@ namespace SharpCompress.Common

        protected override void Dispose(bool disposing)
        {
-            if (!completed)
+            if (!(completed || Reader.Cancelled))
            {
-                throw new InvalidOperationException(
-                    "EntryStream has not been fully consumed.  Read the entire stream or use SkipEntry.");
+                SkipEntry();
            }
            if (isDisposed)
            {
--- a/SharpCompress/Reader/AbstractReader.cs
+++ b/SharpCompress/Reader/AbstractReader.cs
@@ -67,12 +67,32 @@ namespace SharpCompress.Reader

        #endregion

+
+        public bool Cancelled { get; private set; }
+
+        /// <summary>
+        /// Indicates that the remaining entries are not required.
+        /// On dispose of an EntryStream, the stream will not skip to the end of the entry.
+        /// An attempt to move to the next entry will throw an exception, as the compressed stream is not positioned at an entry boundary.
+        /// </summary>
+        public void Cancel()
+        {
+          if (!completed)
+          {
+            Cancelled = true;
+          }
+        }
+
        public bool MoveToNextEntry()
        {
            if (completed)
            {
                return false;
            }
+            if (Cancelled)
+            {
+                throw new InvalidOperationException("Reader has been cancelled.");
+            }
            if (entriesForCurrentReadStream == null)
            {
                return LoadStreamForReading(RequestInitialStream());
@@ -197,9 +217,17 @@ namespace SharpCompress.Reader
            return stream;
        }

+        /// <summary>
+        /// Retains a reference to the entry stream, so we can check whether it completed later.
+        /// </summary>
+        protected EntryStream CreateEntryStream(Stream decompressed)
+        {
+          return new EntryStream(this, decompressed);
+        }
+
        protected virtual EntryStream GetEntryStream()
        {
-            return new EntryStream(Entry.Parts.First().GetCompressedStream());
+          return CreateEntryStream(Entry.Parts.First().GetCompressedStream());
        }

        #endregion
--- a/SharpCompress/Reader/IReader.cs
+++ b/SharpCompress/Reader/IReader.cs
@@ -22,6 +22,9 @@ namespace SharpCompress.Reader
        /// <param name="writableStream"></param>
        void WriteEntryTo(Stream writableStream);

+        bool Cancelled { get; }
+        void Cancel();
+
        /// <summary>
        /// Moves to the next entry by reading more data from the underlying stream.  This skips if data has not been read.
        /// </summary>
--- a/SharpCompress/Reader/Rar/RarReader.cs
+++ b/SharpCompress/Reader/Rar/RarReader.cs
@@ -73,7 +73,7 @@ namespace SharpCompress.Reader.Rar

        protected override EntryStream GetEntryStream()
        {
-            return new EntryStream(new RarStream(pack, Entry.FileHeader,
+            return CreateEntryStream(new RarStream(pack, Entry.FileHeader,
                                                 new MultiVolumeReadOnlyStream(
                                                     CreateFilePartEnumerableForCurrentEntry().Cast<RarFilePart>(), this)));
        }
--- a/SharpCompress/SharpCompress.NET2.csproj
+++ b/SharpCompress/SharpCompress.NET2.csproj
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9A6F69DC-258D-4EB4-859E-09EFC7A14A3F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <BaseIntermediateOutputPath>obj\LinqBridge\</BaseIntermediateOutputPath>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\NET2\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE;NET2</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\NET2\</OutputPath>
-    <DefineConstants>TRACE;NET2</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="LinqBridge">
-      <HintPath>..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\IWritableArchive.cs" />
-    <Compile Include="Archive\IWritableArchive.Extensions.cs" />
-    <Compile Include="Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarFilePart.cs" />
-    <Compile Include="Common\ArchiveEncoding.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.cs" />
-    <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\ArchiveFactory.cs" />
-    <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\IArchive.Extensions.cs" />
-    <Compile Include="Archive\GZip\GZipArchive.cs" />
-    <Compile Include="Archive\GZip\GZipArchiveEntry.cs" />
-    <Compile Include="Archive\IArchiveEntry.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntryFactory.cs" />
-    <Compile Include="Archive\IArchive.cs" />
-    <Compile Include="Archive\Rar\StreamRarArchiveVolume.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarArchive.cs" />
-    <Compile Include="Archive\Tar\TarArchiveEntry.cs" />
-    <Compile Include="Archive\Tar\TarWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="Archive\Zip\ZipArchive.cs" />
-    <Compile Include="Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="Common\ArchiveException.cs" />
-    <Compile Include="Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="Common\CompressionInfo.cs" />
-    <Compile Include="Common\CompressionType.cs" />
-    <Compile Include="Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="Common\IncompleteArchiveException.cs" />
-    <Compile Include="Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="Common\PasswordProtectedException.cs" />
-    <Compile Include="Common\CryptographicException.cs" />
-    <Compile Include="Common\FlagUtility.cs" />
-    <Compile Include="Common\GZip\GZipEntry.cs" />
-    <Compile Include="Common\GZip\GZipFilePart.cs" />
-    <Compile Include="Common\GZip\GZipVolume.cs" />
-    <Compile Include="Common\ExtractOptions.cs" />
-    <Compile Include="Common\FilePart.cs" />
-    <Compile Include="Common\Entry.cs" />
-    <Compile Include="Common\IEntry.cs" />
-    <Compile Include="Common\IVolume.cs" />
-    <Compile Include="Common\Rar\RarCryptoWrapper.cs" />
-    <Compile Include="Common\Rar\RarRijndael.cs" />
-    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
-    <Compile Include="Common\SevenZip\CBindPair.cs" />
-    <Compile Include="Common\SevenZip\CCoderInfo.cs" />
-    <Compile Include="Common\SevenZip\CFileItem.cs" />
-    <Compile Include="Common\SevenZip\CFolder.cs" />
-    <Compile Include="Common\SevenZip\CStreamSwitch.cs" />
-    <Compile Include="Common\SevenZip\DataReader.cs" />
-    <Compile Include="Common\SevenZip\SevenZipEntry.cs" />
-    <Compile Include="Common\SevenZip\SevenZipFilePart.cs" />
-    <Compile Include="Common\SevenZip\SevenZipVolume.cs" />
-    <Compile Include="Common\Tar\Headers\TarHeader.cs" />
-    <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
-    <Compile Include="Common\Tar\TarVolume.cs" />
-    <Compile Include="Common\Tar\TarEntry.cs" />
-    <Compile Include="Common\Tar\TarFilePart.cs" />
-    <Compile Include="Common\Tar\TarHeaderFactory.cs" />
-    <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
-    <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="Common\Zip\WinzipAesCryptoStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Common\Zip\WinzipAesEncryptionData.cs" />
-    <Compile Include="Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="Common\Zip\ZipVolume.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Constants.cs" />
-    <Compile Include="Compressor\BZip2\BZip2Stream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2InputStream.cs" />
-    <Compile Include="Compressor\BZip2\CBZip2OutputStream.cs" />
-    <Compile Include="Compressor\BZip2\CRC.cs" />
-    <Compile Include="Compressor\CompressionMode.cs" />
-    <Compile Include="Compressor\Deflate\FlushType.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="Compressor\Deflate\GZipStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\Filters\BCJ2Filter.cs" />
-    <Compile Include="Compressor\Filters\BCJFilter.cs" />
-    <Compile Include="Compressor\Filters\Filter.cs" />
-    <Compile Include="Compressor\LZMA\BitVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
-    <Compile Include="Common\SevenZip\ArchiveReader.cs" />
-    <Compile Include="Common\SevenZip\CMethodId.cs" />
-    <Compile Include="Compressor\LZMA\AesDecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\DecoderStream.cs" />
-    <Compile Include="Compressor\LZMA\Registry.cs" />
-    <Compile Include="Compressor\LZMA\ICoder.cs" />
-    <Compile Include="Compressor\LZMA\Log.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\LzmaBase.cs" />
-    <Compile Include="Compressor\LZMA\LzmaDecoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoder.cs" />
-    <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
-    <Compile Include="Compressor\LZMA\LzmaStream.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
-    <Compile Include="Compressor\LZMA\LZ\LzOutWindow.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoder.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="Compressor\LZMA\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
-    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
-    <Compile Include="Compressor\PPMd\H\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\H\PPMContext.cs" />
-    <Compile Include="Compressor\PPMd\H\RangeCoder.cs" />
-    <Compile Include="Compressor\PPMd\H\RarMemBlock.cs" />
-    <Compile Include="Compressor\PPMd\H\RarNode.cs" />
-    <Compile Include="Compressor\PPMd\H\SEE2Context.cs" />
-    <Compile Include="Compressor\PPMd\H\State.cs" />
-    <Compile Include="Compressor\PPMd\H\StateRef.cs" />
-    <Compile Include="Compressor\PPMd\H\SubAllocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Allocator.cs" />
-    <Compile Include="Compressor\PPMd\I1\Coder.cs" />
-    <Compile Include="Compressor\PPMd\I1\MemoryNode.cs" />
-    <Compile Include="Compressor\PPMd\I1\Model.cs" />
-    <Compile Include="Compressor\PPMd\I1\ModelRestorationMethod.cs" />
-    <Compile Include="Compressor\PPMd\I1\Pointer.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmContext.cs" />
-    <Compile Include="Compressor\PPMd\I1\PpmState.cs" />
-    <Compile Include="Compressor\PPMd\I1\See2Context.cs" />
-    <Compile Include="Compressor\PPMd\PpmdProperties.cs" />
-    <Compile Include="Compressor\PPMd\PpmdStream.cs" />
-    <Compile Include="Compressor\Rar\RarStream.cs" />
-    <Compile Include="EnumExtensions.cs" />
-    <Compile Include="IO\CountingWritableSubStream.cs" />
-    <Compile Include="Common\EntryStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IO\ListeningStream.cs" />
-    <Compile Include="IO\NonDisposingStream.cs" />
-    <Compile Include="Common\Rar\RarCryptoBinaryReader.cs" />
-    <Compile Include="IO\RewindableStream.cs" />
-    <Compile Include="Reader\GZip\GZipReader.cs" />
-    <Compile Include="Reader\IReaderExtractionListener.cs" />
-    <Compile Include="Reader\ReaderFactory.cs" />
-    <Compile Include="Reader\AbstractReader.cs" />
-    <Compile Include="Common\Volume.cs" />
-    <Compile Include="Compressor\Deflate\CRC32.cs" />
-    <Compile Include="Compressor\Deflate\DeflateManager.cs" />
-    <Compile Include="Compressor\Deflate\DeflateStream.cs" />
-    <Compile Include="Compressor\Deflate\Inflate.cs" />
-    <Compile Include="Compressor\Deflate\InfTree.cs" />
-    <Compile Include="Compressor\Deflate\Tree.cs" />
-    <Compile Include="Compressor\Deflate\Zlib.cs" />
-    <Compile Include="Compressor\Deflate\ZlibBaseStream.cs" />
-    <Compile Include="Compressor\Deflate\ZlibCodec.cs" />
-    <Compile Include="Compressor\Deflate\ZlibConstants.cs" />
-    <Compile Include="Compressor\Deflate\ZlibStream.cs" />
-    <Compile Include="Common\Rar\Headers\FileNameDecoder.cs" />
-    <Compile Include="Common\InvalidFormatException.cs" />
-    <Compile Include="IO\ReadOnlySubStream.cs" />
-    <Compile Include="IO\StreamingMode.cs" />
-    <Compile Include="Common\IExtractionListener.cs" />
-    <Compile Include="Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="LazyReadOnlyCollection.cs" />
-    <Compile Include="Archive\Rar\RarArchive.Extensions.cs" />
-    <Compile Include="Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="Archive\Rar\RarArchiveEntry.cs" />
-    <Compile Include="Common\ExtractionException.cs" />
-    <Compile Include="Common\Rar\RarEntry.cs" />
-    <Compile Include="Common\Options.cs" />
-    <Compile Include="Reader\IReader.cs" />
-    <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
-    <Compile Include="Reader\Rar\RarReader.cs" />
-    <Compile Include="Reader\IReader.Extensions.cs" />
-    <Compile Include="Reader\Rar\RarReaderEntry.cs" />
-    <Compile Include="Archive\Rar\SeekableFilePart.cs" />
-    <Compile Include="Reader\Rar\SingleVolumeRarReader.cs" />
-    <Compile Include="Common\ArchiveType.cs" />
-    <Compile Include="Reader\Tar\TarReader.cs" />
-    <Compile Include="ReadOnlyCollection.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="Archive\Rar\FileInfoRarArchiveVolume.cs" />
-    <Compile Include="Common\Rar\RarFilePart.cs" />
-    <Compile Include="Common\Rar\Headers\AVHeader.cs" />
-    <Compile Include="Common\Rar\Headers\CommentHeader.cs" />
-    <Compile Include="Common\Rar\Headers\EndArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\SignHeader.cs" />
-    <Compile Include="Common\Rar\RarVolume.cs" />
-    <Compile Include="Compressor\Rar\UnpackUtility.cs" />
-    <Compile Include="Archive\Rar\RarArchive.cs" />
-    <Compile Include="Compressor\Rar\MultiVolumeReadOnlyStream.cs" />
-    <Compile Include="Compressor\Rar\RarCRC.cs" />
-    <Compile Include="Common\Rar\Headers\FileHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ArchiveHeader.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeader.cs" />
-    <Compile Include="IO\MarkingBinaryReader.cs" />
-    <Compile Include="Common\Rar\Headers\NewSubHeader.cs" />
-    <Compile Include="Common\Rar\Headers\ProtectHeader.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Common\Rar\Headers\RarHeaderFactory.cs" />
-    <Compile Include="Common\Rar\Headers\Flags.cs" />
-    <Compile Include="Compressor\Rar\Decode\AudioVariables.cs" />
-    <Compile Include="Compressor\Rar\Decode\BitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\CodeType.cs" />
-    <Compile Include="Compressor\Rar\Decode\Compress.cs" />
-    <Compile Include="Compressor\Rar\Decode\Decode.cs" />
-    <Compile Include="Compressor\Rar\Decode\DistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\FilterType.cs" />
-    <Compile Include="Compressor\Rar\Decode\LitDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\LowDistDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\MultDecode.cs" />
-    <Compile Include="Compressor\Rar\Decode\RepDecode.cs" />
-    <Compile Include="Compressor\Rar\PPM\BlockTypes.cs" />
-    <Compile Include="Compressor\Rar\Unpack.cs" />
-    <Compile Include="Compressor\Rar\Unpack15.cs" />
-    <Compile Include="Compressor\Rar\Unpack20.cs" />
-    <Compile Include="Compressor\Rar\UnpackFilter.cs" />
-    <Compile Include="Compressor\Rar\VM\BitInput.cs" />
-    <Compile Include="Compressor\Rar\VM\RarVM.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCmdFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMCommands.cs" />
-    <Compile Include="Compressor\Rar\VM\VMFlags.cs" />
-    <Compile Include="Compressor\Rar\VM\VMOpType.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedCommand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedOperand.cs" />
-    <Compile Include="Compressor\Rar\VM\VMPreparedProgram.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilters.cs" />
-    <Compile Include="Compressor\Rar\VM\VMStandardFilterSignature.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="Common\Rar\Headers\MarkHeader.cs" />
-    <Compile Include="Archive\Rar\RarArchiveVolumeFactory.cs" />
-    <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
-    <Compile Include="Reader\Rar\RarReaderVolume.cs" />
-    <Compile Include="Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="Common\Zip\ZipFilePart.cs" />
-    <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="Reader\Zip\ZipReader.cs" />
-    <Compile Include="Common\Zip\ZipEntry.cs" />
-    <Compile Include="Writer\AbstractWriter.cs" />
-    <Compile Include="Writer\GZip\GZipWriter.cs" />
-    <Compile Include="Writer\IWriter.Extensions.cs" />
-    <Compile Include="Writer\IWriter.cs" />
-    <Compile Include="Writer\Tar\TarWriter.cs" />
-    <Compile Include="Writer\WriterFactory.cs" />
-    <Compile Include="Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="Writer\Zip\ZipWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="SharpCompress.pfx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/SharpCompress/packages.config
+++ b/SharpCompress/packages.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="LinqBridge" version="1.3.0" targetFramework="net20" />
-</packages>
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<repositories>
-  <repository path="..\SharpCompress\packages.config" />
-</repositories>
Author	SHA1	Message	Date
Adam Hathcock	315c138c05	Removing .NET 2.0 support and LinqBridge dies a firey death	2015-07-27 09:48:36 +01:00
Adam Hathcock	8e5cb77af2	Merge pull request #69 from pnewman8/master Skip entry stream on dispose	2015-07-20 16:27:55 +01:00
Paul Newman	8faebc78d0	Cancel moved from EntryStream to Reader Relates to previous commit. Following discussion with Adam, moved the Cancel() to the reader. Example: while (reader.MoveToNextEntry()) { using (var data = new StreamReader(reader.OpenEntryStream())) { try { DoSomething(data.ReadLine()); } catch { reader.Cancel(); throw; } } }	2015-07-15 18:13:46 +01:00
Paul Newman	afff386622	Skip entry stream on dispose Until now the caller had to completely consume each entry stream, or call SkipEntry(), before disposing the stream. If not, exception was thrown: "EntryStream has not been fully consumed". Hugely inconvenient; a user-thrown exception inside a "using (EntryStream)" block would be discarded. Now automatically skips the entry on dispose. Added method EntryStream.Cancel(). Call this if entry stream is unfinished, and no further entries are required. Helps with efficiency, as it avoids reading data that is not needed.	2015-07-15 13:44:20 +01:00
Adam Hathcock	9eb43156e8	Update license URL	2015-06-12 12:06:21 +01:00