Mark for 0.30

Add net461 target to clean up issues with system.* nuget dependencies

.github/workflows/dotnetcore.yml

@@ -12,13 +12,9 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.400
+        dotnet-version: 5.0.401
     - run: dotnet run -p build/build.csproj
     - uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.os }}-sharpcompress.nupkg
         path: artifacts/*
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ matrix.os }}-sharpcompress.snupkg
-        path: artifacts/*

build/Program.cs

@@ -49,20 +49,20 @@ class Program
         Target(Build, DependsOn(Format),
                framework =>
                {
-                   if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && framework == "net46")
-                   {
-                       return;
-                   }
                    Run("dotnet", "build src/SharpCompress/SharpCompress.csproj -c Release");
                });
 
-        Target(Test, DependsOn(Build), ForEach("net5.0"),
+        Target(Test, DependsOn(Build), ForEach("net5.0", "net461"),
                framework =>
                {
                    IEnumerable<string> GetFiles(string d)
                    {
                        return Glob.Files(".", d);
                    }
+                   if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && framework == "net461")
+                   {
+                       return;
+                   }
 
                    foreach (var file in GetFiles("**/*.Test.csproj"))
                    {

build/build.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Bullseye" Version="3.8.0" />
     <PackageReference Include="Glob" Version="1.1.8" />
-    <PackageReference Include="SimpleExec" Version="7.0.0" />
+    <PackageReference Include="SimpleExec" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

src/SharpCompress/Algorithms/Alder32.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-#if !NETSTANDARD2_0 && !NETSTANDARD2_1
+#if !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETFRAMEWORK
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -22,7 +22,7 @@ namespace SharpCompress.Algorithms
         /// </summary>
         public const uint SeedValue = 1U;
 
-#if !NETSTANDARD2_0 && !NETSTANDARD2_1
+#if !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETFRAMEWORK
         private const int MinBufferSize = 64;
 #endif
 
@@ -56,7 +56,7 @@ namespace SharpCompress.Algorithms
                 return SeedValue;
             }
 
-#if !NETSTANDARD2_0 && !NETSTANDARD2_1
+#if !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETFRAMEWORK
             if (Sse3.IsSupported && buffer.Length >= MinBufferSize)
             {
                 return CalculateSse(adler, buffer);
@@ -69,7 +69,7 @@ namespace SharpCompress.Algorithms
         }
 
         // Based on https://github.com/chromium/chromium/blob/master/third_party/zlib/adler32_simd.c
-#if !NETSTANDARD2_0 && !NETSTANDARD2_1
+#if !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETFRAMEWORK
         private static unsafe uint CalculateSse(uint adler, ReadOnlySpan<byte> buffer)
         {
             uint s1 = adler & 0xFFFF;
@@ -282,4 +282,4 @@ namespace SharpCompress.Algorithms
             return (s2 << 16) | s1;
         }
     }
-}
+}

src/SharpCompress/Archives/Rar/RarArchive.cs

