Version 0.10.2

Strong name Windows Store assembly
Updating with VS 2013
2026-02-04 05:25:00 +00:00 · 2013-11-23 13:08:54 +00:00 · 2013-11-23 11:13:01 +00:00 · 2013-11-23 11:10:22 +00:00 · 2013-11-23 11:10:07 +00:00 · 2013-10-19 13:28:33 +01:00
15 changed files with 100 additions and 253 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.1</version>
+        <version>0.10.2</version>
        <title>SharpCompress - Pure C# Decompression/Compression</title>
        <authors>Adam Hathcock</authors>
        <owners>Adam Hathcock</owners>
@@ -12,11 +12,11 @@
        <description>SharpCompress is a compression library for .NET/Mono/Silverlight/WP7/WindowsStore that can unrar, decompress 7zip, zip/unzip, tar/untar bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</description>
        <releaseNotes />
        <language>en-US</language>
-        <tags>rar unrar zip unzip bzip2 gzip tar 7zip .net40 .net35 sl4</tags>
+        <tags>rar unrar zip unzip bzip2 gzip tar 7zip</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+sl5+wp8+win8\SharpCompress.dll" />
    </files>
 </package>
--- a/README.md
+++ b/README.md
@@ -21,6 +21,14 @@ TODOs (always lots):
 * Zip64
 * Multi-volume Zip support.

+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
--- a/SharpCompress.Test/Rar/RarArchiveTests.cs
+++ b/SharpCompress.Test/Rar/RarArchiveTests.cs
@@ -15,12 +15,30 @@ namespace SharpCompress.Test
        {
            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()
        {
--- a/SharpCompress.Test/Rar/RarReaderTests.cs
+++ b/SharpCompress.Test/Rar/RarReaderTests.cs
@@ -50,15 +50,18 @@ namespace SharpCompress.Test
            {
                File.Copy(Path.Combine(TEST_ARCHIVES_PATH, file), Path.Combine(SCRATCH2_FILES_PATH, file));
            }
-
-            using (var reader = RarReader.Open(testArchives.Select(s => Path.Combine(SCRATCH2_FILES_PATH, s))
-                .Select(p => File.OpenRead(p)), Options.None))
+            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)))
--- a/SharpCompress.sln
+++ b/SharpCompress.sln
@@ -1,6 +1,15 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F18F1765-4A02-42FD-9BEF-F0E2FCBD9D17}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet\sharpcompress.nuspec = NuGet\sharpcompress.nuspec
+	EndProjectSection
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "SharpCompress\SharpCompress.csproj", "{10A689CF-76A2-4A4F-96E4-553C33398438}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress.Test", "SharpCompress.Test\SharpCompress.Test.csproj", "{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}"
@@ -13,93 +22,43 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	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}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Debug|x86.ActiveCfg = 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
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|ARM.ActiveCfg = Release|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|x64.ActiveCfg = Release|Any CPU
-		{10A689CF-76A2-4A4F-96E4-553C33398438}.Release|x86.ActiveCfg = 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}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Debug|x86.ActiveCfg = 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
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|x64.ActiveCfg = Release|Any CPU
-		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD}.Release|x86.ActiveCfg = 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}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Debug|x86.ActiveCfg = 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
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|x64.ActiveCfg = Release|Any CPU
-		{7FA7D133-1417-4F85-9998-4C618AC8FEDA}.Release|x86.ActiveCfg = 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}.Debug|ARM.ActiveCfg = Debug|ARM
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|ARM.Build.0 = Debug|ARM
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x64.ActiveCfg = Debug|x64
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x64.Build.0 = Debug|x64
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x86.ActiveCfg = Debug|x86
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Debug|x86.Build.0 = Debug|x86
 		{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
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|ARM.ActiveCfg = Release|ARM
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|ARM.Build.0 = Release|ARM
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x64.ActiveCfg = Release|x64
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x64.Build.0 = Release|x64
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x86.ActiveCfg = Release|x86
-		{1DF6D83C-31FF-47B6-82FE-C4603BE916B5}.Release|x86.Build.0 = Release|x86
 		{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}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Debug|x86.ActiveCfg = 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
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|ARM.ActiveCfg = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|x64.ActiveCfg = Release|Any CPU
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED}.Release|x86.ActiveCfg = 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}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Debug|x86.ActiveCfg = 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
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|ARM.ActiveCfg = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9C3C94B-FB27-4B4F-B225-57513C254D37}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 		{15679D7A-F22C-4943-87FF-BF5C76C4A6FD} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
+		{EFDCAF57-FD4D-4E5D-A3D5-F26B875817ED} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 		{E9C3C94B-FB27-4B4F-B225-57513C254D37} = {932BBFCC-76E3-45FF-90CA-6BE4FBF4A097}
 	EndGlobalSection
 EndGlobal
