Merge branch 'master' into adam/xz-wrapped-often

2026-09-25 16:34:45 +00:00 · 2025-10-22 11:51:46 +01:00
parent 42a7ececa0 76afa7d3bf
commit 1db511e9cb
30 changed files with 1058 additions and 425 deletions
--- a/src/SharpCompress/Archives/ArchiveFactory.cs
+++ b/src/SharpCompress/Archives/ArchiveFactory.cs
@@ -45,7 +45,7 @@ public static class ArchiveFactory
    /// <param name="options"></param>
    public static IArchive Open(string filePath, ReaderOptions? options = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), options);
    }

@@ -68,7 +68,7 @@ public static class ArchiveFactory
    /// <param name="options"></param>
    public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? options = null)
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var filesArray = fileInfos.ToArray();
        if (filesArray.Length == 0)
        {
@@ -81,7 +81,7 @@ public static class ArchiveFactory
            return Open(fileInfo, options);
        }

-        fileInfo.CheckNotNull(nameof(fileInfo));
+        fileInfo.NotNull(nameof(fileInfo));
        options ??= new ReaderOptions { LeaveStreamOpen = false };

        return FindFactory<IMultiArchiveFactory>(fileInfo).Open(filesArray, options);
@@ -94,7 +94,7 @@ public static class ArchiveFactory
    /// <param name="options"></param>
    public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var streamsArray = streams.ToArray();
        if (streamsArray.Length == 0)
        {
@@ -107,7 +107,7 @@ public static class ArchiveFactory
            return Open(firstStream, options);
        }

-        firstStream.CheckNotNull(nameof(firstStream));
+        firstStream.NotNull(nameof(firstStream));
        options ??= new ReaderOptions();

        return FindFactory<IMultiArchiveFactory>(firstStream).Open(streamsArray, options);
@@ -129,7 +129,7 @@ public static class ArchiveFactory
    private static T FindFactory<T>(FileInfo finfo)
        where T : IFactory
    {
-        finfo.CheckNotNull(nameof(finfo));
+        finfo.NotNull(nameof(finfo));
        using Stream stream = finfo.OpenRead();
        return FindFactory<T>(stream);
    }
@@ -137,7 +137,7 @@ public static class ArchiveFactory
    private static T FindFactory<T>(Stream stream)
        where T : IFactory
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        if (!stream.CanRead || !stream.CanSeek)
        {
            throw new ArgumentException("Stream should be readable and seekable");
@@ -172,7 +172,7 @@ public static class ArchiveFactory
        int bufferSize = ReaderOptions.DefaultBufferSize
    )
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        using Stream s = File.OpenRead(filePath);
        return IsArchive(s, out type, bufferSize);
    }