@@ -10,7 +10,7 @@ using SharpCompress.Readers.Rar;
 
 namespace SharpCompress.Archives.Rar
 {
-    public class 
+    public class
         RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
     {
         internal Lazy<IRarUnpack> UnpackV2017 { get; } = new Lazy<IRarUnpack>(() => new SharpCompress.Compressors.Rar.UnpackV2017.Unpack());

src/SharpCompress/Common/ArchiveEncoding.cs

@@ -36,7 +36,7 @@ namespace SharpCompress.Common
             Password = password;
         }
 
-#if !NET461
+#if !NETFRAMEWORK
         static ArchiveEncoding()
         {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

src/SharpCompress/Common/ExtractionMethods.cs

@@ -15,7 +15,7 @@ namespace SharpCompress.Common
         {
             string destinationFileName;
             string fullDestinationDirectoryPath = Path.GetFullPath(destinationDirectory);
-            
+
             //check for trailing slash.
             if (fullDestinationDirectoryPath[fullDestinationDirectoryPath.Length - 1] != Path.DirectorySeparatorChar)
             {

src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs

@@ -36,7 +36,7 @@ namespace SharpCompress.Common.Zip
                 // ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR should be before the EOCD
                 stream.Seek(eocd_location - ZIP64_EOCD_LENGTH - 4, SeekOrigin.Begin);
                 uint zip64_locator = reader.ReadUInt32();
-                if( zip64_locator != ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR )
+                if (zip64_locator != ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR)
                 {
                     throw new ArchiveException("Failed to locate the Zip64 Directory Locator");
                 }
@@ -86,11 +86,11 @@ namespace SharpCompress.Common.Zip
             }
         }
 
-        private static bool IsMatch( byte[] haystack, int position, byte[] needle)
+        private static bool IsMatch(byte[] haystack, int position, byte[] needle)
         {
-            for( int i = 0; i < needle.Length; i++ )
+            for (int i = 0; i < needle.Length; i++)
             {
-                if( haystack[ position + i ] != needle[ i ] )
+                if (haystack[position + i] != needle[i])
                 {
                     return false;
                 }
@@ -120,9 +120,9 @@ namespace SharpCompress.Common.Zip
             // don't exclude the minimum eocd region, otherwise you fail to locate the header in empty zip files
             var max_search_area = len; // - MINIMUM_EOCD_LENGTH;
 
-            for( int pos_from_end = 0; pos_from_end < max_search_area; ++pos_from_end)
+            for (int pos_from_end = 0; pos_from_end < max_search_area; ++pos_from_end)
             {
-                if( IsMatch(seek, pos_from_end, needle) )
+                if (IsMatch(seek, pos_from_end, needle))
                 {
                     stream.Seek(-pos_from_end, SeekOrigin.End);
                     return;

src/SharpCompress/Compressors/BZip2/BZip2Stream.cs

@@ -83,7 +83,7 @@ namespace SharpCompress.Compressors.BZip2
             stream.SetLength(value);
         }
 
-#if !NET461 && !NETSTANDARD2_0
+#if !NETFRAMEWORK && !NETSTANDARD2_0
 
         public override int Read(Span<byte> buffer)
         {
@@ -123,4 +123,4 @@ namespace SharpCompress.Compressors.BZip2
             return true;
         }
     }
-}
+}

src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs

@@ -502,13 +502,37 @@ namespace SharpCompress.Compressors.Deflate
                 throw new ZlibException("Cannot Read after Writing.");
             }
 
+            int rc = 0;
+
+            // set up the output of the deflate/inflate codec:
+            _z.OutputBuffer = buffer;
+            _z.NextOut = offset;
+            _z.AvailableBytesOut = count;
+
             if (count == 0)
             {
                 return 0;
             }
             if (nomoreinput && _wantCompress)
             {
-                return 0; // workitem 8557
+                // no more input data available; therefore we flush to
+                // try to complete the read
+                rc = _z.Deflate(FlushType.Finish);
+
+                if (rc != ZlibConstants.Z_OK && rc != ZlibConstants.Z_STREAM_END)
+                {
+                    throw new ZlibException(String.Format("Deflating:  rc={0}  msg={1}", rc, _z.Message));
+                }
+
+                rc = (count - _z.AvailableBytesOut);
+
+                // calculate CRC after reading
+                if (crc != null)
+                {
+                    crc.SlurpBlock(buffer, offset, rc);
+                }
+
+                return rc;
             }
             if (buffer is null)
             {
@@ -527,13 +551,6 @@ namespace SharpCompress.Compressors.Deflate
                 throw new ArgumentOutOfRangeException(nameof(count));
             }
 
-            int rc = 0;
-
-            // set up the output of the deflate/inflate codec:
-            _z.OutputBuffer = buffer;
-            _z.NextOut = offset;
-            _z.AvailableBytesOut = count;
-
             // This is necessary in case _workingBuffer has been resized. (new byte[])
             // (The first reference to _workingBuffer goes through the private accessor which
             // may initialize it.)

src/SharpCompress/Compressors/LZMA/LZipStream.cs

@@ -118,7 +118,7 @@ namespace SharpCompress.Compressors.LZMA
         public override void SetLength(long value) => throw new NotImplementedException();
 
 
-#if !NET461 && !NETSTANDARD2_0
+#if !NETFRAMEWORK && !NETSTANDARD2_0
 
         public override int Read(Span<byte> buffer)
         {

src/SharpCompress/Crypto/Crc32Stream.cs

@@ -42,7 +42,7 @@ namespace SharpCompress.Crypto
 
         public override void SetLength(long value) => throw new NotSupportedException();
 
-#if !NET461 && !NETSTANDARD2_0
+#if !NETFRAMEWORK && !NETSTANDARD2_0
 
         public override void Write(ReadOnlySpan<byte> buffer)
         {

src/SharpCompress/IO/NonDisposingStream.cs

@@ -58,7 +58,7 @@ namespace SharpCompress.IO
             Stream.Write(buffer, offset, count);
         }
 
-#if !NET461 && !NETSTANDARD2_0
+#if !NETFRAMEWORK && !NETSTANDARD2_0
 
         public override int Read(Span<byte> buffer)
         {
@@ -72,4 +72,4 @@ namespace SharpCompress.IO
 
 #endif
     }
-}
+}

src/SharpCompress/Polyfills/StreamExtensions.cs

@@ -1,4 +1,4 @@
-#if NET461 || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD2_0
 
 using System;
 using System.Buffers;

