Merge pull request #530 from carbon/master

Enable test coverage for net461 and fix regression
adamhathcock · Jul 31, 2020 · 1391794 · 1391794
2 parents 74af175 + 28f0432
commit 1391794
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/src/SharpCompress/Polyfills/StreamExtensions.cs b/src/SharpCompress/Polyfills/StreamExtensions.cs
@@ -8,7 +8,9 @@ public static class StreamExtensions
     {
         public static void Write(this Stream stream, ReadOnlySpan<byte> buffer)
         {
-            var temp = ArrayPool<byte>.Shared.Rent(buffer.Length);
+            byte[] temp = ArrayPool<byte>.Shared.Rent(buffer.Length);
+
+            buffer.CopyTo(temp);
 
             try
             {

diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>SharpCompress.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs
@@ -187,6 +187,7 @@ public void Tar_With_TarGz_With_Flushed_EntryStream()
             }
         }
 
+#if !NET461
         [Fact]
         public void Tar_GZip_With_Symlink_Entries()
         {
@@ -212,7 +213,7 @@ public void Tar_GZip_With_Symlink_Entries()
                                                          if (!isWindows)
                                                          {
                                                              var link = new Mono.Unix.UnixSymbolicLinkInfo(sourcePath);
-                                                             if (System.IO.File.Exists(sourcePath))
+                                                             if (File.Exists(sourcePath))
                                                              {
                                                                  link.Delete(); // equivalent to ln -s -f
                                                              }
@@ -246,5 +247,7 @@ public void Tar_GZip_With_Symlink_Entries()
                 }
             }
         }
+#endif
+
     }
 }
diff --git a/tests/SharpCompress.Test/Zip/ZipWriterTests.cs b/tests/SharpCompress.Test/Zip/ZipWriterTests.cs
@@ -1,4 +1,6 @@
-using SharpCompress.Common;
+using System.Text;
+
+using SharpCompress.Common;
 using Xunit;
 
 namespace SharpCompress.Test.Zip
@@ -10,39 +12,38 @@ public ZipWriterTests()
         {
         }
 
+
         [Fact]
         public void Zip_Deflate_Write()
         {
-            Write(CompressionType.Deflate, "Zip.deflate.noEmptyDirs.zip", "Zip.deflate.noEmptyDirs.zip");
+            Write(CompressionType.Deflate, "Zip.deflate.noEmptyDirs.zip", "Zip.deflate.noEmptyDirs.zip", Encoding.UTF8);
         }
 
-
         [Fact]
         public void Zip_BZip2_Write()
         {
-            Write(CompressionType.BZip2, "Zip.bzip2.noEmptyDirs.zip", "Zip.bzip2.noEmptyDirs.zip");
+            Write(CompressionType.BZip2, "Zip.bzip2.noEmptyDirs.zip", "Zip.bzip2.noEmptyDirs.zip", Encoding.UTF8);
         }
 
-
         [Fact]
         public void Zip_None_Write()
         {
-            Write(CompressionType.None, "Zip.none.noEmptyDirs.zip", "Zip.none.noEmptyDirs.zip");
+            Write(CompressionType.None, "Zip.none.noEmptyDirs.zip", "Zip.none.noEmptyDirs.zip", Encoding.UTF8);
         }
 
-
         [Fact]
         public void Zip_LZMA_Write()
         {
-            Write(CompressionType.LZMA, "Zip.lzma.noEmptyDirs.zip", "Zip.lzma.noEmptyDirs.zip");
+            Write(CompressionType.LZMA, "Zip.lzma.noEmptyDirs.zip", "Zip.lzma.noEmptyDirs.zip", Encoding.UTF8);
         }
 
         [Fact]
         public void Zip_PPMd_Write()
         {
-            Write(CompressionType.PPMd, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip");
+            Write(CompressionType.PPMd, "Zip.ppmd.noEmptyDirs.zip", "Zip.ppmd.noEmptyDirs.zip", Encoding.UTF8);
         }
 
+
         [Fact]
         public void Zip_Rar_Write()
         {