diff --git a/src/SharpCompress/Algorithms/Adler32.cs b/src/SharpCompress/Algorithms/Adler32.cs index f7ea0eb35..d76453270 100644 --- a/src/SharpCompress/Algorithms/Adler32.cs +++ b/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 diff --git a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs index e6b511d83..328d5e33c 100644 --- a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs +++ b/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 ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Common/AsyncBinaryReader.cs b/src/SharpCompress/Common/AsyncBinaryReader.cs index 8c5327aea..f2cdb4a65 100644 --- a/src/SharpCompress/Common/AsyncBinaryReader.cs +++ b/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) diff --git a/src/SharpCompress/Common/EntryStream.cs b/src/SharpCompress/Common/EntryStream.cs index 11d0e898f..e4de4ca9a 100644 --- a/src/SharpCompress/Common/EntryStream.cs +++ b/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 ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs index 4e6ddb700..9a91ba9c5 100644 --- a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs +++ b/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 ReadAsync( System.Memory buffer, System.Threading.CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs b/src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs index da37501b9..9925c5934 100644 --- a/src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs +++ b/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); diff --git a/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs b/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs index e3325f279..898839bc0 100644 --- a/src/SharpCompress/Compressors/BZip2/BZip2Stream.cs +++ b/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 buffer) => stream.Read(buffer); diff --git a/src/SharpCompress/Compressors/Deflate/DeflateStream.cs b/src/SharpCompress/Compressors/Deflate/DeflateStream.cs index 55c24813d..f11ea41b9 100644 --- a/src/SharpCompress/Compressors/Deflate/DeflateStream.cs +++ b/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 ReadAsync( Memory 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 buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Deflate/GZipStream.cs b/src/SharpCompress/Compressors/Deflate/GZipStream.cs index d9af42841..aceacb289 100644 --- a/src/SharpCompress/Compressors/Deflate/GZipStream.cs +++ b/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 ReadAsync( Memory 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 buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs index d3c10f9b7..dd6590b71 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs +++ b/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 ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Deflate/ZlibConstants.cs b/src/SharpCompress/Compressors/Deflate/ZlibConstants.cs index ec415d9ce..7bf8a3f6a 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibConstants.cs +++ b/src/SharpCompress/Compressors/Deflate/ZlibConstants.cs @@ -108,13 +108,9 @@ internal static class ZlibConstants public const int Z_BUF_ERROR = -5; /// - /// 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. /// -#if NETCF - public const int WorkingBufferSizeDefault = 8192; -#else public const int WorkingBufferSizeDefault = 16384; -#endif /// /// The minimum size of the working buffer used in the ZlibCodec class. Currently it is 128 bytes. diff --git a/src/SharpCompress/Compressors/Deflate/ZlibStream.cs b/src/SharpCompress/Compressors/Deflate/ZlibStream.cs index 3365832cc..d94ca210c 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibStream.cs +++ b/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 ReadAsync( Memory 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 buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs b/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs index 3ba9e618e..083f0380a 100644 --- a/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs +++ b/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 ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/LZMA/LZipStream.cs b/src/SharpCompress/Compressors/LZMA/LZipStream.cs index e409e39e6..ddf39e01b 100644 --- a/src/SharpCompress/Compressors/LZMA/LZipStream.cs +++ b/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 ReadAsync( Memory buffer, diff --git a/src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs b/src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs index 95d3d027b..0fb39626f 100644 --- a/src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs +++ b/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() diff --git a/src/SharpCompress/Compressors/LZMA/LzmaStream.cs b/src/SharpCompress/Compressors/LZMA/LzmaStream.cs index 26079966c..1399c0bf7 100644 --- a/src/SharpCompress/Compressors/LZMA/LzmaStream.cs +++ b/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 ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Rar/MultiVolumeReadOnlyStream.cs b/src/SharpCompress/Compressors/Rar/MultiVolumeReadOnlyStream.cs index df1c59592..854b08853 100644 --- a/src/SharpCompress/Compressors/Rar/MultiVolumeReadOnlyStream.cs +++ b/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 ReadAsync( Memory buffer, System.Threading.CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs b/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs index 693d284bd..4ec3cf2cf 100644 --- a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs +++ b/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 ReadAsync( Memory buffer, System.Threading.CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Rar/RarCrcStream.cs b/src/SharpCompress/Compressors/Rar/RarCrcStream.cs index 0ec0527dd..af866c177 100644 --- a/src/SharpCompress/Compressors/Rar/RarCrcStream.cs +++ b/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 ReadAsync( Memory buffer, System.Threading.CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/Rar/RarStream.cs b/src/SharpCompress/Compressors/Rar/RarStream.cs index 21c225c3c..34700edf4 100644 --- a/src/SharpCompress/Compressors/Rar/RarStream.cs +++ b/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 ReadAsync( Memory buffer, System.Threading.CancellationToken cancellationToken = default diff --git a/src/SharpCompress/Compressors/ZStandard/CompressionStream.cs b/src/SharpCompress/Compressors/ZStandard/CompressionStream.cs index af8865b41..df4b4d687 100644 --- a/src/SharpCompress/Compressors/ZStandard/CompressionStream.cs +++ b/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(buffer, offset, count)); -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if !LEGACY_DOTNET public override void Write(ReadOnlySpan buffer) => WriteInternal(buffer, ZSTD_EndDirective.ZSTD_e_continue); #else @@ -176,7 +176,7 @@ private void WriteInternal(ReadOnlySpan buffer, ZSTD_EndDirective directiv ); } -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if !LEGACY_DOTNET private async ValueTask WriteInternalAsync( ReadOnlyMemory? buffer, ZSTD_EndDirective directive, @@ -218,7 +218,7 @@ await innerStream ); } -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if !LEGACY_DOTNET public override Task WriteAsync( byte[] buffer, diff --git a/src/SharpCompress/Compressors/ZStandard/DecompressionStream.cs b/src/SharpCompress/Compressors/ZStandard/DecompressionStream.cs index 78af43513..c1aed7662 100644 --- a/src/SharpCompress/Compressors/ZStandard/DecompressionStream.cs +++ b/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(buffer, offset, count)); -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if !LEGACY_DOTNET public override int Read(Span buffer) #else public int Read(Span buffer) @@ -158,7 +158,7 @@ public int Read(Span buffer) } } -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if !LEGACY_DOTNET public override Task 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 diff --git a/src/SharpCompress/Compressors/ZStandard/UnsafeHelper.cs b/src/SharpCompress/Compressors/ZStandard/UnsafeHelper.cs index b145099b3..a73023c4f 100644 --- a/src/SharpCompress/Compressors/ZStandard/UnsafeHelper.cs +++ b/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); diff --git a/src/SharpCompress/Crypto/Crc32Stream.cs b/src/SharpCompress/Crypto/Crc32Stream.cs index dfbcfac8b..0dbcce8c5 100644 --- a/src/SharpCompress/Crypto/Crc32Stream.cs +++ b/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 buffer) { diff --git a/src/SharpCompress/IO/BufferedSubStream.cs b/src/SharpCompress/IO/BufferedSubStream.cs index 747c97763..7a51bb0ff 100755 --- a/src/SharpCompress/IO/BufferedSubStream.cs +++ b/src/SharpCompress/IO/BufferedSubStream.cs @@ -154,7 +154,7 @@ CancellationToken cancellationToken return count; } -#if !NETFRAMEWORK && !NETSTANDARD2_0 +#if !LEGACY_DOTNET public override async ValueTask ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/IO/ProgressReportingStream.cs b/src/SharpCompress/IO/ProgressReportingStream.cs index 5ed028351..efadba41d 100644 --- a/src/SharpCompress/IO/ProgressReportingStream.cs +++ b/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 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 ReadAsync( Memory 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) diff --git a/src/SharpCompress/IO/ReadOnlySubStream.cs b/src/SharpCompress/IO/ReadOnlySubStream.cs index 86ef16459..c9d7d830a 100644 --- a/src/SharpCompress/IO/ReadOnlySubStream.cs +++ b/src/SharpCompress/IO/ReadOnlySubStream.cs @@ -81,7 +81,7 @@ public override int ReadByte() return value; } -#if !NETFRAMEWORK && !NETSTANDARD2_0 +#if !LEGACY_DOTNET public override int Read(Span buffer) { var sliceLen = BytesLeftToRead < buffer.Length ? BytesLeftToRead : buffer.Length; @@ -117,7 +117,7 @@ CancellationToken cancellationToken return read; } -#if !NETFRAMEWORK && !NETSTANDARD2_0 +#if !LEGACY_DOTNET public override async ValueTask ReadAsync( Memory buffer, CancellationToken cancellationToken = default diff --git a/src/SharpCompress/IO/SharpCompressStream.cs b/src/SharpCompress/IO/SharpCompressStream.cs index 948fdb57f..ad4c6e351 100644 --- a/src/SharpCompress/IO/SharpCompressStream.cs +++ b/src/SharpCompress/IO/SharpCompressStream.cs @@ -384,7 +384,7 @@ public override async Task FlushAsync(CancellationToken cancellationToken) await Stream.FlushAsync(cancellationToken).ConfigureAwait(false); } -#if !NETFRAMEWORK && !NETSTANDARD2_0 +#if !LEGACY_DOTNET public override async ValueTask ReadAsync( Memory buffer, diff --git a/src/SharpCompress/IO/SourceStream.cs b/src/SharpCompress/IO/SourceStream.cs index 0712d915c..e9cc74a63 100644 --- a/src/SharpCompress/IO/SourceStream.cs +++ b/src/SharpCompress/IO/SourceStream.cs @@ -289,7 +289,7 @@ CancellationToken cancellationToken return total - count; } -#if !NETFRAMEWORK && !NETSTANDARD2_0 +#if !LEGACY_DOTNET public override async ValueTask ReadAsync( Memory buffer, diff --git a/src/SharpCompress/NotNullExtensions.cs b/src/SharpCompress/NotNullExtensions.cs index 4fdd355ce..0f5ba99cd 100644 --- a/src/SharpCompress/NotNullExtensions.cs +++ b/src/SharpCompress/NotNullExtensions.cs @@ -21,7 +21,7 @@ public static IEnumerable Empty(this T? source) return source.AsEnumerable(); } -#if NETFRAMEWORK || NETSTANDARD +#if LEGACY_DOTNET [MethodImpl(MethodImplOptions.AggressiveInlining)] public static T NotNull(this T? obj, string? message = null) where T : class diff --git a/src/SharpCompress/Polyfills/StringExtensions.cs b/src/SharpCompress/Polyfills/StringExtensions.cs index 57d1e1bc9..c83dee70e 100644 --- a/src/SharpCompress/Polyfills/StringExtensions.cs +++ b/src/SharpCompress/Polyfills/StringExtensions.cs @@ -1,4 +1,4 @@ -#if NETFRAMEWORK || NETSTANDARD2_0 +#if LEGACY_DOTNET namespace SharpCompress; diff --git a/src/SharpCompress/Readers/AbstractReader.cs b/src/SharpCompress/Readers/AbstractReader.cs index 29e700aaa..123576c29 100644 --- a/src/SharpCompress/Readers/AbstractReader.cs +++ b/src/SharpCompress/Readers/AbstractReader.cs @@ -277,7 +277,7 @@ private async ValueTask SkipAsync(CancellationToken cancellationToken) } } //don't know the size so we have to try to decompress to skip -#if NETFRAMEWORK || NETSTANDARD2_0 +#if LEGACY_DOTNET using var s = await OpenEntryStreamAsync(cancellationToken).ConfigureAwait(false); await s.SkipEntryAsync(cancellationToken).ConfigureAwait(false); #else @@ -344,7 +344,7 @@ internal void Write(Stream writeStream) internal async ValueTask WriteAsync(Stream writeStream, CancellationToken cancellationToken) { -#if NETFRAMEWORK || NETSTANDARD2_0 +#if LEGACY_DOTNET using Stream s = await OpenEntryStreamAsync(cancellationToken).ConfigureAwait(false); var sourceStream = WrapWithProgress(s, Entry); await sourceStream.CopyToAsync(writeStream, 81920, cancellationToken).ConfigureAwait(false); diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj index a48b0b7a7..2e9f4056c 100644 --- a/src/SharpCompress/SharpCompress.csproj +++ b/src/SharpCompress/SharpCompress.csproj @@ -28,6 +28,9 @@ true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + $(DefineConstants);LEGACY_DOTNET + true diff --git a/src/SharpCompress/Utility.cs b/src/SharpCompress/Utility.cs index 5fd18e6bb..5b3ed2ddc 100644 --- a/src/SharpCompress/Utility.cs +++ b/src/SharpCompress/Utility.cs @@ -189,7 +189,7 @@ public async ValueTask SkipAsync( } } -#if NET60_OR_GREATER +#if NET8_0_OR_GREATER public bool ReadFully(byte[] buffer) { try diff --git a/src/SharpCompress/packages.lock.json b/src/SharpCompress/packages.lock.json index 413253332..032c15c49 100644 --- a/src/SharpCompress/packages.lock.json +++ b/src/SharpCompress/packages.lock.json @@ -216,9 +216,9 @@ "net10.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[10.0.0, )", - "resolved": "10.0.0", - "contentHash": "kICGrGYEzCNI3wPzfEXcwNHgTvlvVn9yJDhSdRK+oZQy4jvYH529u7O0xf5ocQKzOMjfS07+3z9PKRIjrFMJDA==" + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ==" }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct",