Release for 0.10.1 as 0.10.1.1 for nuspec changes

Merge pull request #4 from sawilde/master
Ensure the assemblies have the same name in the nuget package #2
2026-02-04 05:25:00 +00:00 · 2013-08-13 20:35:40 +01:00 · 2013-08-13 12:28:37 -07:00 · 2013-08-14 05:21:45 +10:00 · 2013-08-11 09:51:05 +01:00 · 2013-08-11 09:47:00 +01:00
11 changed files with 39 additions and 149 deletions
--- a/NuGet/sharpcompress.nuspec
+++ b/NuGet/sharpcompress.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>sharpcompress</id>
-        <version>0.10</version>
+        <version>0.10.1.1</version>
        <title>SharpCompress - Pure C# Decompression/Compression</title>
        <authors>Adam Hathcock</authors>
        <owners>Adam Hathcock</owners>
@@ -15,8 +15,8 @@
        <tags>rar unrar zip unzip bzip2 gzip tar 7zip .net40 .net35 sl4</tags>
    </metadata>
    <files>
-        <file src="..\bin\SharpCompress.dll" target="lib\net40\SharpCompress.dll" />
-        <file src="..\bin\SharpCompress.WindowsStore.dll" target="lib\netcore45\SharpCompress.WindowsStore.dll" />
-        <file src="..\bin\SharpCompress.Portable.dll" target="lib\portable-net4+sl4+wp7+win8\SharpCompress.Portable.dll" />
+        <file src="..\bin\Full\SharpCompress.dll" target="lib\net40\SharpCompress.dll" />
+        <file src="..\bin\WindowsStore\SharpCompress.dll" target="lib\netcore45\SharpCompress.dll" />
+        <file src="..\bin\Portable\SharpCompress.dll" target="lib\portable-net4+sl4+wp7+win8\SharpCompress.dll" />
    </files>
 </package>
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@ TODOs (always lots):
 * Zip64
 * Multi-volume Zip support.

+Version 0.10.1:
+==============
+- Fixed 7Zip extraction performance problem

 Version 0.10:
 ==============
--- a/SharpCompress.sln
+++ b/SharpCompress.sln
@@ -15,6 +15,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test.Portable
 EndProject
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -99,7 +104,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
+		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 	EndGlobalSection
 EndGlobal
--- a/SharpCompress/Compressor/LZMA/DecoderStream.cs
+++ b/SharpCompress/Compressor/LZMA/DecoderStream.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using SharpCompress.Common.SevenZip;
 using SharpCompress.Compressor.LZMA.Utilites;