src/SharpCompress/Polyfills/StringExtensions.cs

@@ -1,4 +1,4 @@
-#if NET461 || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD2_0
 
 namespace SharpCompress
 {

src/SharpCompress/SharpCompress.csproj

@@ -2,11 +2,11 @@
   <PropertyGroup>
     <AssemblyTitle>SharpCompress - Pure C# Decompression/Compression</AssemblyTitle>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>0.29.0</VersionPrefix>
-    <AssemblyVersion>0.29.0</AssemblyVersion>
-    <FileVersion>0.29.0</FileVersion>
+    <VersionPrefix>0.30.0</VersionPrefix>
+    <AssemblyVersion>0.30.0</AssemblyVersion>
+    <FileVersion>0.30.0</FileVersion>
     <Authors>Adam Hathcock</Authors>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <AssemblyName>SharpCompress</AssemblyName>
@@ -35,8 +35,10 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
-    <PackageReference Include="System.Buffers" Version="4.4.0" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' == 'NETFRAMEWORK' ">
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
-
 </Project>

src/SharpCompress/Utility.cs

@@ -280,7 +280,7 @@ namespace SharpCompress
         {
             return ArrayPool<byte>.Shared.Rent(81920);
         }
-        
+
         public static bool ReadFully(this Stream stream, byte[] buffer)
         {
             int total = 0;
@@ -295,7 +295,7 @@ namespace SharpCompress
             }
             return (total >= buffer.Length);
         }
-        
+
         public static bool ReadFully(this Stream stream, Span<byte> buffer)
         {
             int total = 0;

tests/SharpCompress.Test/SharpCompress.Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net461</TargetFrameworks>
     <AssemblyName>SharpCompress.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -13,12 +13,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' != 'NETFRAMEWORK' ">
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
 </Project>

tests/SharpCompress.Test/Streams/ZlibBaseStreamTests.cs

@@ -0,0 +1,35 @@
+using System.IO;
+using SharpCompress.Compressors;
+using SharpCompress.Compressors.Deflate;
+using Xunit;
+
+namespace SharpCompress.Test.Streams
+{
+    public class ZLibBaseStreamTests
+    {
+        [Fact]
+        public void TestChunkedZlibCompressesEverything()
+        {
+            byte[] plainData = new byte[] { 0xf7, 0x1b, 0xda, 0x0f, 0xb6, 0x2b, 0x3d, 0x91, 0xd7, 0xe1, 0xb5, 0x11, 0x34, 0x5a, 0x51, 0x3f, 0x8b, 0xce, 0x49, 0xd2 };
+            byte[] buf = new byte[plainData.Length * 2];
+
+            MemoryStream plainStream1 = new MemoryStream(plainData);
+            DeflateStream compressor1 = new DeflateStream(plainStream1, CompressionMode.Compress);
+            // This is enough to read the entire data
+            int realCompressedSize = compressor1.Read(buf, 0, plainData.Length * 2);
+
+            MemoryStream plainStream2 = new MemoryStream(plainData);
+            DeflateStream compressor2 = new DeflateStream(plainStream2, CompressionMode.Compress);
+            int total = 0;
+            int r = -1; // Jumpstart
+            while (r != 0)
+            {
+                // Reading in chunks
+                r = compressor2.Read(buf, 0, plainData.Length);
+                total += r;
+            }
+
+            Assert.Equal(total, realCompressedSize);
+        }
+    }
+}

tests/SharpCompress.Test/Tar/TarReaderTests.cs

@@ -190,7 +190,7 @@ namespace SharpCompress.Test.Tar
             }
         }
 
-#if !NET461
+#if !NETFRAMEWORK
         [Fact]
         public void Tar_GZip_With_Symlink_Entries()
         {

tests/SharpCompress.Test/Zip/ZipArchiveTests.cs

@@ -592,7 +592,7 @@ namespace SharpCompress.Test.Zip
         {
             string zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.LongComment.zip");
 
-            using(ZipArchive za = ZipArchive.Open(zipPath))
+            using (ZipArchive za = ZipArchive.Open(zipPath))
             {
                 var count = za.Entries.Count;
                 Assert.Equal(1, count);

tests/SharpCompress.Test/Zip/ZipReaderTests.cs

@@ -268,16 +268,16 @@ namespace SharpCompress.Test.Zip
             }
             VerifyFiles();
         }
-        
+
         [Fact]
         public void Zip_Deflate_ZipCrypto_Read()
         {
             int count = 0;
             using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "zipcrypto.zip")))
             using (var reader = ZipReader.Open(stream, new ReaderOptions()
-                                                       {
-                                                           Password = "test"
-                                                       }))
+            {
+                Password = "test"
+            }))
             {
                 while (reader.MoveToNextEntry())
                 {