--- a/SharpCompress/Common/Rar/Headers/FileHeader.cs
+++ b/SharpCompress/Common/Rar/Headers/FileHeader.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Text;
 using SharpCompress.IO;

 namespace SharpCompress.Common.Rar.Headers
@@ -15,7 +14,7 @@ namespace SharpCompress.Common.Rar.Headers
        {
            uint lowUncompressedSize = reader.ReadUInt32();

-            HostOS = (HostOS) (int) reader.ReadByte();
+            HostOS = (HostOS)reader.ReadByte();

            FileCRC = reader.ReadUInt32();

@@ -46,7 +45,7 @@ namespace SharpCompress.Common.Rar.Headers
            CompressedSize = UInt32To64(highCompressedSize, AdditionalSize);
            UncompressedSize = UInt32To64(highUncompressedkSize, lowUncompressedSize);

-            nameSize = nameSize > 4*1024 ? (short) (4*1024) : nameSize;
+            nameSize = nameSize > 4 * 1024 ? (short)(4 * 1024) : nameSize;

            byte[] fileNameBytes = reader.ReadBytes(nameSize);

@@ -106,11 +105,16 @@ namespace SharpCompress.Common.Rar.Headers
            }
            if (FileFlags.HasFlag(FileFlags.EXTTIME))
            {
-                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);
+                // 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);
+                }
            }
        }

@@ -130,7 +134,7 @@ namespace SharpCompress.Common.Rar.Headers
        private static DateTime? ProcessExtendedTime(ushort extendedFlags, DateTime? time, MarkingBinaryReader reader,
                                                     int i)
        {
-            uint rmode = (uint) extendedFlags >> (3 - i)*4;
+            uint rmode = (uint)extendedFlags >> (3 - i) * 4;
            if ((rmode & 8) == 0)
            {
                return null;
@@ -145,14 +149,14 @@ namespace SharpCompress.Common.Rar.Headers
                time = time.Value.AddSeconds(1);
            }
            uint nanosecondHundreds = 0;
-            int count = (int) rmode & 3;
+            int count = (int)rmode & 3;
            for (int j = 0; j < count; j++)
            {
                byte b = reader.ReadByte();
-                nanosecondHundreds |= (((uint) b) << ((j + 3 - count)*8));
+                nanosecondHundreds |= (((uint)b) << ((j + 3 - count) * 8));
            }
            //10^-7 to 10^-3
-            return time.Value.AddMilliseconds(nanosecondHundreds*Math.Pow(10, -4));
+            return time.Value.AddMilliseconds(nanosecondHundreds * Math.Pow(10, -4));
        }

        private static string ConvertPath(string path, HostOS os)
@@ -205,7 +209,7 @@ namespace SharpCompress.Common.Rar.Headers

        internal FileFlags FileFlags
        {
-            get { return (FileFlags) base.Flags; }
+            get { return (FileFlags)base.Flags; }
        }

        internal long CompressedSize { get; private set; }
--- a/SharpCompress/Common/Rar/Headers/RarHeader.cs
+++ b/SharpCompress/Common/Rar/Headers/RarHeader.cs
@@ -38,7 +38,7 @@ namespace SharpCompress.Common.Rar.Headers
        protected virtual void ReadFromReader(MarkingBinaryReader reader)
        {
            HeadCRC = reader.ReadInt16();
-            HeaderType = (HeaderType)(int)(reader.ReadByte() & 0xff);
+            HeaderType = (HeaderType)(reader.ReadByte() & 0xff);
            Flags = reader.ReadInt16();
            HeaderSize = reader.ReadInt16();
            if (FlagUtility.HasFlag(Flags, LONG_BLOCK))
--- a/SharpCompress/Common/Rar/RarCryptoBinaryReader.cs
+++ b/SharpCompress/Common/Rar/RarCryptoBinaryReader.cs
@@ -30,7 +30,6 @@ namespace SharpCompress.Common.Rar

        public override byte[] ReadBytes(int count)
        {
-            CurrentReadByteCount += count;
            if (UseEncryption)
            {
                return ReadAndDecryptBytes(count);
--- a/SharpCompress/Compressor/LZMA/Utilites/UnpackSubStream.cs
+++ b/SharpCompress/Compressor/LZMA/Utilites/UnpackSubStream.cs
@@ -1,96 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace master._7zip.Utilities
-{
-    /// <remarks>
-    /// This stream is a length-constrained wrapper around a cached stream so it does not dispose the inner stream.
-    /// </remarks>
-    internal class UnpackSubStream: Stream
-    {
-        private Stream mSource;
-        private long mLength;
-        private long mOffset;
-
-        internal UnpackSubStream(Stream source, long length)
-        {
-            mSource = source;
-            mLength = length;
-        }
-
-        public override bool CanRead
-        {
-            get { return mSource.CanRead; }
-        }
-
-        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 mLength; }
-        }
-
-        public override long Position
-        {
-            get { return mOffset; }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if(buffer == null)
-                throw new ArgumentNullException("buffer");
-
-            if(offset < 0 || offset > buffer.Length)
-                throw new ArgumentOutOfRangeException("offset");
-
-            if(count < 0 || count > buffer.Length - offset)
-                throw new ArgumentOutOfRangeException("count");
-
-            if(count > mLength - mOffset)
-                count = (int)(mLength - mOffset);
-
-            if(count == 0)
-                return 0;
-
-            int processed = mSource.Read(buffer, offset, count);
-            if(processed == 0)
-                throw new EndOfStreamException("Decoded stream ended prematurely, unpacked data is corrupt.");
-
-            mOffset += processed;
-            return processed;
-        }
-
-        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();
-        }
-    }
-}
--- a/SharpCompress/IO/MarkingBinaryReader.cs
+++ b/SharpCompress/IO/MarkingBinaryReader.cs
@@ -12,7 +12,7 @@ namespace SharpCompress.IO
        {
        }