@@ -184,7 +184,7 @@ public static class ArchiveFactory
    )
    {
        type = null;
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));

        if (!stream.CanRead || !stream.CanSeek)
        {
@@ -215,7 +215,7 @@ public static class ArchiveFactory
    /// <returns></returns>
    public static IEnumerable<string> GetFileParts(string part1)
    {
-        part1.CheckNotNullOrEmpty(nameof(part1));
+        part1.NotNullOrEmpty(nameof(part1));
        return GetFileParts(new FileInfo(part1)).Select(a => a.FullName);
    }

@@ -226,7 +226,7 @@ public static class ArchiveFactory
    /// <returns></returns>
    public static IEnumerable<FileInfo> GetFileParts(FileInfo part1)
    {
-        part1.CheckNotNull(nameof(part1));
+        part1.NotNull(nameof(part1));
        yield return part1;

        foreach (var factory in Factory.Factories.OfType<IFactory>())
--- a/src/SharpCompress/Archives/GZip/GZipArchive.cs
+++ b/src/SharpCompress/Archives/GZip/GZipArchive.cs
@@ -21,7 +21,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
    /// <param name="readerOptions"></param>
    public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
    }

@@ -32,7 +32,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
    /// <param name="readerOptions"></param>
    public static GZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
    {
-        fileInfo.CheckNotNull(nameof(fileInfo));
+        fileInfo.NotNull(nameof(fileInfo));
        return new GZipArchive(
            new SourceStream(
                fileInfo,
@@ -52,7 +52,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
        ReaderOptions? readerOptions = null
    )
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var files = fileInfos.ToArray();
        return new GZipArchive(
            new SourceStream(
@@ -70,7 +70,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
    /// <param name="readerOptions"></param>
    public static GZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var strms = streams.ToArray();
        return new GZipArchive(
            new SourceStream(
@@ -88,7 +88,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
    /// <param name="readerOptions"></param>
    public static GZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));

        if (stream is not { CanSeek: true })
        {
--- a/src/SharpCompress/Archives/IArchiveEntryExtensions.cs
+++ b/src/SharpCompress/Archives/IArchiveEntryExtensions.cs
@@ -25,7 +25,7 @@ public static class IArchiveEntryExtensions
        using (entryStream)
        {
            using Stream s = new ListeningStream(streamListener, entryStream);
-            s.TransferTo(streamToWriteTo);
+            s.CopyTo(streamToWriteTo);
        }
        streamListener.FireEntryExtractionEnd(archiveEntry);
    }
--- a/src/SharpCompress/Archives/Rar/RarArchive.cs
+++ b/src/SharpCompress/Archives/Rar/RarArchive.cs
@@ -95,7 +95,7 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
    /// <param name="options"></param>
    public static RarArchive Open(string filePath, ReaderOptions? options = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        var fileInfo = new FileInfo(filePath);
        return new RarArchive(
            new SourceStream(
@@ -113,7 +113,7 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
    /// <param name="options"></param>
    public static RarArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
    {
-        fileInfo.CheckNotNull(nameof(fileInfo));
+        fileInfo.NotNull(nameof(fileInfo));
        return new RarArchive(
            new SourceStream(
                fileInfo,
@@ -130,7 +130,7 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
    /// <param name="options"></param>
    public static RarArchive Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));

        if (stream is not { CanSeek: true })
        {
@@ -150,7 +150,7 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
        ReaderOptions? readerOptions = null
    )
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var files = fileInfos.ToArray();
        return new RarArchive(
            new SourceStream(
@@ -168,7 +168,7 @@ public class RarArchive : AbstractArchive<RarArchiveEntry, RarVolume>
    /// <param name="readerOptions"></param>
    public static RarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var strms = streams.ToArray();
        return new RarArchive(
            new SourceStream(
--- a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
+++ b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
@@ -21,7 +21,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
    /// <param name="readerOptions"></param>
    public static SevenZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
    {
-        filePath.CheckNotNullOrEmpty("filePath");
+        filePath.NotNullOrEmpty("filePath");
        return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
    }

@@ -32,7 +32,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
    /// <param name="readerOptions"></param>
    public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
    {
-        fileInfo.CheckNotNull("fileInfo");
+        fileInfo.NotNull("fileInfo");
        return new SevenZipArchive(
            new SourceStream(
                fileInfo,
@@ -52,7 +52,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
        ReaderOptions? readerOptions = null
    )
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var files = fileInfos.ToArray();
        return new SevenZipArchive(
            new SourceStream(
@@ -73,7 +73,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
        ReaderOptions? readerOptions = null
    )
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var strms = streams.ToArray();
        return new SevenZipArchive(
            new SourceStream(
@@ -91,7 +91,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
    /// <param name="readerOptions"></param>
    public static SevenZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
    {
-        stream.CheckNotNull("stream");
+        stream.NotNull("stream");

        if (stream is not { CanSeek: true })
        {
--- a/src/SharpCompress/Archives/Tar/TarArchive.cs
+++ b/src/SharpCompress/Archives/Tar/TarArchive.cs
@@ -22,7 +22,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
    /// <param name="readerOptions"></param>
    public static TarArchive Open(string filePath, ReaderOptions? readerOptions = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
    }

@@ -33,7 +33,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
    /// <param name="readerOptions"></param>
    public static TarArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
    {
-        fileInfo.CheckNotNull(nameof(fileInfo));
+        fileInfo.NotNull(nameof(fileInfo));
        return new TarArchive(
            new SourceStream(
                fileInfo,
@@ -53,7 +53,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
        ReaderOptions? readerOptions = null
    )
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var files = fileInfos.ToArray();
        return new TarArchive(
            new SourceStream(
@@ -71,7 +71,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
    /// <param name="readerOptions"></param>
    public static TarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var strms = streams.ToArray();
        return new TarArchive(
            new SourceStream(
@@ -89,7 +89,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
    /// <param name="readerOptions"></param>
    public static TarArchive Open(Stream stream, ReaderOptions? readerOptions = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));

        if (stream is not { CanSeek: true })
        {
@@ -178,7 +178,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
                        using (var entryStream = entry.OpenEntryStream())
                        {
                            using var memoryStream = new MemoryStream();
-                            entryStream.TransferTo(memoryStream);
+                            entryStream.CopyTo(memoryStream);
                            memoryStream.Position = 0;
                            var bytes = memoryStream.ToArray();

--- a/src/SharpCompress/Archives/Zip/ZipArchive.cs
+++ b/src/SharpCompress/Archives/Zip/ZipArchive.cs
@@ -43,7 +43,7 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
    /// <param name="readerOptions"></param>
    public static ZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
    }

@@ -54,7 +54,7 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
    /// <param name="readerOptions"></param>
    public static ZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
    {
-        fileInfo.CheckNotNull(nameof(fileInfo));
+        fileInfo.NotNull(nameof(fileInfo));
        return new ZipArchive(
            new SourceStream(
                fileInfo,
@@ -74,7 +74,7 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
        ReaderOptions? readerOptions = null
    )
    {
-        fileInfos.CheckNotNull(nameof(fileInfos));
+        fileInfos.NotNull(nameof(fileInfos));
        var files = fileInfos.ToArray();
        return new ZipArchive(
            new SourceStream(
@@ -92,7 +92,7 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
    /// <param name="readerOptions"></param>
    public static ZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        var strms = streams.ToArray();
        return new ZipArchive(
            new SourceStream(
@@ -110,7 +110,7 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
    /// <param name="readerOptions"></param>
    public static ZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));

        if (stream is not { CanSeek: true })
        {
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
@@ -413,7 +413,7 @@ internal partial class Unpack
                            else
                            //x memcpy(Mem,Window+BlockStart,BlockLength);
                            {
-                                Utility.Copy(Window, BlockStart, Mem, 0, BlockLength);
+                                Buffer.BlockCopy(Window, (int)BlockStart, Mem, 0, (int)BlockLength);
                            }
                        }
                        else
@@ -427,9 +427,21 @@ internal partial class Unpack
                            else
                            {
                                //x memcpy(Mem,Window+BlockStart,FirstPartLength);
-                                Utility.Copy(Window, BlockStart, Mem, 0, FirstPartLength);
+                                Buffer.BlockCopy(
+                                    Window,
+                                    (int)BlockStart,
+                                    Mem,
+                                    0,
+                                    (int)FirstPartLength
+                                );
                                //x memcpy(Mem+FirstPartLength,Window,BlockEnd);
-                                Utility.Copy(Window, 0, Mem, FirstPartLength, BlockEnd);
+                                Buffer.BlockCopy(
+                                    Window,
+                                    0,
+                                    Mem,
+                                    (int)FirstPartLength,
+                                    (int)BlockEnd
+                                );
                            }
                        }

--- a/src/SharpCompress/Factories/Factory.cs
+++ b/src/SharpCompress/Factories/Factory.cs
@@ -34,7 +34,7 @@ public abstract class Factory : IFactory
    /// <exception cref="ArgumentNullException"><paramref name="factory"/> must not be null.</exception>
    public static void RegisterFactory(Factory factory)
    {
-        factory.CheckNotNull(nameof(factory));
+        factory.NotNull(nameof(factory));

        _factories.Add(factory);
    }
--- a/src/SharpCompress/LazyReadOnlyCollection.cs
+++ b/src/SharpCompress/LazyReadOnlyCollection.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;

-namespace SharpCompress.Helpers;
+namespace SharpCompress;

 internal sealed class LazyReadOnlyCollection<T> : ICollection<T>
 {
--- a/src/SharpCompress/NotNullExtensions.cs
+++ b/src/SharpCompress/NotNullExtensions.cs
@@ -4,20 +4,19 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.CompilerServices;

-namespace SharpCompress.Helpers;
+namespace SharpCompress;

 internal static class NotNullExtensions
 {
    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static IEnumerable<T> Empty<T>(this IEnumerable<T>? source) =>
-        source ?? Enumerable.Empty<T>();
+    public static IEnumerable<T> Empty<T>(this IEnumerable<T>? source) => source ?? [];

    [MethodImpl(MethodImplOptions.AggressiveInlining)]
    public static IEnumerable<T> Empty<T>(this T? source)
    {
        if (source is null)
        {
-            return Enumerable.Empty<T>();
+            return [];
        }
        return source.AsEnumerable();
    }
@@ -68,4 +67,14 @@ internal static class NotNullExtensions
        return obj.Value;
    }
 #endif
+
+    public static string NotNullOrEmpty(this string obj, string name)
+    {
+        obj.NotNull(name);
+        if (obj.Length == 0)
+        {
+            throw new ArgumentException("String is empty.", name);
+        }
+        return obj;
+    }
 }
--- a/src/SharpCompress/Readers/Arc/ArcReader.cs
+++ b/src/SharpCompress/Readers/Arc/ArcReader.cs
@@ -24,7 +24,7 @@ namespace SharpCompress.Readers.Arc
        /// <returns></returns>
        public static ArcReader Open(Stream stream, ReaderOptions? options = null)
        {
-            stream.CheckNotNull(nameof(stream));
+            stream.NotNull(nameof(stream));
            return new ArcReader(stream, options ?? new ReaderOptions());
        }

--- a/src/SharpCompress/Readers/GZip/GZipReader.cs
+++ b/src/SharpCompress/Readers/GZip/GZipReader.cs
@@ -22,7 +22,7 @@ public class GZipReader : AbstractReader<GZipEntry, GZipVolume>
    /// <returns></returns>
    public static GZipReader Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        return new GZipReader(stream, options ?? new ReaderOptions());
    }

--- a/src/SharpCompress/Readers/Rar/RarReader.cs
+++ b/src/SharpCompress/Readers/Rar/RarReader.cs
@@ -42,7 +42,7 @@ public abstract class RarReader : AbstractReader<RarReaderEntry, RarVolume>

    public static RarReader Open(string filePath, ReaderOptions? options = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), options);
    }

@@ -71,7 +71,7 @@ public abstract class RarReader : AbstractReader<RarReaderEntry, RarVolume>
    /// <returns></returns>
    public static RarReader Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        return new SingleVolumeRarReader(stream, options ?? new ReaderOptions());
    }

@@ -83,7 +83,7 @@ public abstract class RarReader : AbstractReader<RarReaderEntry, RarVolume>
    /// <returns></returns>
    public static RarReader Open(IEnumerable<Stream> streams, ReaderOptions? options = null)
    {
-        streams.CheckNotNull(nameof(streams));
+        streams.NotNull(nameof(streams));
        return new MultiVolumeRarReader(streams, options ?? new ReaderOptions());
    }

--- a/src/SharpCompress/Readers/ReaderFactory.cs
+++ b/src/SharpCompress/Readers/ReaderFactory.cs
@@ -11,7 +11,7 @@ public static class ReaderFactory
 {
    public static IReader Open(string filePath, ReaderOptions? options = null)
    {
-        filePath.CheckNotNullOrEmpty(nameof(filePath));
+        filePath.NotNullOrEmpty(nameof(filePath));
        return Open(new FileInfo(filePath), options);
    }

@@ -29,7 +29,7 @@ public static class ReaderFactory
    /// <returns></returns>
    public static IReader Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        options ??= new ReaderOptions() { LeaveStreamOpen = false };

        var bStream = new SharpCompressStream(stream, bufferSize: options.BufferSize);
--- a/src/SharpCompress/Readers/Tar/TarReader.cs
+++ b/src/SharpCompress/Readers/Tar/TarReader.cs
@@ -55,7 +55,7 @@ public class TarReader : AbstractReader<TarEntry, TarVolume>
    /// <returns></returns>
    public static TarReader Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        options = options ?? new ReaderOptions();
        var rewindableStream = new SharpCompressStream(stream);

--- a/src/SharpCompress/Readers/Zip/ZipReader.cs
+++ b/src/SharpCompress/Readers/Zip/ZipReader.cs
@@ -44,7 +44,7 @@ public class ZipReader : AbstractReader<ZipEntry, ZipVolume>
    /// <returns></returns>
    public static ZipReader Open(Stream stream, ReaderOptions? options = null)
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        return new ZipReader(stream, options ?? new ReaderOptions());
    }

@@ -54,7 +54,7 @@ public class ZipReader : AbstractReader<ZipEntry, ZipVolume>
        IEnumerable<ZipEntry> entries
    )
    {
-        stream.CheckNotNull(nameof(stream));
+        stream.NotNull(nameof(stream));
        return new ZipReader(stream, options ?? new ReaderOptions(), entries);
    }

--- a/src/SharpCompress/SharpCompress.csproj
+++ b/src/SharpCompress/SharpCompress.csproj
@@ -35,9 +35,14 @@
    <DefineConstants>$(DefineConstants);DEBUG_STREAMS</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="System.Buffers" />
    <PackageReference Include="ZstdSharp.Port" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'net481' ">
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    <PackageReference Include="System.Text.Encoding.CodePages" />
+    <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Memory" />
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
--- a/src/SharpCompress/Utility.cs
+++ b/src/SharpCompress/Utility.cs
@@ -1,4 +1,3 @@
-global using SharpCompress.Helpers;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
@@ -7,10 +6,14 @@ using System.IO;
 using System.Text;
 using SharpCompress.Readers;

-namespace SharpCompress.Helpers;
+namespace SharpCompress;

 internal static class Utility
 {
+    //80kb is a good industry standard temporary buffer size
+    private const int TEMP_BUFFER_SIZE = 81920;
+    private static readonly HashSet<char> invalidChars = new(Path.GetInvalidFileNameChars());
+
    public static ReadOnlyCollection<T> ToReadOnly<T>(this IList<T> items) => new(items);

    /// <summary>
@@ -68,60 +71,11 @@ internal static class Utility
        }
    }

-    public static void Copy(
-        Array sourceArray,
-        long sourceIndex,
-        Array destinationArray,
-        long destinationIndex,
-        long length
-    )
-    {
-        if (sourceIndex > int.MaxValue || sourceIndex < int.MinValue)
-        {
-            throw new ArgumentOutOfRangeException(nameof(sourceIndex));
-        }
-
-        if (destinationIndex > int.MaxValue || destinationIndex < int.MinValue)
-        {
-            throw new ArgumentOutOfRangeException(nameof(destinationIndex));
-        }
-
-        if (length > int.MaxValue || length < int.MinValue)
-        {
-            throw new ArgumentOutOfRangeException(nameof(length));
-        }
-
-        Array.Copy(
-            sourceArray,
-            (int)sourceIndex,
-            destinationArray,
-            (int)destinationIndex,
-            (int)length
-        );
-    }
-
    public static IEnumerable<T> AsEnumerable<T>(this T item)
    {
        yield return item;
    }

-    public static void CheckNotNull(this object obj, string name)
-    {
-        if (obj is null)
-        {
-            throw new ArgumentNullException(name);
-        }
-    }
-
-    public static void CheckNotNullOrEmpty(this string obj, string name)
-    {
-        obj.CheckNotNull(name);
-        if (obj.Length == 0)
-        {
-            throw new ArgumentException("String is empty.", name);
-        }
-    }
-
    public static void Skip(this Stream source, long advanceAmount)
    {
        if (source.CanSeek)
@@ -130,79 +84,23 @@ internal static class Utility
            return;
        }

-        var buffer = GetTransferByteArray();
-        try
+        using var buffer = MemoryPool<byte>.Shared.Rent(TEMP_BUFFER_SIZE);
+        while (advanceAmount > 0)
        {
-            var read = 0;
-            var readCount = 0;
-            do
+            var toRead = (int)Math.Min(buffer.Memory.Length, advanceAmount);
+            var read = source.Read(buffer.Memory.Slice(0, toRead).Span);
+            if (read <= 0)
            {
-                readCount = buffer.Length;
-                if (readCount > advanceAmount)
-                {
-                    readCount = (int)advanceAmount;
-                }
-                read = source.Read(buffer, 0, readCount);
-                if (read <= 0)
-                {
-                    break;
-                }
-                advanceAmount -= read;
-                if (advanceAmount == 0)
-                {
-                    break;
-                }
-            } while (true);
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
+                break;
+            }
+            advanceAmount -= read;
        }
    }

    public static void Skip(this Stream source)
    {
-        var buffer = GetTransferByteArray();
-        try
-        {
-            do { } while (source.Read(buffer, 0, buffer.Length) == buffer.Length);
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-    }
-
-    public static bool Find(this Stream source, byte[] array)
-    {
-        var buffer = GetTransferByteArray();
-        try
-        {
-            var count = 0;
-            var len = source.Read(buffer, 0, buffer.Length);
-
-            do
-            {
-                for (var i = 0; i < len; i++)
-                {
-                    if (array[count] == buffer[i])
-                    {
-                        count++;
-                        if (count == array.Length)
-                        {
-                            source.Position = source.Position - len + i - array.Length + 1;
-                            return true;
-                        }
-                    }
-                }
-            } while ((len = source.Read(buffer, 0, buffer.Length)) > 0);
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(buffer);
-        }
-
-        return false;
+        using var buffer = MemoryPool<byte>.Shared.Rent(TEMP_BUFFER_SIZE);
+        while (source.Read(buffer.Memory.Span) > 0) { }
    }

    public static DateTime DosDateToDateTime(ushort iDate, ushort iTime)
@@ -271,31 +169,12 @@ internal static class Utility
        return sTime.AddSeconds(unixtime);
    }

-    public static long TransferTo(this Stream source, Stream destination)
-    {
-        var array = GetTransferByteArray();
-        try
-        {
-            long total = 0;
-            while (ReadTransferBlock(source, array, out var count))
-            {
-                destination.Write(array, 0, count);
-                total += count;
-            }
-            return total;
-        }
-        finally
-        {
-            ArrayPool<byte>.Shared.Return(array);
-        }
-    }
-
    public static long TransferTo(this Stream source, Stream destination, long maxLength)
    {
-        var array = GetTransferByteArray();
-        var maxReadSize = array.Length;
+        var array = ArrayPool<byte>.Shared.Rent(TEMP_BUFFER_SIZE);
        try
        {
+            var maxReadSize = array.Length;
            long total = 0;
            var remaining = maxLength;
            if (remaining < maxReadSize)
@@ -331,12 +210,13 @@ internal static class Utility
        IReaderExtractionListener readerExtractionListener
    )
    {
-        var array = GetTransferByteArray();
+        var array = ArrayPool<byte>.Shared.Rent(TEMP_BUFFER_SIZE);
        try
        {
            var iterations = 0;
            long total = 0;
-            while (ReadTransferBlock(source, array, out var count))
+            int count;
+            while ((count = source.Read(array, 0, array.Length)) != 0)
            {
                total += count;
                destination.Write(array, 0, count);
@@ -351,12 +231,10 @@ internal static class Utility
        }
    }

-    private static bool ReadTransferBlock(Stream source, byte[] array, out int count) =>
-        (count = source.Read(array, 0, array.Length)) != 0;
-
-    private static bool ReadTransferBlock(Stream source, byte[] array, int size, out int count)
+    private static bool ReadTransferBlock(Stream source, byte[] array, int maxSize, out int count)
    {
-        if (size > array.Length)
+        var size = maxSize;
+        if (maxSize > array.Length)
        {
            size = array.Length;
        }
@@ -364,8 +242,34 @@ internal static class Utility
        return count != 0;
    }

-    private static byte[] GetTransferByteArray() => ArrayPool<byte>.Shared.Rent(81920);
+#if NET60_OR_GREATER

+    public static bool ReadFully(this Stream stream, byte[] buffer)
+    {
+        try
+        {
+            stream.ReadExactly(buffer);
+            return true;
+        }
+        catch (EndOfStreamException)
+        {
+            return false;
+        }
+    }
+
+    public static bool ReadFully(this Stream stream, Span<byte> buffer)
+    {
+        try
+        {
+            stream.ReadExactly(buffer);
+            return true;
+        }
+        catch (EndOfStreamException)
+        {
+            return false;
+        }
+    }
+#else
    public static bool ReadFully(this Stream stream, byte[] buffer)
    {
        var total = 0;
@@ -395,6 +299,7 @@ internal static class Utility
        }
        return (total >= buffer.Length);
    }
+#endif

    public static string TrimNulls(this string source) => source.Replace('\0', ' ').Trim();

@@ -439,7 +344,6 @@ internal static class Utility

    public static string ReplaceInvalidFileNameChars(string fileName)
    {
-        var invalidChars = new HashSet<char>(Path.GetInvalidFileNameChars());
        var sb = new StringBuilder(fileName.Length);
        foreach (var c in fileName)
        {
--- a/src/SharpCompress/Writers/GZip/GZipWriter.cs
+++ b/src/SharpCompress/Writers/GZip/GZipWriter.cs
@@ -47,7 +47,7 @@ public sealed class GZipWriter : AbstractWriter
        var stream = (GZipStream)OutputStream;
        stream.FileName = filename;
        stream.LastModified = modificationTime;
-        source.TransferTo(stream);
+        source.CopyTo(stream);
        _wroteToStream = true;
    }
 }
--- a/src/SharpCompress/Writers/Zip/ZipWriter.cs
+++ b/src/SharpCompress/Writers/Zip/ZipWriter.cs
@@ -83,7 +83,7 @@ public class ZipWriter : AbstractWriter
    public void Write(string entryPath, Stream source, ZipWriterEntryOptions zipWriterEntryOptions)
    {
        using var output = WriteToStream(entryPath, zipWriterEntryOptions);
-        source.TransferTo(output);
+        source.CopyTo(output);
    }

    public Stream WriteToStream(string entryPath, ZipWriterEntryOptions options)
--- a/src/SharpCompress/packages.lock.json
+++ b/src/SharpCompress/packages.lock.json
@@ -2,6 +2,15 @@
  "version": 2,
  "dependencies": {
    ".NETFramework,Version=v4.8": {
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
      "Microsoft.NETFramework.ReferenceAssemblies": {
        "type": "Direct",
        "requested": "[1.0.3, )",
@@ -23,9 +32,30 @@
      },
      "System.Buffers": {
        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA=="
+        "requested": "[4.6.1, )",
+        "resolved": "4.6.1",
+        "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw=="
+      },
+      "System.Memory": {
+        "type": "Direct",
+        "requested": "[4.6.3, )",
+        "resolved": "4.6.3",
+        "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==",
+        "dependencies": {
+          "System.Buffers": "4.6.1",
+          "System.Numerics.Vectors": "4.6.1",
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+        }
+      },
+      "System.Text.Encoding.CodePages": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==",
+        "dependencies": {
+          "System.Memory": "4.5.5",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+        }
      },
      "ZstdSharp.Port": {
        "type": "Direct",
@@ -55,13 +85,13 @@
      },
      "System.Numerics.Vectors": {
        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
+        "resolved": "4.6.1",
+        "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q=="
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
@@ -70,29 +100,18 @@
        "dependencies": {
          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
-      },
+      }
+    },
+    ".NETFramework,Version=v4.8.1": {
      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
+        "type": "Direct",
        "requested": "[8.0.0, )",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "resolved": "8.0.0",
+        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
        "dependencies": {
          "System.Threading.Tasks.Extensions": "4.5.4"
        }
      },
-      "System.Memory": {
-        "type": "CentralTransitive",
-        "requested": "[4.6.0, )",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Numerics.Vectors": "4.5.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
-      }
-    },
-    ".NETFramework,Version=v4.8.1": {
      "Microsoft.NETFramework.ReferenceAssemblies": {
        "type": "Direct",
        "requested": "[1.0.3, )",
@@ -114,9 +133,30 @@
      },
      "System.Buffers": {
        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA=="
+        "requested": "[4.6.1, )",
+        "resolved": "4.6.1",
+        "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw=="
+      },
+      "System.Memory": {
+        "type": "Direct",
+        "requested": "[4.6.3, )",
+        "resolved": "4.6.3",
+        "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==",
+        "dependencies": {
+          "System.Buffers": "4.6.1",
+          "System.Numerics.Vectors": "4.6.1",
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+        }
+      },
+      "System.Text.Encoding.CodePages": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==",
+        "dependencies": {
+          "System.Memory": "4.5.5",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+        }
      },
      "ZstdSharp.Port": {
        "type": "Direct",
@@ -146,13 +186,13 @@
      },
      "System.Numerics.Vectors": {
        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
+        "resolved": "4.6.1",
+        "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q=="
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
@@ -161,26 +201,6 @@
        "dependencies": {
          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
-      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "System.Memory": {
-        "type": "CentralTransitive",
-        "requested": "[4.6.0, )",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Numerics.Vectors": "4.5.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
      }
    },
    ".NETStandard,Version=v2.0": {
@@ -193,15 +213,6 @@
          "System.Threading.Tasks.Extensions": "4.5.4"
        }
      },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
      "Microsoft.SourceLink.GitHub": {
        "type": "Direct",
        "requested": "[8.0.0, )",
@@ -221,21 +232,15 @@
          "Microsoft.NETCore.Platforms": "1.1.0"
        }
      },
-      "System.Buffers": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA=="
-      },
      "System.Memory": {
        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==",
+        "requested": "[4.6.3, )",
+        "resolved": "4.6.3",
+        "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==",
        "dependencies": {
-          "System.Buffers": "4.6.0",
-          "System.Numerics.Vectors": "4.6.0",
-          "System.Runtime.CompilerServices.Unsafe": "6.1.0"
+          "System.Buffers": "4.6.1",
+          "System.Numerics.Vectors": "4.6.1",
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
        }
      },
      "System.Text.Encoding.CodePages": {
@@ -269,11 +274,6 @@
        "resolved": "1.1.0",
        "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
-      },
      "Microsoft.SourceLink.Common": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -281,13 +281,13 @@
      },
      "System.Numerics.Vectors": {
        "type": "Transitive",
-        "resolved": "4.6.0",
-        "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg=="
+        "resolved": "4.6.1",
+        "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q=="
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.1.0",
-        "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
@@ -296,18 +296,15 @@
        "dependencies": {
          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
+      },
+      "System.Buffers": {
+        "type": "CentralTransitive",
+        "requested": "[4.6.1, )",
+        "resolved": "4.6.1",
+        "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw=="
      }
    },
    "net6.0": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
      "Microsoft.SourceLink.GitHub": {
        "type": "Direct",
        "requested": "[8.0.0, )",
@@ -318,12 +315,6 @@
          "Microsoft.SourceLink.Common": "8.0.0"
        }
      },
-      "System.Buffers": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA=="
-      },
      "ZstdSharp.Port": {
        "type": "Direct",
        "requested": "[0.8.6, )",
@@ -335,11 +326,6 @@
        "resolved": "8.0.0",
        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
-      },
      "Microsoft.SourceLink.Common": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -353,15 +339,6 @@
        "resolved": "8.0.17",
        "contentHash": "x5/y4l8AtshpBOrCZdlE4txw8K3e3s9meBFeZeR3l8hbbku2V7kK6ojhXvrbjg1rk3G+JqL1BI26gtgc1ZrdUw=="
      },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
      "Microsoft.SourceLink.GitHub": {
        "type": "Direct",
        "requested": "[8.0.0, )",
@@ -372,12 +349,6 @@
          "Microsoft.SourceLink.Common": "8.0.0"
        }
      },
-      "System.Buffers": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA=="
-      },
      "ZstdSharp.Port": {
        "type": "Direct",
        "requested": "[0.8.6, )",
@@ -389,11 +360,6 @@
        "resolved": "8.0.0",
        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
-      },
      "Microsoft.SourceLink.Common": {
        "type": "Transitive",
        "resolved": "8.0.0",