From 1561bba538020f28bb175ff8d9a8cf1f6da23515 Mon Sep 17 00:00:00 2001 From: Jeff Tyson Date: Wed, 29 Sep 2021 21:55:11 +0000 Subject: [PATCH] Add net462 target to clean up issues with system.* nuget dependencies --- src/SharpCompress/Algorithms/Alder32.cs | 10 +++++----- src/SharpCompress/Common/ArchiveEncoding.cs | 2 -- src/SharpCompress/Compressors/BZip2/BZip2Stream.cs | 4 ++-- src/SharpCompress/Compressors/LZMA/LZipStream.cs | 2 +- src/SharpCompress/Crypto/Crc32Stream.cs | 2 +- src/SharpCompress/IO/NonDisposingStream.cs | 4 ++-- src/SharpCompress/Polyfills/StreamExtensions.cs | 2 +- src/SharpCompress/Polyfills/StringExtensions.cs | 2 +- src/SharpCompress/SharpCompress.csproj | 10 ++++++---- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/SharpCompress/Algorithms/Alder32.cs b/src/SharpCompress/Algorithms/Alder32.cs index 06dfed52..5faf1597 100644 --- a/src/SharpCompress/Algorithms/Alder32.cs +++ b/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 /// 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 buffer) { uint s1 = adler & 0xFFFF; @@ -282,4 +282,4 @@ namespace SharpCompress.Algorithms return (s2 << 16) | s1; } } -} \ No newline at end of file +} diff --git a/src/SharpCompress/Common/ArchiveEncoding.cs b/src/SharpCompress/Common/ArchiveEncoding.cs index 691d2080..3a194460 100644 --- a/src/SharpCompress/Common/ArchiveEncoding.cs +++ b/src/SharpCompress/Common/ArchiveEncoding.cs @@ -36,12 +36,10 @@ namespace SharpCompress.Common Password = password; } -#if !NET461 static ArchiveEncoding() { Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); } -#endif public string Decode(byte[] bytes) { diff --git a/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs b/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs index 91179ccf..a65ca51f 100644 --- a/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs +++ b/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 buffer) { @@ -123,4 +123,4 @@ namespace SharpCompress.Compressors.BZip2 return true; } } -} \ No newline at end of file +} diff --git a/src/SharpCompress/Compressors/LZMA/LZipStream.cs b/src/SharpCompress/Compressors/LZMA/LZipStream.cs index 8e316b06..a736bca1 100644 --- a/src/SharpCompress/Compressors/LZMA/LZipStream.cs +++ b/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 buffer) { diff --git a/src/SharpCompress/Crypto/Crc32Stream.cs b/src/SharpCompress/Crypto/Crc32Stream.cs index fe3cd00c..2651bfbb 100644 --- a/src/SharpCompress/Crypto/Crc32Stream.cs +++ b/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 buffer) { diff --git a/src/SharpCompress/IO/NonDisposingStream.cs b/src/SharpCompress/IO/NonDisposingStream.cs index dfb8f80e..9b326c99 100644 --- a/src/SharpCompress/IO/NonDisposingStream.cs +++ b/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 buffer) { @@ -72,4 +72,4 @@ namespace SharpCompress.IO #endif } -} \ No newline at end of file +} diff --git a/src/SharpCompress/Polyfills/StreamExtensions.cs b/src/SharpCompress/Polyfills/StreamExtensions.cs index fe59f96e..6dacef75 100644 --- a/src/SharpCompress/Polyfills/StreamExtensions.cs +++ b/src/SharpCompress/Polyfills/StreamExtensions.cs @@ -1,4 +1,4 @@ -#if NET461 || NETSTANDARD2_0 +#if NETFRAMEWORK || NETSTANDARD2_0 using System; using System.Buffers; diff --git a/src/SharpCompress/Polyfills/StringExtensions.cs b/src/SharpCompress/Polyfills/StringExtensions.cs index f4646189..e58aff4d 100644 --- a/src/SharpCompress/Polyfills/StringExtensions.cs +++ b/src/SharpCompress/Polyfills/StringExtensions.cs @@ -1,4 +1,4 @@ -#if NET461 || NETSTANDARD2_0 +#if NETFRAMEWORK || NETSTANDARD2_0 namespace SharpCompress { diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj index 77092183..35770522 100644 --- a/src/SharpCompress/SharpCompress.csproj +++ b/src/SharpCompress/SharpCompress.csproj @@ -6,7 +6,7 @@ 0.29.0 0.29.0 Adam Hathcock - netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 + net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 true false SharpCompress @@ -35,8 +35,10 @@ - - + + + + + -