Consolidate NETFRAMEWORK/NETSTANDARD compile flags into LEGACY_DOTNET

src/SharpCompress/Algorithms/Adler32.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-#if !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
 #define SUPPORTS_RUNTIME_INTRINSICS
 #define SUPPORTS_HOTPATH
 #endif

src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs

@@ -184,7 +184,7 @@ public override Task FlushAsync(CancellationToken cancellationToken)
             return Task.CompletedTask;
         }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
         public override ValueTask<int> ReadAsync(
             Memory<byte> buffer,
             CancellationToken cancellationToken = default

src/SharpCompress/Common/AsyncBinaryReader.cs

@@ -82,7 +82,7 @@ public void Dispose()
             }
         }
 
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
         public async ValueTask DisposeAsync()
         {
             if (_disposed)

src/SharpCompress/Common/EntryStream.cs

@@ -93,7 +93,7 @@ protected override void Dispose(bool disposing)
         _stream.Dispose();
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
     {
         if (_isDisposed)
@@ -171,7 +171,7 @@ CancellationToken cancellationToken
         return read;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs

@@ -66,7 +66,7 @@ protected override void Dispose(bool disposing)
         base.Dispose(disposing);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask DisposeAsync()
     {
         if (_isDisposed)
@@ -170,7 +170,7 @@ System.Threading.CancellationToken cancellationToken
         return read;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask<int> ReadAsync(
         System.Memory<byte> buffer,
         System.Threading.CancellationToken cancellationToken = default

src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs

@@ -20,7 +20,7 @@ string password
     {
         _keySize = keySize;
 
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if LEGACY_DOTNET
         var rfc2898 = new Rfc2898DeriveBytes(password, salt, RFC2898_ITERATIONS);
         KeyBytes = rfc2898.GetBytes(KeySizeInBytes);
         IvBytes = rfc2898.GetBytes(KeySizeInBytes);

src/SharpCompress/Compressors/BZip2/BZip2Stream.cs

@@ -98,7 +98,7 @@ public override int Read(byte[] buffer, int offset, int count) =>
 
     public override void SetLength(long value) => stream.SetLength(value);
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
 
     public override int Read(Span<byte> buffer) => stream.Read(buffer);
 

src/SharpCompress/Compressors/Deflate/DeflateStream.cs

@@ -299,7 +299,7 @@ public override async Task FlushAsync(CancellationToken cancellationToken)
         await _baseStream.FlushAsync(cancellationToken).ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
     {
         if (_disposed)
@@ -370,7 +370,7 @@ CancellationToken cancellationToken
             .ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default
@@ -461,7 +461,7 @@ await _baseStream
             .ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask WriteAsync(
         ReadOnlyMemory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Deflate/GZipStream.cs

@@ -345,7 +345,7 @@ CancellationToken cancellationToken
         return n;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default
@@ -454,7 +454,7 @@ CancellationToken cancellationToken
         await BaseStream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask WriteAsync(
         ReadOnlyMemory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs

@@ -552,7 +552,7 @@ protected override void Dispose(bool disposing)
         }
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
     {
         if (isDisposed)
@@ -1171,7 +1171,7 @@ CancellationToken cancellationToken
         return rc;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Deflate/ZlibConstants.cs

@@ -108,13 +108,9 @@ internal static class ZlibConstants
     public const int Z_BUF_ERROR = -5;
 
     /// <summary>
-    /// The size of the working buffer used in the ZlibCodec class. Defaults to 8192 bytes.
+    /// The size of the working buffer used in the ZlibCodec class. Defaults to 16384 bytes.
     /// </summary>
-#if NETCF
-    public const int WorkingBufferSizeDefault = 8192;
-#else
     public const int WorkingBufferSizeDefault = 16384;
-#endif
 
     /// <summary>
     /// The minimum size of the working buffer used in the ZlibCodec class.  Currently it is 128 bytes.

src/SharpCompress/Compressors/Deflate/ZlibStream.cs

@@ -277,7 +277,7 @@ public override async Task FlushAsync(CancellationToken cancellationToken)
         await _baseStream.FlushAsync(cancellationToken).ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
     {
         if (_disposed)
@@ -347,7 +347,7 @@ CancellationToken cancellationToken
             .ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default
@@ -431,7 +431,7 @@ await _baseStream
             .ConfigureAwait(false);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask WriteAsync(
         ReadOnlyMemory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs

@@ -200,7 +200,7 @@ CancellationToken cancellationToken
         return count - remainingCount;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/LZMA/LZipStream.cs

@@ -163,7 +163,7 @@ public override int Read(byte[] buffer, int offset, int count) =>
 
     public override void SetLength(long value) => throw new NotImplementedException();
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
 
     public override ValueTask<int> ReadAsync(
         Memory<byte> buffer,

src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs

@@ -201,7 +201,7 @@ public Decoder()
         }
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     [MemberNotNull(nameof(_outWindow))]
 #endif
     private void CreateDictionary()

src/SharpCompress/Compressors/LZMA/LzmaStream.cs

@@ -632,7 +632,7 @@ await _decoder
         return total;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Rar/MultiVolumeReadOnlyStream.cs

@@ -185,7 +185,7 @@ System.Threading.CancellationToken cancellationToken
         return totalRead;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         System.Threading.CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs

@@ -385,7 +385,7 @@ System.Threading.CancellationToken cancellationToken
         return result;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         System.Threading.CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Rar/RarCrcStream.cs

@@ -129,7 +129,7 @@ System.Threading.CancellationToken cancellationToken
         return result;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         System.Threading.CancellationToken cancellationToken = default

src/SharpCompress/Compressors/Rar/RarStream.cs

@@ -189,7 +189,7 @@ System.Threading.CancellationToken cancellationToken
         return outTotal;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+#if !LEGACY_DOTNET
     public override async System.Threading.Tasks.ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         System.Threading.CancellationToken cancellationToken = default

src/SharpCompress/Compressors/ZStandard/CompressionStream.cs

@@ -74,7 +74,7 @@ public void LoadDictionary(byte[] dict)
 
     ~CompressionStream() => Dispose(false);
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
 #else
     public async ValueTask DisposeAsync()
@@ -145,7 +145,7 @@ private async ValueTask FlushInternalAsync(
     public override void Write(byte[] buffer, int offset, int count) =>
         Write(new ReadOnlySpan<byte>(buffer, offset, count));
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
     public override void Write(ReadOnlySpan<byte> buffer) =>
         WriteInternal(buffer, ZSTD_EndDirective.ZSTD_e_continue);
 #else
@@ -176,7 +176,7 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, ZSTD_EndDirective directiv
         );
     }
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
     private async ValueTask WriteInternalAsync(
         ReadOnlyMemory<byte>? buffer,
         ZSTD_EndDirective directive,
@@ -218,7 +218,7 @@ await innerStream
         );
     }
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
 
     public override Task WriteAsync(
         byte[] buffer,

src/SharpCompress/Compressors/ZStandard/DecompressionStream.cs

@@ -105,7 +105,7 @@ protected override void Dispose(bool disposing)
     public override int Read(byte[] buffer, int offset, int count) =>
         Read(new Span<byte>(buffer, offset, count));
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
     public override int Read(Span<byte> buffer)
 #else
     public int Read(Span<byte> buffer)
@@ -158,7 +158,7 @@ public int Read(Span<byte> buffer)
         }
     }
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
+#if !LEGACY_DOTNET
     public override Task<int> ReadAsync(
         byte[] buffer,
         int offset,
@@ -276,7 +276,7 @@ private void EnsureNotDisposed()
             throw new ObjectDisposedException(nameof(DecompressionStream));
     }
 
-#if NETSTANDARD2_0 || NETFRAMEWORK
+#if LEGACY_DOTNET
     public virtual Task DisposeAsync()
     {
         try

src/SharpCompress/Compressors/ZStandard/UnsafeHelper.cs

@@ -16,7 +16,7 @@ public static unsafe class UnsafeHelper
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void* malloc(ulong size)
     {
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
         var ptr = NativeMemory.Alloc((nuint)size);
 #else
         var ptr = (void*)Marshal.AllocHGlobal((nint)size);
@@ -31,7 +31,7 @@ public static unsafe class UnsafeHelper
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void* calloc(ulong num, ulong size)
     {
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
         return NativeMemory.AllocZeroed((nuint)num, (nuint)size);
 #else
         var total = num * size;
@@ -53,7 +53,7 @@ public static void memset(void* memPtr, byte val, uint size) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void free(void* ptr)
     {
-#if NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
         NativeMemory.Free(ptr);
 #else
         Marshal.FreeHGlobal((IntPtr)ptr);

src/SharpCompress/Crypto/Crc32Stream.cs

@@ -70,7 +70,7 @@ public override int Read(byte[] buffer, int offset, int count) =>
 
     public override void SetLength(long value) => throw new NotSupportedException();
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
 
     public override void Write(ReadOnlySpan<byte> buffer)
     {

src/SharpCompress/IO/BufferedSubStream.cs

@@ -154,7 +154,7 @@ CancellationToken cancellationToken
         return count;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default

src/SharpCompress/IO/ProgressReportingStream.cs

@@ -64,7 +64,7 @@ public override int Read(byte[] buffer, int offset, int count)
         return bytesRead;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override int Read(Span<byte> buffer)
     {
         var bytesRead = _baseStream.Read(buffer);
@@ -95,7 +95,7 @@ CancellationToken cancellationToken
         return bytesRead;
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask<int> ReadAsync(
         Memory<byte> buffer,
         CancellationToken cancellationToken = default
@@ -147,7 +147,7 @@ protected override void Dispose(bool disposing)
         base.Dispose(disposing);
     }
 
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if !LEGACY_DOTNET
     public override async ValueTask DisposeAsync()
     {
         if (!_leaveOpen)