-        public long CurrentReadByteCount { get; protected set; }
+        public long CurrentReadByteCount { get; private set; }

        public void Mark()
        {
--- a/SharpCompress/SharpCompress.Portable.csproj
+++ b/SharpCompress/SharpCompress.Portable.csproj
@@ -7,19 +7,26 @@
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress.Portable</AssemblyName>
+    <AssemblyName>SharpCompress</AssemblyName>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile1</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\sharpcompress\</SolutionDir>
+    <BaseIntermediateOutputPath>obj\Portable\</BaseIntermediateOutputPath>
    <RestorePackages>true</RestorePackages>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
+    <OutputPath>..\bin\Portable\</OutputPath>
    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -28,7 +35,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 +210,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\UnpackSubStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
--- a/SharpCompress/SharpCompress.WindowsStore.csproj
+++ b/SharpCompress/SharpCompress.WindowsStore.csproj
@@ -10,16 +10,17 @@
    <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>
+    <BaseIntermediateOutputPath>obj\WindowsStore\</BaseIntermediateOutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <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,77 +28,11 @@
  <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>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
  <ItemGroup>
    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
    <Compile Include="Archive\AbstractArchive.cs" />
@@ -259,7 +194,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\UnpackSubStream.cs" />
    <Compile Include="Compressor\LZMA\Utilites\Utils.cs" />
    <Compile Include="Compressor\PPMd\H\FreqData.cs" />
    <Compile Include="Compressor\PPMd\H\ModelPPM.cs" />
@@ -368,12 +302,21 @@
  <ItemGroup>
    <Folder Include="Properties\" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="SharpCompress.pfx" />
+  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
    <VisualStudioVersion>11.0</VisualStudioVersion>
  </PropertyGroup>
  <PropertyGroup>
    <StartupObject />
  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>SharpCompress.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/SharpCompress/SharpCompress.csproj
+++ b/SharpCompress/SharpCompress.csproj
@@ -34,6 +34,7 @@
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <BaseIntermediateOutputPath>obj\Full\</BaseIntermediateOutputPath>
    <SccProjectName>
    </SccProjectName>
    <SccLocalPath>
@@ -49,7 +50,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 +58,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>
--- 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.1.0")]
-[assembly: AssemblyFileVersion("0.10.1.0")]
+[assembly: AssemblyVersion("0.10.2.0")]
+[assembly: AssemblyFileVersion("0.10.2.0")]
--- a/TestArchives/Archives/test_invalid_exttime.rar
+++ b/TestArchives/Archives/test_invalid_exttime.rar
Author	SHA1	Message	Date
Adam Hathcock	b4bfde77d2	Version 0.10.2	2013-11-23 13:08:54 +00:00
Adam Hathcock	c4b005b3d4	Strong name Windows Store assembly	2013-11-23 11:13:01 +00:00
Adam Hathcock	c9d1f7b528	Updating with VS 2013	2013-11-23 11:10:22 +00:00
Adam Hathcock	21aa57945d	Fix for byte counting	2013-11-23 11:10:07 +00:00
Adam Hathcock	1d0c7b6445	Added work around for invalid extended time format https://sharpcompress.codeplex.com/workitem/42	2013-10-19 13:28:33 +01:00
Adam Hathcock	f33d8f9a5e	Fixed deletion test	2013-10-19 13:21:37 +01:00
Adam Hathcock	ee2d6216b7	Remove unused class	2013-08-14 16:36:09 +01:00
Adam Hathcock	a42414bdaa	Version 0.10.1.3 - hopefully cleaned up building problem for different platforms	2013-08-14 16:26:41 +01:00
Adam Hathcock	3e201053c6	Version 0.10.1.2	2013-08-14 08:06:07 +01:00
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
Shaun Wilde	2dc297394f	Ensure the assemblies have the same name in the nuget package #2	2013-08-08 19:40:11 +10:00