+using SharpCompress.IO;

 namespace SharpCompress.Compressor.LZMA
 {
@@ -158,12 +159,10 @@ namespace SharpCompress.Compressor.LZMA
            if (!folderInfo.CheckStructure())
                throw new NotSupportedException("Unsupported stream binding structure.");

-            // We have multiple views into the same stream which will be used by several threads - need to sync those.
-            object sync = new object();
            Stream[] inStreams = new Stream[folderInfo.PackStreams.Count];
            for (int j = 0; j < folderInfo.PackStreams.Count; j++)
            {
-                inStreams[j] = new SyncStreamView(sync, inStream, startPos, packSizes[j]);
+                inStreams[j] = new ReadOnlySubStream(inStream, startPos, packSizes[j]);
                startPos += packSizes[j];
            }

--- a/SharpCompress/Compressor/LZMA/Utilites/SyncStreamView.cs
+++ b/SharpCompress/Compressor/LZMA/Utilites/SyncStreamView.cs
@@ -1,120 +0,0 @@
-using System;
-using System.IO;
-
-namespace SharpCompress.Compressor.LZMA.Utilites
-{
-    /// <summary>
-    /// Allows reading the same stream from multiple threads by synchronizing read access.
-    /// </summary>
-    internal class SyncStreamView : Stream
-    {
-        private object mSync;
-        private Stream mStream;
-        private long mOrigin;
-        private long mEnding;
-        private long mOffset;
-        private bool isDisposed;
-
-        public SyncStreamView(object sync, Stream stream, long origin, long length)
-        {
-            mSync = sync;
-            mStream = stream;
-            mOrigin = origin;
-            mEnding = checked(origin + length);
-            mOffset = 0;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (isDisposed)
-            {
-                return;
-            }
-            isDisposed = true;
-            base.Dispose(disposing);
-            mStream.Dispose();
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override void Flush()
-        {
-            throw new InvalidOperationException();
-        }
-
-        public override long Length
-        {
-            get { return mEnding - mOrigin; }
-        }
-
-        public override long Position
-        {
-            get { return mOffset; }
-            set
-            {
-                if (value < 0 || value > Length)
-                    throw new ArgumentOutOfRangeException("value");
-
-                mOffset = value;
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            long remaining = mEnding - mOrigin - mOffset;
-            if (count > remaining)
-                count = (int)remaining;
-
-            if (count == 0)
-                return 0;
-
-            int delta;
-            lock (mSync)
-            {
-                mStream.Position = mOrigin + mOffset;
-                delta = mStream.Read(buffer, offset, count);
-            }
-
-            mOffset += delta;
-            return delta;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            switch (origin)
-            {
-                case SeekOrigin.Begin:
-                    return Position = offset;
-                case SeekOrigin.Current:
-                    return Position += offset;
-                case SeekOrigin.End:
-                    return Position = Length + offset;
-                default:
-                    throw new ArgumentOutOfRangeException("origin");
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new InvalidOperationException();
-        }
-    }
-}
--- a/SharpCompress/IO/ReadOnlySubStream.cs
+++ b/SharpCompress/IO/ReadOnlySubStream.cs
@@ -5,8 +5,17 @@ namespace SharpCompress.IO
    internal class ReadOnlySubStream : Stream
    {
        public ReadOnlySubStream(Stream stream, long bytesToRead)
+            : this(stream, null, bytesToRead)
+        {
+        }
+
+        public ReadOnlySubStream(Stream stream, long? origin, long bytesToRead)
        {
            Stream = stream;
+            if (origin != null)
+            {
+                stream.Position = origin.Value;
+            }
            BytesLeftToRead = bytesToRead;
        }

@@ -57,7 +66,7 @@ namespace SharpCompress.IO
        {
            if (BytesLeftToRead < count)
            {
-                count = (int) BytesLeftToRead;
+                count = (int)BytesLeftToRead;
            }
            int read = Stream.Read(buffer, offset, count);
            if (read > 0)
--- a/SharpCompress/SharpCompress.Portable.csproj
+++ b/SharpCompress/SharpCompress.Portable.csproj
@@ -7,7 +7,7 @@
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress.Portable</AssemblyName>
+    <AssemblyName>SharpCompress</AssemblyName>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkProfile>Profile1</TargetFrameworkProfile>
    <FileAlignment>512</FileAlignment>
@@ -19,7 +19,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\Portable\</OutputPath>
    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\Portable\</OutputPath>
    <DefineConstants>TRACE;PORTABLE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -203,7 +203,6 @@
    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\SyncStreamView.cs" />
    <Compile Include="Compressor\LZMA\Utilites\UnpackSubStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
--- a/SharpCompress/SharpCompress.PortableTest.csproj
+++ b/SharpCompress/SharpCompress.PortableTest.csproj
@@ -207,9 +207,6 @@
    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\SyncStreamView.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
      <SubType>Code</SubType>
    </Compile>
--- a/SharpCompress/SharpCompress.WindowsStore.csproj
+++ b/SharpCompress/SharpCompress.WindowsStore.csproj
@@ -10,7 +10,7 @@
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress.WindowsStore</AssemblyName>
+    <AssemblyName>SharpCompress</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -19,7 +19,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\WindowsStore\</OutputPath>
    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\WindowsStore\</OutputPath>
    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -259,7 +259,6 @@
    <Compile Include="Compressor\LZMA\Utilites\CrcBuilderStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\CrcCheckStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs" />
-    <Compile Include="Compressor\LZMA\Utilites\SyncStreamView.cs" />
    <Compile Include="Compressor\LZMA\Utilites\UnpackSubStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
--- a/SharpCompress/SharpCompress.csproj
+++ b/SharpCompress/SharpCompress.csproj
@@ -49,7 +49,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\Full\</OutputPath>
    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -57,18 +57,20 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <NoWarn>1591</NoWarn>
-    <DocumentationFile>..\bin\SharpCompress.XML</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\Full\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\bin\SharpCompress.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
    <NoWarn>1591</NoWarn>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
@@ -209,9 +211,6 @@
    <Compile Include="Compressor\LZMA\Utilites\IPasswordProvider.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Compressor\LZMA\Utilites\SyncStreamView.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs">
      <SubType>Code</SubType>
    </Compile>
--- a/SharpCompress/VersionInfo.cs
+++ b/SharpCompress/VersionInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © Adam Hathcock")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("0.10.0.0")]
-[assembly: AssemblyFileVersion("0.10.0.0")]
+[assembly: AssemblyVersion("0.10.1.1")]
+[assembly: AssemblyFileVersion("0.10.1.1")]
Author	SHA1	Message	Date
Adam Hathcock	46c03ce027	Release for 0.10.1 as 0.10.1.1 for nuspec changes	2013-08-13 20:35:40 +01:00
Adam Hathcock	718dac1a31	Merge pull request #4 from sawilde/master Ensure the assemblies have the same name in the nuget package #2	2013-08-13 12:28:37 -07:00
Shaun Wilde	137f2655a5	Merge branch 'master' of https://github.com/adamhathcock/sharpcompress Conflicts: NuGet/sharpcompress.nuspec	2013-08-14 05:21:45 +10:00
Adam Hathcock	8109ae003d	0.10.1 packing	2013-08-11 09:51:05 +01:00
Adam Hathcock	8325b919ce	Version 0.10.1	2013-08-11 09:47:00 +01:00
Adam Hathcock	61c97faf6c	Remove needless sync stream.	2013-08-11 09:45:46 +01:00
Shaun Wilde	2dc297394f	Ensure the assemblies have the same name in the nuget package #2	2013-08-08 19:40:11 +10:00