diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 00b1a064..393d1879 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,10 +3,11 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.28.1", + "version": "0.30.6", "commands": [ "dotnet-csharpier" - ] + ], + "rollForward": false } } } \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 498bf1b5..1108acd8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,19 +1,19 @@ - + - + - + - - - - + + + + - \ No newline at end of file + diff --git a/src/SharpCompress/Algorithms/Adler32.cs b/src/SharpCompress/Algorithms/Adler32.cs index 10dbfc4d..f7ea0eb3 100644 --- a/src/SharpCompress/Algorithms/Adler32.cs +++ b/src/SharpCompress/Algorithms/Adler32.cs @@ -141,7 +141,7 @@ public static int EvenReduceSum(Vector256 accumulator) 4, 3, 2, - 1 // tap2 + 1, // tap2 }; #endif diff --git a/src/SharpCompress/Common/ArchiveType.cs b/src/SharpCompress/Common/ArchiveType.cs index 49b35387..f9c7db09 100644 --- a/src/SharpCompress/Common/ArchiveType.cs +++ b/src/SharpCompress/Common/ArchiveType.cs @@ -6,5 +6,5 @@ public enum ArchiveType Zip, Tar, SevenZip, - GZip + GZip, } diff --git a/src/SharpCompress/Common/CompressionType.cs b/src/SharpCompress/Common/CompressionType.cs index 927c1e7a..45b6aeeb 100644 --- a/src/SharpCompress/Common/CompressionType.cs +++ b/src/SharpCompress/Common/CompressionType.cs @@ -21,5 +21,5 @@ public enum CompressionType Reduce2, Reduce3, Reduce4, - Explode + Explode, } diff --git a/src/SharpCompress/Common/Rar/Headers/Flags.cs b/src/SharpCompress/Common/Rar/Headers/Flags.cs index 990dbc99..ef654ad5 100644 --- a/src/SharpCompress/Common/Rar/Headers/Flags.cs +++ b/src/SharpCompress/Common/Rar/Headers/Flags.cs @@ -13,7 +13,7 @@ public enum HeaderType : byte Sign, NewSub, EndArchive, - Crypt + Crypt, } internal static class HeaderCodeV diff --git a/src/SharpCompress/Common/SevenZip/SevenZipFilePart.cs b/src/SharpCompress/Common/SevenZip/SevenZipFilePart.cs index fe221b53..d1b882fb 100644 --- a/src/SharpCompress/Common/SevenZip/SevenZipFilePart.cs +++ b/src/SharpCompress/Common/SevenZip/SevenZipFilePart.cs @@ -86,7 +86,7 @@ private CompressionType GetCompression() K_LZMA or K_LZMA2 => CompressionType.LZMA, K_PPMD => CompressionType.PPMd, K_B_ZIP2 => CompressionType.BZip2, - _ => throw new NotImplementedException() + _ => throw new NotImplementedException(), }; } diff --git a/src/SharpCompress/Common/Tar/Headers/EntryType.cs b/src/SharpCompress/Common/Tar/Headers/EntryType.cs index 3e6877c7..2dc4dbd1 100644 --- a/src/SharpCompress/Common/Tar/Headers/EntryType.cs +++ b/src/SharpCompress/Common/Tar/Headers/EntryType.cs @@ -14,5 +14,5 @@ internal enum EntryType : byte LongName = (byte)'L', SparseFile = (byte)'S', VolumeHeader = (byte)'V', - GlobalExtendedHeader = (byte)'g' + GlobalExtendedHeader = (byte)'g', } diff --git a/src/SharpCompress/Common/Tar/Headers/TarHeader.cs b/src/SharpCompress/Common/Tar/Headers/TarHeader.cs index 72c83612..0dcbbde2 100644 --- a/src/SharpCompress/Common/Tar/Headers/TarHeader.cs +++ b/src/SharpCompress/Common/Tar/Headers/TarHeader.cs @@ -314,7 +314,7 @@ private static long ReadAsciiInt64(byte[] buffer, int offset, int count) (byte)' ', (byte)' ', (byte)' ', - (byte)' ' + (byte)' ', }; internal static bool checkChecksum(byte[] buf) diff --git a/src/SharpCompress/Common/Zip/Headers/HeaderFlags.cs b/src/SharpCompress/Common/Zip/Headers/HeaderFlags.cs index 5aef3394..728f56b4 100644 --- a/src/SharpCompress/Common/Zip/Headers/HeaderFlags.cs +++ b/src/SharpCompress/Common/Zip/Headers/HeaderFlags.cs @@ -13,5 +13,5 @@ internal enum HeaderFlags : ushort EnhancedDeflate = 16, //Bit 11: Language encoding flag - Efs = 2048 + Efs = 2048, } diff --git a/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs b/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs index f90272c4..daedd9a6 100644 --- a/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs +++ b/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs @@ -14,7 +14,7 @@ internal enum ExtraDataType : ushort // -Info-ZIP Unicode Path Extra Field UnicodePathExtraField = 0x7075, Zip64ExtendedInformationExtraField = 0x0001, - UnixTimeExtraField = 0x5455 + UnixTimeExtraField = 0x5455, } internal class ExtraData @@ -229,7 +229,7 @@ private enum RecordedTimeFlag None = 0, LastModified = 1, LastAccessed = 2, - Created = 4 + Created = 4, } } @@ -238,11 +238,14 @@ internal static class LocalEntryHeaderExtraFactory internal static ExtraData Create(ExtraDataType type, ushort length, byte[] extraData) => type switch { - ExtraDataType.UnicodePathExtraField - => new ExtraUnicodePathExtraField(type, length, extraData), - ExtraDataType.Zip64ExtendedInformationExtraField - => new Zip64ExtendedInformationExtraField(type, length, extraData), + ExtraDataType.UnicodePathExtraField => new ExtraUnicodePathExtraField( + type, + length, + extraData + ), + ExtraDataType.Zip64ExtendedInformationExtraField => + new Zip64ExtendedInformationExtraField(type, length, extraData), ExtraDataType.UnixTimeExtraField => new UnixTimeExtraField(type, length, extraData), - _ => new ExtraData(type, length, extraData) + _ => new ExtraData(type, length, extraData), }; } diff --git a/src/SharpCompress/Common/Zip/Headers/ZipHeaderType.cs b/src/SharpCompress/Common/Zip/Headers/ZipHeaderType.cs index 62c29d89..75cce8d8 100644 --- a/src/SharpCompress/Common/Zip/Headers/ZipHeaderType.cs +++ b/src/SharpCompress/Common/Zip/Headers/ZipHeaderType.cs @@ -8,5 +8,5 @@ internal enum ZipHeaderType DirectoryEnd, Split, Zip64DirectoryEnd, - Zip64DirectoryEndLocator + Zip64DirectoryEndLocator, } diff --git a/src/SharpCompress/Common/Zip/PkwareTraditionalCryptoStream.cs b/src/SharpCompress/Common/Zip/PkwareTraditionalCryptoStream.cs index 6ac48c6f..f8914c68 100644 --- a/src/SharpCompress/Common/Zip/PkwareTraditionalCryptoStream.cs +++ b/src/SharpCompress/Common/Zip/PkwareTraditionalCryptoStream.cs @@ -6,7 +6,7 @@ namespace SharpCompress.Common.Zip; internal enum CryptoMode { Encrypt, - Decrypt + Decrypt, } internal class PkwareTraditionalCryptoStream : Stream diff --git a/src/SharpCompress/Common/Zip/WinzipAesKeySize.cs b/src/SharpCompress/Common/Zip/WinzipAesKeySize.cs index 7772bcaa..276a3504 100644 --- a/src/SharpCompress/Common/Zip/WinzipAesKeySize.cs +++ b/src/SharpCompress/Common/Zip/WinzipAesKeySize.cs @@ -4,5 +4,5 @@ internal enum WinzipAesKeySize { KeySize128 = 1, KeySize192 = 2, - KeySize256 = 3 + KeySize256 = 3, } diff --git a/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs b/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs index b4147eee..834197c0 100644 --- a/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs +++ b/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs @@ -16,5 +16,5 @@ internal enum ZipCompressionMethod ZStd = 93, Xz = 95, PPMd = 98, - WinzipAes = 0x63 //http://www.winzip.com/aes_info.htm + WinzipAes = 0x63, //http://www.winzip.com/aes_info.htm } diff --git a/src/SharpCompress/Common/Zip/ZipEntry.cs b/src/SharpCompress/Common/Zip/ZipEntry.cs index 802dd19a..d8e947f8 100644 --- a/src/SharpCompress/Common/Zip/ZipEntry.cs +++ b/src/SharpCompress/Common/Zip/ZipEntry.cs @@ -46,7 +46,7 @@ internal ZipEntry(ZipFilePart? filePart) ZipCompressionMethod.Reduce3 => CompressionType.Reduce3, ZipCompressionMethod.Reduce4 => CompressionType.Reduce4, ZipCompressionMethod.Explode => CompressionType.Explode, - _ => CompressionType.Unknown + _ => CompressionType.Unknown, }; public override long Crc => _filePart?.Header.Crc ?? 0; diff --git a/src/SharpCompress/Compressors/BZip2/BZip2Constants.cs b/src/SharpCompress/Compressors/BZip2/BZip2Constants.cs index cfeb02e4..85c63b39 100644 --- a/src/SharpCompress/Compressors/BZip2/BZip2Constants.cs +++ b/src/SharpCompress/Compressors/BZip2/BZip2Constants.cs @@ -555,6 +555,6 @@ internal class BZip2Constants 858, 364, 936, - 638 + 638, }; } diff --git a/src/SharpCompress/Compressors/BZip2/CBZip2OutputStream.cs b/src/SharpCompress/Compressors/BZip2/CBZip2OutputStream.cs index bf01c2c3..5e78c5fa 100644 --- a/src/SharpCompress/Compressors/BZip2/CBZip2OutputStream.cs +++ b/src/SharpCompress/Compressors/BZip2/CBZip2OutputStream.cs @@ -1829,7 +1829,7 @@ because the number of elems to sort is 88573, 265720, 797161, - 2391484 + 2391484, }; private void AllocateCompressStructures() diff --git a/src/SharpCompress/Compressors/BZip2/CRC.cs b/src/SharpCompress/Compressors/BZip2/CRC.cs index 9f593c40..6e8e034a 100644 --- a/src/SharpCompress/Compressors/BZip2/CRC.cs +++ b/src/SharpCompress/Compressors/BZip2/CRC.cs @@ -288,7 +288,7 @@ internal class CRC unchecked((int)0xbcb4666d), unchecked((int)0xb8757bda), unchecked((int)0xb5365d03), - unchecked((int)0xb1f740b4) + unchecked((int)0xb1f740b4), }; public CRC() => InitialiseCRC(); diff --git a/src/SharpCompress/Compressors/CompressionMode.cs b/src/SharpCompress/Compressors/CompressionMode.cs index 4eba1121..0bf15e03 100644 --- a/src/SharpCompress/Compressors/CompressionMode.cs +++ b/src/SharpCompress/Compressors/CompressionMode.cs @@ -3,5 +3,5 @@ namespace SharpCompress.Compressors; public enum CompressionMode { Compress = 0, - Decompress = 1 + Decompress = 1, } diff --git a/src/SharpCompress/Compressors/Deflate/DeflateManager.cs b/src/SharpCompress/Compressors/Deflate/DeflateManager.cs index cccd0237..933f5752 100644 --- a/src/SharpCompress/Compressors/Deflate/DeflateManager.cs +++ b/src/SharpCompress/Compressors/Deflate/DeflateManager.cs @@ -106,7 +106,7 @@ internal sealed partial class DeflateManager 5, 5, 5, - 0 + 0, }; // extra bits for each distance code @@ -141,7 +141,7 @@ internal sealed partial class DeflateManager 12, 12, 13, - 13 + 13, }; internal enum BlockState @@ -149,14 +149,14 @@ internal enum BlockState NeedMore = 0, // block not completed, need more input or more output BlockDone, // block flush performed FinishStarted, // finish started, need only more output at next deflate - FinishDone // finish done, accept no more input or output + FinishDone, // finish done, accept no more input or output } internal enum DeflateFlavor { Store, Fast, - Slow + Slow, } private const int MEM_LEVEL_MAX = 9; @@ -214,7 +214,7 @@ static Config() => new Config(8, 16, 128, 128, DeflateFlavor.Slow), new Config(8, 32, 128, 256, DeflateFlavor.Slow), new Config(32, 128, 258, 1024, DeflateFlavor.Slow), - new Config(32, 258, 258, 4096, DeflateFlavor.Slow) + new Config(32, 258, 258, 4096, DeflateFlavor.Slow), }; private static readonly Config[] Table; @@ -233,7 +233,7 @@ static Config() => "insufficient memory", "buffer error", "incompatible version", - "" + "", }; // preset dictionary flag in zlib header @@ -1793,7 +1793,7 @@ private void SetDeflater() => DeflateFlavor.Store => DeflateNone, DeflateFlavor.Fast => DeflateFast, DeflateFlavor.Slow => DeflateSlow, - _ => DeflateFunction + _ => DeflateFunction, }; internal int SetParams(CompressionLevel level, CompressionStrategy strategy) diff --git a/src/SharpCompress/Compressors/Deflate/FlushType.cs b/src/SharpCompress/Compressors/Deflate/FlushType.cs index bcf7fe10..446962a3 100644 --- a/src/SharpCompress/Compressors/Deflate/FlushType.cs +++ b/src/SharpCompress/Compressors/Deflate/FlushType.cs @@ -39,5 +39,5 @@ public enum FlushType Full, /// Signals the end of the compression/decompression stream. - Finish + Finish, } diff --git a/src/SharpCompress/Compressors/Deflate/InfTree.cs b/src/SharpCompress/Compressors/Deflate/InfTree.cs index 74f4069d..2ea4cbc4 100644 --- a/src/SharpCompress/Compressors/Deflate/InfTree.cs +++ b/src/SharpCompress/Compressors/Deflate/InfTree.cs @@ -1615,7 +1615,7 @@ internal sealed class InfTree 79, 0, 9, - 255 + 255, }; //UPGRADE_NOTE: Final was removed from the declaration of 'fixed_td'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'" @@ -1716,7 +1716,7 @@ internal sealed class InfTree 193, 192, 5, - 24577 + 24577, }; // Tables for deflate from PKZIP's appnote.txt. @@ -1753,7 +1753,7 @@ internal sealed class InfTree 227, 258, 0, - 0 + 0, }; // see note #13 above about 258 @@ -1790,7 +1790,7 @@ internal sealed class InfTree 5, 0, 112, - 112 + 112, }; //UPGRADE_NOTE: Final was removed from the declaration of 'cpdist'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'" @@ -1825,7 +1825,7 @@ internal sealed class InfTree 8193, 12289, 16385, - 24577 + 24577, }; //UPGRADE_NOTE: Final was removed from the declaration of 'cpdext'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'" @@ -1860,7 +1860,7 @@ internal sealed class InfTree 12, 12, 13, - 13 + 13, }; // If BMAX needs to be larger than 16, then h and x[] should be uLong. diff --git a/src/SharpCompress/Compressors/Deflate/Inflate.cs b/src/SharpCompress/Compressors/Deflate/Inflate.cs index d768548b..fd1c764a 100644 --- a/src/SharpCompress/Compressors/Deflate/Inflate.cs +++ b/src/SharpCompress/Compressors/Deflate/Inflate.cs @@ -93,7 +93,7 @@ internal sealed class InflateBlocks 2, 14, 1, - 15 + 15, }; internal ZlibCodec _codec; // pointer back to this zlib stream @@ -815,7 +815,7 @@ private enum InflateBlockMode CODES = 6, // processing fixed or dynamic block DRY = 7, // output remaining window bytes DONE = 8, // finished last block, done - BAD = 9 // ot a data error--stuck here + BAD = 9, // ot a data error--stuck here } #endregion @@ -842,7 +842,7 @@ internal static class InternalInflateConstants 0x00001fff, 0x00003fff, 0x00007fff, - 0x0000ffff + 0x0000ffff, }; } @@ -2054,7 +2054,7 @@ private enum InflateManagerMode CHECK2 = 10, // two check bytes to go CHECK1 = 11, // one check byte to go DONE = 12, // finished check, done - BAD = 13 // got an error--stay here + BAD = 13, // got an error--stay here } #endregion diff --git a/src/SharpCompress/Compressors/Deflate/Tree.cs b/src/SharpCompress/Compressors/Deflate/Tree.cs index ec1eb51f..e5c9b52a 100644 --- a/src/SharpCompress/Compressors/Deflate/Tree.cs +++ b/src/SharpCompress/Compressors/Deflate/Tree.cs @@ -95,7 +95,7 @@ private sealed class Tree 2, 14, 1, - 15 + 15, }; // The lengths of the bit length codes are sent in order of decreasing @@ -618,7 +618,7 @@ private sealed class Tree 29, 29, 29, - 29 + 29, }; internal static readonly sbyte[] LengthCode = @@ -878,7 +878,7 @@ private sealed class Tree 27, 27, 27, - 28 + 28, }; internal static readonly int[] LengthBase = @@ -911,7 +911,7 @@ private sealed class Tree 160, 192, 224, - 0 + 0, }; internal static readonly int[] DistanceBase = @@ -945,7 +945,7 @@ private sealed class Tree 8192, 12288, 16384, - 24576 + 24576, }; internal short[] dyn_tree; // the dynamic tree diff --git a/src/SharpCompress/Compressors/Deflate/Zlib.cs b/src/SharpCompress/Compressors/Deflate/Zlib.cs index 6fbeb4d9..93405983 100644 --- a/src/SharpCompress/Compressors/Deflate/Zlib.cs +++ b/src/SharpCompress/Compressors/Deflate/Zlib.cs @@ -143,7 +143,7 @@ public enum CompressionLevel /// /// A synonym for BestCompression. /// - Level9 = BestCompression + Level9 = BestCompression, } /// @@ -171,7 +171,7 @@ public enum CompressionStrategy /// Using HuffmanOnly will force the compressor to do Huffman encoding only, with no /// string matching. /// - HuffmanOnly = 2 + HuffmanOnly = 2, } /// @@ -859,7 +859,7 @@ internal sealed class StaticTree 99, 8, 227, - 8 + 8, }; internal static readonly short[] distTreeCodes = @@ -923,7 +923,7 @@ internal sealed class StaticTree 7, 5, 23, - 5 + 5, }; // extra bits for each bit length code @@ -947,7 +947,7 @@ internal sealed class StaticTree 0, 2, 3, - 7 + 7, }; internal static readonly StaticTree Literals; diff --git a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs index 94b1491d..f6372dff 100644 --- a/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs +++ b/src/SharpCompress/Compressors/Deflate/ZlibBaseStream.cs @@ -39,7 +39,7 @@ internal enum ZlibStreamFlavor { ZLIB = 1950, DEFLATE = 1951, - GZIP = 1952 + GZIP = 1952, } internal class ZlibBaseStream : Stream @@ -655,6 +655,6 @@ internal enum StreamMode { Writer, Reader, - Undefined + Undefined, } } diff --git a/src/SharpCompress/Compressors/Deflate64/BlockType.cs b/src/SharpCompress/Compressors/Deflate64/BlockType.cs index 5bd9eb83..b34ca903 100644 --- a/src/SharpCompress/Compressors/Deflate64/BlockType.cs +++ b/src/SharpCompress/Compressors/Deflate64/BlockType.cs @@ -8,5 +8,5 @@ internal enum BlockType { Uncompressed = 0, Static = 1, - Dynamic = 2 + Dynamic = 2, } diff --git a/src/SharpCompress/Compressors/Deflate64/FastEncoderStatus.cs b/src/SharpCompress/Compressors/Deflate64/FastEncoderStatus.cs index 71e3f680..37dafc68 100644 --- a/src/SharpCompress/Compressors/Deflate64/FastEncoderStatus.cs +++ b/src/SharpCompress/Compressors/Deflate64/FastEncoderStatus.cs @@ -111,7 +111,7 @@ internal static class FastEncoderStatics 0x7e, 0x7c, 0x1f, - 0x3f + 0x3f, }; internal static ReadOnlySpan B_FINAL_FAST_ENCODER_TREE_STRUCTURE_DATA => @@ -214,7 +214,7 @@ internal static class FastEncoderStatics 0x7e, 0x7c, 0x1f, - 0x3f + 0x3f, }; // Output a currentMatch with length matchLen (>= MIN_MATCH) and displacement matchPos @@ -762,7 +762,7 @@ internal static class FastEncoderStatics 0x0039e7f1, 0x003be7f1, 0x003de7f1, - 0x000047eb + 0x000047eb, }; internal static readonly uint[] FAST_ENCODER_DISTANCE_CODE_INFO = @@ -798,7 +798,7 @@ internal static class FastEncoderStatics 0x000007d5, 0x000017d5, 0x00000000, - 0x00000100 + 0x00000100, }; internal static readonly uint[] BIT_MASK = @@ -818,7 +818,7 @@ internal static class FastEncoderStatics 4095, 8191, 16383, - 32767 + 32767, }; internal static readonly byte[] EXTRA_LENGTH_BITS = { @@ -850,7 +850,7 @@ internal static class FastEncoderStatics 5, 5, 5, - 0 + 0, }; internal static readonly byte[] EXTRA_DISTANCE_BITS = { @@ -885,7 +885,7 @@ internal static class FastEncoderStatics 13, 13, 0, - 0 + 0, }; internal const int NUM_CHARS = 256; internal const int NUM_LENGTH_BASE_CODES = 29; diff --git a/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs b/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs index 4e11854f..34aa63d6 100644 --- a/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs +++ b/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs @@ -70,7 +70,7 @@ internal sealed class InflaterManaged 5, 5, 5, - 16 + 16, }; // The base length for length code 257 - 285. @@ -105,7 +105,7 @@ internal sealed class InflaterManaged 163, 195, 227, - 3 + 3, }; // The base distance for distance code 0 - 31 @@ -143,7 +143,7 @@ internal sealed class InflaterManaged 16385, 24577, 32769, - 49153 + 49153, }; // code lengths for code length alphabet is stored in following order @@ -184,7 +184,7 @@ internal sealed class InflaterManaged 0x07, 0x17, 0x0f, - 0x1f + 0x1f, }; private readonly OutputWindow _output; diff --git a/src/SharpCompress/Compressors/Deflate64/InflaterState.cs b/src/SharpCompress/Compressors/Deflate64/InflaterState.cs index 711c3245..16d627e0 100644 --- a/src/SharpCompress/Compressors/Deflate64/InflaterState.cs +++ b/src/SharpCompress/Compressors/Deflate64/InflaterState.cs @@ -37,5 +37,5 @@ internal enum InflaterState ReadingFooter = 22, VerifyingFooter = 23, - Done = 24 // Finished + Done = 24, // Finished } diff --git a/src/SharpCompress/Compressors/Deflate64/MatchState.cs b/src/SharpCompress/Compressors/Deflate64/MatchState.cs index 858e91e8..cabc0bad 100644 --- a/src/SharpCompress/Compressors/Deflate64/MatchState.cs +++ b/src/SharpCompress/Compressors/Deflate64/MatchState.cs @@ -8,5 +8,5 @@ internal enum MatchState { HasSymbol = 1, HasMatch = 2, - HasSymbolAndMatch = 3 + HasSymbolAndMatch = 3, } diff --git a/src/SharpCompress/Compressors/Explode/ExplodeStream.cs b/src/SharpCompress/Compressors/Explode/ExplodeStream.cs index a68353ce..11a016e0 100644 --- a/src/SharpCompress/Compressors/Explode/ExplodeStream.cs +++ b/src/SharpCompress/Compressors/Explode/ExplodeStream.cs @@ -102,7 +102,7 @@ public override long Position 0x1fff, 0x3fff, 0x7fff, - 0xffff + 0xffff, }; /* Tables for length and distance */ @@ -171,7 +171,7 @@ public override long Position 62, 63, 64, - 65 + 65, }; static int[] cplen3 = new int[] @@ -239,7 +239,7 @@ public override long Position 63, 64, 65, - 66 + 66, }; static int[] extra = new int[] @@ -307,7 +307,7 @@ public override long Position 0, 0, 0, - 8 + 8, }; static int[] cpdist4 = new int[] @@ -375,7 +375,7 @@ public override long Position 3841, 3905, 3969, - 4033 + 4033, }; static int[] cpdist8 = new int[] @@ -443,7 +443,7 @@ public override long Position 7681, 7809, 7937, - 8065 + 8065, }; private int get_tree(int[] arrBitLengths, int numberExpected) diff --git a/src/SharpCompress/Compressors/Explode/HuftTree.cs b/src/SharpCompress/Compressors/Explode/HuftTree.cs index caa1a141..d216cfc7 100644 --- a/src/SharpCompress/Compressors/Explode/HuftTree.cs +++ b/src/SharpCompress/Compressors/Explode/HuftTree.cs @@ -199,7 +199,7 @@ so that no bits beyond that code are fetched when that code is { NumberOfBitsUsed = arrLX[stackOfBitsPerTable + tableLevel - 1], /* bits to dump before this table */ NumberOfExtraBits = 32 + counter, /* bits in this table */ - ChildNodes = pointerToCurrentTable /* pointer to this table */ + ChildNodes = pointerToCurrentTable, /* pointer to this table */ }; counter = @@ -212,7 +212,7 @@ so that no bits beyond that code are fetched when that code is /* set up table entry in r */ huftNode vHuft1 = new huftNode { - NumberOfBitsUsed = numberOfBitsInCurrentCode - bitsBeforeThisTable + NumberOfBitsUsed = numberOfBitsInCurrentCode - bitsBeforeThisTable, }; if (pIndex >= numberOfCodes) diff --git a/src/SharpCompress/Compressors/Filters/BCJFilter.cs b/src/SharpCompress/Compressors/Filters/BCJFilter.cs index 83a93397..e7f00c98 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilter.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilter.cs @@ -13,7 +13,7 @@ internal class BCJFilter : Filter true, false, false, - false + false, }; private static readonly int[] MASK_TO_BIT_NUMBER = { 0, 1, 2, 2, 3, 3, 3, 3 }; diff --git a/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs b/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs index 07eaf319..44323ae7 100644 --- a/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs +++ b/src/SharpCompress/Compressors/Filters/BCJFilterIA64.cs @@ -39,7 +39,7 @@ internal class BCJFilterIA64 : Filter 4, 4, 0, - 0 + 0, }; public BCJFilterIA64(bool isEncoder, Stream baseStream) diff --git a/src/SharpCompress/Compressors/LZMA/ICoder.cs b/src/SharpCompress/Compressors/LZMA/ICoder.cs index dcddf929..95134979 100644 --- a/src/SharpCompress/Compressors/LZMA/ICoder.cs +++ b/src/SharpCompress/Compressors/LZMA/ICoder.cs @@ -147,7 +147,7 @@ internal enum CoderPropId /// /// Specifies mode with end marker. /// - EndMarker + EndMarker, } internal interface ISetCoderProperties diff --git a/src/SharpCompress/Compressors/LZMA/LZipStream.cs b/src/SharpCompress/Compressors/LZMA/LZipStream.cs index 5e987214..3609641b 100644 --- a/src/SharpCompress/Compressors/LZMA/LZipStream.cs +++ b/src/SharpCompress/Compressors/LZMA/LZipStream.cs @@ -205,7 +205,7 @@ public static int ValidateAndReadSize(Stream stream) (byte)'I', (byte)'P', 1, - 113 + 113, }; public static void WriteHeaderSize(Stream stream) @@ -235,6 +235,6 @@ private static byte[] GetProperties(int dictionarySize) => (byte)(dictionarySize & 0xff), (byte)((dictionarySize >> 8) & 0xff), (byte)((dictionarySize >> 16) & 0xff), - (byte)((dictionarySize >> 24) & 0xff) + (byte)((dictionarySize >> 24) & 0xff), }; } diff --git a/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs b/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs index 509e54c8..f3abf990 100644 --- a/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs +++ b/src/SharpCompress/Compressors/LZMA/LzmaEncoder.cs @@ -12,7 +12,7 @@ internal class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties private enum EMatchFinderType { Bt2, - Bt4 + Bt4, } private const uint K_IFINITY_PRICE = 0xFFFFFFF; diff --git a/src/SharpCompress/Compressors/LZMA/LzmaEncoderProperties.cs b/src/SharpCompress/Compressors/LZMA/LzmaEncoderProperties.cs index 274e757b..198ba471 100644 --- a/src/SharpCompress/Compressors/LZMA/LzmaEncoderProperties.cs +++ b/src/SharpCompress/Compressors/LZMA/LzmaEncoderProperties.cs @@ -38,7 +38,7 @@ public LzmaEncoderProperties(bool eos, int dictionary, int numFastBytes) CoderPropId.Algorithm, CoderPropId.NumFastBytes, CoderPropId.MatchFinder, - CoderPropId.EndMarker + CoderPropId.EndMarker, }; _properties = new object[] { @@ -49,7 +49,7 @@ public LzmaEncoderProperties(bool eos, int dictionary, int numFastBytes) algorithm, numFastBytes, mf, - eos + eos, }; } } diff --git a/src/SharpCompress/Compressors/PPMd/H/ModelPPM.cs b/src/SharpCompress/Compressors/PPMd/H/ModelPPM.cs index d4e91921..f02ec847 100644 --- a/src/SharpCompress/Compressors/PPMd/H/ModelPPM.cs +++ b/src/SharpCompress/Compressors/PPMd/H/ModelPPM.cs @@ -132,7 +132,7 @@ public virtual int HiBitsFlag 0x64A1, 0x5ABC, 0x6632, - 0x6051 + 0x6051, }; // Temp fields diff --git a/src/SharpCompress/Compressors/PPMd/I1/Model.cs b/src/SharpCompress/Compressors/PPMd/I1/Model.cs index 9a1d090f..cd7f7ac4 100644 --- a/src/SharpCompress/Compressors/PPMd/I1/Model.cs +++ b/src/SharpCompress/Compressors/PPMd/I1/Model.cs @@ -59,7 +59,7 @@ internal partial class Model 0x64A1, 0x5ABC, 0x6632, - 0x6051 + 0x6051, }; private static ReadOnlySpan EXPONENTIAL_ESCAPES => diff --git a/src/SharpCompress/Compressors/PPMd/I1/ModelRestorationMethod.cs b/src/SharpCompress/Compressors/PPMd/I1/ModelRestorationMethod.cs index 0a504c99..9f4ccc43 100644 --- a/src/SharpCompress/Compressors/PPMd/I1/ModelRestorationMethod.cs +++ b/src/SharpCompress/Compressors/PPMd/I1/ModelRestorationMethod.cs @@ -24,5 +24,5 @@ internal enum ModelRestorationMethod /// /// Freeze the context tree (in some cases may result in poor compression). /// - Freeze = 2 + Freeze = 2, } diff --git a/src/SharpCompress/Compressors/PPMd/PpmdVersion.cs b/src/SharpCompress/Compressors/PPMd/PpmdVersion.cs index 791034ac..57626660 100644 --- a/src/SharpCompress/Compressors/PPMd/PpmdVersion.cs +++ b/src/SharpCompress/Compressors/PPMd/PpmdVersion.cs @@ -4,5 +4,5 @@ public enum PpmdVersion { H, H7Z, - I1 + I1, } diff --git a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs b/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs index 7c897176..63759bc1 100644 --- a/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs +++ b/src/SharpCompress/Compressors/Rar/RarBLAKE2spStream.cs @@ -28,7 +28,7 @@ internal class RarBLAKE2spStream : RarStream 0x510E527FU, 0x9B05688CU, 0x1F83D9ABU, - 0x5BE0CD19U + 0x5BE0CD19U, }; static readonly byte[][] k_BLAKE2S_Sigma = diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/CodeType.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/CodeType.cs index 0ec7943d..67f24def 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/CodeType.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/CodeType.cs @@ -10,5 +10,5 @@ internal enum CodeType CODE_STARTFILE, CODE_ENDFILE, CODE_VM, - CODE_VMDATA + CODE_VMDATA, } diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/FilterType.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/FilterType.cs index 67e38c45..d09fcc16 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/FilterType.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/Decode/FilterType.cs @@ -12,5 +12,5 @@ internal enum FilterType : byte FILTER_RGB, FILTER_ITANIUM, FILTER_PPM, - FILTER_NONE + FILTER_NONE, } diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/PPM/BlockTypes.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/PPM/BlockTypes.cs index 3b4a9372..ded3c34b 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/PPM/BlockTypes.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/PPM/BlockTypes.cs @@ -3,5 +3,5 @@ namespace SharpCompress.Compressors.Rar.UnpackV1.PPM; internal enum BlockTypes { BLOCK_LZ = 0, - BLOCK_PPM = 1 + BLOCK_PPM = 1, } diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs index eb2ddea6..c62d5906 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs @@ -119,7 +119,7 @@ public int Char 2, 14, 0, - 12 + 12, }; private FileHeader fileHeader; diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.cs index 8513c24b..4c6e3894 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.cs @@ -88,7 +88,7 @@ internal partial class Unpack 0xf000, 0xf200, 0xf200, - 0xffff + 0xffff, }; private static readonly int[] PosL1 = { 0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32 }; @@ -106,7 +106,7 @@ internal partial class Unpack 0xf000, 0xf200, 0xf240, - 0xffff + 0xffff, }; private static readonly int[] PosL2 = { 0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36 }; @@ -123,7 +123,7 @@ internal partial class Unpack 0xf200, 0xf200, 0xf200, - 0xffff + 0xffff, }; private static readonly int[] PosHf0 = { 0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33, 33 }; @@ -139,7 +139,7 @@ internal partial class Unpack 0xf200, 0xf200, 0xf7e0, - 0xffff + 0xffff, }; private static readonly int[] PosHf1 = { 0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80, 127 }; @@ -155,7 +155,7 @@ internal partial class Unpack 0xfa00, 0xffff, 0xffff, - 0xffff + 0xffff, }; private static readonly int[] PosHf2 = { 0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0 }; @@ -170,7 +170,7 @@ internal partial class Unpack 0xfe80, 0xffff, 0xffff, - 0xffff + 0xffff, }; private static readonly int[] PosHf3 = { 0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0 }; @@ -199,7 +199,7 @@ internal partial class Unpack 0x90, 0x98, 0x9c, - 0xb0 + 0xb0, }; private static readonly int[] ShortLen2 = { 2, 3, 3, 3, 4, 4, 5, 6, 6, 4, 4, 5, 6, 6, 4, 0 }; @@ -220,7 +220,7 @@ internal partial class Unpack 0x90, 0x98, 0x9c, - 0xb0 + 0xb0, }; private void unpack15(bool solid) diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack20.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack20.cs index e4069c76..809aaf60 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack20.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack20.cs @@ -64,7 +64,7 @@ internal partial class Unpack 128, 160, 192, - 224 + 224, }; private static ReadOnlySpan LBits => @@ -97,7 +97,7 @@ internal partial class Unpack 5, 5, 5, - 5 + 5, }; private static readonly int[] DDecode = @@ -149,7 +149,7 @@ internal partial class Unpack 786432, 851968, 917504, - 983040 + 983040, }; private static readonly int[] DBits = @@ -201,7 +201,7 @@ internal partial class Unpack 16, 16, 16, - 16 + 16, }; private static readonly int[] SDDecode = { 0, 4, 8, 16, 32, 64, 128, 192 }; diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack15_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack15_cpp.cs index dabb0e08..c1886df8 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack15_cpp.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack15_cpp.cs @@ -19,7 +19,7 @@ internal partial class Unpack 0xf000, 0xf200, 0xf200, - 0xffff + 0xffff, }; private static readonly uint[] PosL1 = { 0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32 }; @@ -37,7 +37,7 @@ internal partial class Unpack 0xf000, 0xf200, 0xf240, - 0xffff + 0xffff, }; private static readonly uint[] PosL2 = { 0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36 }; @@ -54,7 +54,7 @@ internal partial class Unpack 0xf200, 0xf200, 0xf200, - 0xffff + 0xffff, }; private static readonly uint[] PosHf0 = { 0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33, 33 }; @@ -70,7 +70,7 @@ internal partial class Unpack 0xf200, 0xf200, 0xf7e0, - 0xffff + 0xffff, }; private static readonly uint[] PosHf1 = { 0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80, 127 }; @@ -86,7 +86,7 @@ internal partial class Unpack 0xfa00, 0xffff, 0xffff, - 0xffff + 0xffff, }; private static readonly uint[] PosHf2 = { 0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0 }; @@ -101,7 +101,7 @@ internal partial class Unpack 0xfe80, 0xffff, 0xffff, - 0xffff + 0xffff, }; private static readonly uint[] PosHf3 = { 0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0 }; @@ -225,7 +225,7 @@ internal static class Unpack15Local 6, 6, 4, - 0 + 0, }; public static readonly uint[] ShortXor1 = { @@ -243,7 +243,7 @@ internal static class Unpack15Local 0x90, 0x98, 0x9c, - 0xb0 + 0xb0, }; public static readonly uint[] ShortLen2 = { @@ -262,7 +262,7 @@ internal static class Unpack15Local 6, 6, 4, - 0 + 0, }; public static readonly uint[] ShortXor2 = { @@ -280,7 +280,7 @@ internal static class Unpack15Local 0x90, 0x98, 0x9c, - 0xb0 + 0xb0, }; } diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs index 51dbff0b..d3125727 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs @@ -53,7 +53,7 @@ internal static class Unpack20Local 128, 160, 192, - 224 + 224, }; public static readonly byte[] LBits = { @@ -84,7 +84,7 @@ internal static class Unpack20Local 5, 5, 5, - 5 + 5, }; public static readonly uint[] DDecode = { @@ -135,7 +135,7 @@ internal static class Unpack20Local 786432, 851968, 917504, - 983040 + 983040, }; public static readonly byte[] DBits = { @@ -186,7 +186,7 @@ internal static class Unpack20Local 16, 16, 16, - 16 + 16, }; public static readonly byte[] SDDecode = { 0, 4, 8, 16, 32, 64, 128, 192 }; public static readonly byte[] SDBits = { 2, 2, 3, 4, 5, 6, 6, 6 }; diff --git a/src/SharpCompress/Compressors/Rar/VM/RarVM.cs b/src/SharpCompress/Compressors/Rar/VM/RarVM.cs index 0dd3e326..f1ef3834 100644 --- a/src/SharpCompress/Compressors/Rar/VM/RarVM.cs +++ b/src/SharpCompress/Compressors/Rar/VM/RarVM.cs @@ -1115,7 +1115,7 @@ private VMStandardFilters IsStandardFilter(ReadOnlySpan code, int codeSize new(29, 0x0e06077d, VMStandardFilters.VMSF_DELTA), new(149, 0x1c2c5dc8, VMStandardFilters.VMSF_RGB), new(216, 0xbc85e701, VMStandardFilters.VMSF_AUDIO), - new(40, 0x46b9c560, VMStandardFilters.VMSF_UPCASE) + new(40, 0x46b9c560, VMStandardFilters.VMSF_UPCASE), }; var CodeCRC = RarCRC.CheckCrc(0xffffffff, code, 0, code.Length) ^ 0xffffffff; for (var i = 0; i < stdList.Length; i++) diff --git a/src/SharpCompress/Compressors/Rar/VM/VMCmdFlags.cs b/src/SharpCompress/Compressors/Rar/VM/VMCmdFlags.cs index 00de0b6a..9dbafe1b 100644 --- a/src/SharpCompress/Compressors/Rar/VM/VMCmdFlags.cs +++ b/src/SharpCompress/Compressors/Rar/VM/VMCmdFlags.cs @@ -53,6 +53,6 @@ internal class VMCmdFlags VMCF_OP2 | VMCF_BYTEMODE, VMCF_OP2 | VMCF_BYTEMODE | VMCF_USEFLAGS | VMCF_CHFLAGS, VMCF_OP2 | VMCF_BYTEMODE | VMCF_USEFLAGS | VMCF_CHFLAGS, - VMCF_OP0 + VMCF_OP0, }; } diff --git a/src/SharpCompress/Compressors/Rar/VM/VMCommands.cs b/src/SharpCompress/Compressors/Rar/VM/VMCommands.cs index 7bb1a396..a10eb072 100644 --- a/src/SharpCompress/Compressors/Rar/VM/VMCommands.cs +++ b/src/SharpCompress/Compressors/Rar/VM/VMCommands.cs @@ -66,5 +66,5 @@ internal enum VMCommands VM_NEGB = 52, VM_NEGD = 53, - VM_STANDARD = 54 + VM_STANDARD = 54, } diff --git a/src/SharpCompress/Compressors/Rar/VM/VMFlags.cs b/src/SharpCompress/Compressors/Rar/VM/VMFlags.cs index fa9a72e7..12765775 100644 --- a/src/SharpCompress/Compressors/Rar/VM/VMFlags.cs +++ b/src/SharpCompress/Compressors/Rar/VM/VMFlags.cs @@ -5,5 +5,5 @@ internal enum VMFlags None = 0, VM_FC = 1, VM_FZ = 2, - VM_FS = 80000000 + VM_FS = 80000000, } diff --git a/src/SharpCompress/Compressors/Rar/VM/VMOpType.cs b/src/SharpCompress/Compressors/Rar/VM/VMOpType.cs index bcc4214e..77994746 100644 --- a/src/SharpCompress/Compressors/Rar/VM/VMOpType.cs +++ b/src/SharpCompress/Compressors/Rar/VM/VMOpType.cs @@ -5,5 +5,5 @@ internal enum VMOpType VM_OPREG = 0, VM_OPINT = 1, VM_OPREGMEM = 2, - VM_OPNONE = 3 + VM_OPNONE = 3, } diff --git a/src/SharpCompress/Compressors/Rar/VM/VMStandardFilters.cs b/src/SharpCompress/Compressors/Rar/VM/VMStandardFilters.cs index 4b90b019..2c435ebb 100644 --- a/src/SharpCompress/Compressors/Rar/VM/VMStandardFilters.cs +++ b/src/SharpCompress/Compressors/Rar/VM/VMStandardFilters.cs @@ -9,5 +9,5 @@ internal enum VMStandardFilters VMSF_RGB = 4, VMSF_AUDIO = 5, VMSF_DELTA = 6, - VMSF_UPCASE = 7 + VMSF_UPCASE = 7, } diff --git a/src/SharpCompress/Compressors/Reduce/ReduceStream.cs b/src/SharpCompress/Compressors/Reduce/ReduceStream.cs index 2ebc20ab..1cb67f44 100644 --- a/src/SharpCompress/Compressors/Reduce/ReduceStream.cs +++ b/src/SharpCompress/Compressors/Reduce/ReduceStream.cs @@ -98,7 +98,7 @@ public override long Position 0x1fff, 0x3fff, 0x7fff, - 0xffff + 0xffff, }; private int bitBufferCount; diff --git a/src/SharpCompress/Compressors/Shrink/BitStream.cs b/src/SharpCompress/Compressors/Shrink/BitStream.cs index 949ee6c3..03fa85f2 100644 --- a/src/SharpCompress/Compressors/Shrink/BitStream.cs +++ b/src/SharpCompress/Compressors/Shrink/BitStream.cs @@ -32,7 +32,7 @@ internal class BitStream 8191U, 16383U, (uint)short.MaxValue, - (uint)ushort.MaxValue + (uint)ushort.MaxValue, }; public BitStream(byte[] src, int srcLen) diff --git a/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs b/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs index 6ad5ab7c..4506ccb1 100644 --- a/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs +++ b/src/SharpCompress/Compressors/Shrink/HwUnshrink.cs @@ -387,7 +387,7 @@ public enum UnshrnkStatus { Ok, Full, - Error + Error, } private struct CodeQueue diff --git a/src/SharpCompress/Compressors/Xz/CheckType.cs b/src/SharpCompress/Compressors/Xz/CheckType.cs index a94f8261..4c4fafcd 100644 --- a/src/SharpCompress/Compressors/Xz/CheckType.cs +++ b/src/SharpCompress/Compressors/Xz/CheckType.cs @@ -5,5 +5,5 @@ public enum CheckType : byte NONE = 0x00, CRC32 = 0x01, CRC64 = 0x04, - SHA256 = 0x0A + SHA256 = 0x0A, } diff --git a/src/SharpCompress/Compressors/Xz/Filters/BlockFilter.cs b/src/SharpCompress/Compressors/Xz/Filters/BlockFilter.cs index 936a3a0d..76ec4e03 100644 --- a/src/SharpCompress/Compressors/Xz/Filters/BlockFilter.cs +++ b/src/SharpCompress/Compressors/Xz/Filters/BlockFilter.cs @@ -15,20 +15,19 @@ private enum FilterTypes : ulong ArchArmFilter = 0x07, ArchArmThumbFilter = 0x08, ArchSparcFilter = 0x09, - Lzma2 = 0x21 + Lzma2 = 0x21, } - private static readonly Dictionary> FILTER_MAP = - new() - { - { FilterTypes.ArchX86Filter, () => new X86Filter() }, - { FilterTypes.ArchPowerPcFilter, () => new PowerPCFilter() }, - { FilterTypes.ArchIa64Filter, () => new IA64Filter() }, - { FilterTypes.ArchArmFilter, () => new ArmFilter() }, - { FilterTypes.ArchArmThumbFilter, () => new ArmThumbFilter() }, - { FilterTypes.ArchSparcFilter, () => new SparcFilter() }, - { FilterTypes.Lzma2, () => new Lzma2Filter() } - }; + private static readonly Dictionary> FILTER_MAP = new() + { + { FilterTypes.ArchX86Filter, () => new X86Filter() }, + { FilterTypes.ArchPowerPcFilter, () => new PowerPCFilter() }, + { FilterTypes.ArchIa64Filter, () => new IA64Filter() }, + { FilterTypes.ArchArmFilter, () => new ArmFilter() }, + { FilterTypes.ArchArmThumbFilter, () => new ArmThumbFilter() }, + { FilterTypes.ArchSparcFilter, () => new SparcFilter() }, + { FilterTypes.Lzma2, () => new Lzma2Filter() }, + }; public abstract bool AllowAsLast { get; } public abstract bool AllowAsNonLast { get; } diff --git a/src/SharpCompress/IO/StreamingMode.cs b/src/SharpCompress/IO/StreamingMode.cs index 0fdb674d..33f7d236 100644 --- a/src/SharpCompress/IO/StreamingMode.cs +++ b/src/SharpCompress/IO/StreamingMode.cs @@ -3,5 +3,5 @@ namespace SharpCompress.IO; public enum StreamingMode { Streaming, - Seekable + Seekable, } diff --git a/src/SharpCompress/Readers/Tar/TarReader.cs b/src/SharpCompress/Readers/Tar/TarReader.cs index a686dc11..46493446 100644 --- a/src/SharpCompress/Readers/Tar/TarReader.cs +++ b/src/SharpCompress/Readers/Tar/TarReader.cs @@ -39,7 +39,7 @@ protected override Stream RequestInitialStream() CompressionType.Xz => new XZStream(stream), CompressionType.Lzw => new LzwStream(stream), CompressionType.None => stream, - _ => throw new NotSupportedException("Invalid compression type: " + compressionType) + _ => throw new NotSupportedException("Invalid compression type: " + compressionType), }; } diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj index 4b4909b7..0d16f160 100644 --- a/src/SharpCompress/SharpCompress.csproj +++ b/src/SharpCompress/SharpCompress.csproj @@ -6,7 +6,7 @@ 0.38.0 0.38.0 Adam Hathcock - net462;netstandard2.0;netstandard2.1;net6.0;net8.0 + net48;net481;netstandard2.0;net6.0;net8.0 SharpCompress ../../SharpCompress.snk true @@ -14,10 +14,10 @@ rar;unrar;zip;unzip;bzip2;gzip;tar;7zip;lzip;xz https://github.com/adamhathcock/sharpcompress MIT - Copyright (c) 2014 Adam Hathcock + Copyright (c) 2025 Adam Hathcock false false - SharpCompress is a compression library for NET Standard 2.0/NET Standard 2.1/NET 6.0/NET 8.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented. + SharpCompress is a compression library for NET Standard 2.0/NET 6.0/NET 8.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented. true true snupkg @@ -28,7 +28,6 @@ true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - true @@ -36,20 +35,11 @@ - - - - - - - - - diff --git a/src/SharpCompress/Writers/Zip/ZipWriter.cs b/src/SharpCompress/Writers/Zip/ZipWriter.cs index 1fb66a2b..8e89da64 100644 --- a/src/SharpCompress/Writers/Zip/ZipWriter.cs +++ b/src/SharpCompress/Writers/Zip/ZipWriter.cs @@ -69,7 +69,7 @@ private static ZipCompressionMethod ToZipCompressionMethod(CompressionType compr CompressionType.BZip2 => ZipCompressionMethod.BZip2, CompressionType.LZMA => ZipCompressionMethod.LZMA, CompressionType.PPMd => ZipCompressionMethod.PPMd, - _ => throw new InvalidFormatException("Invalid compression method: " + compressionType) + _ => throw new InvalidFormatException("Invalid compression method: " + compressionType), }; public override void Write(string entryPath, Stream source, DateTime? modificationTime) => @@ -100,7 +100,7 @@ public Stream WriteToStream(string entryPath, ZipWriterEntryOptions options) ) { Comment = options.EntryComment, - ModificationTime = options.ModificationDateTime + ModificationTime = options.ModificationDateTime, }; // Use the archive default setting for zip64 and allow overrides diff --git a/src/SharpCompress/packages.lock.json b/src/SharpCompress/packages.lock.json index 5b33071a..de18ff8d 100644 --- a/src/SharpCompress/packages.lock.json +++ b/src/SharpCompress/packages.lock.json @@ -1,25 +1,7 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.2": { - "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, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" - } - }, + ".NETFramework,Version=v4.8": { "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -36,35 +18,15 @@ "resolved": "4.6.0", "contentHash": "lN6tZi7Q46zFzAbRYXTIvfXcyvQQgxnY7Xm6C6xQ9784dEL1amjM6S6Iw4ZpsvesAKnRVsM4scrDQaDqSClkjA==" }, - "System.Memory": { - "type": "Direct", - "requested": "[4.5.5, )", - "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" - } - }, - "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", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==", + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Memory": "4.5.5" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Build.Tasks.Git": { @@ -72,11 +34,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net462": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -99,18 +56,38 @@ "dependencies": { "System.Runtime.CompilerServices.Unsafe": "4.5.3" } - } - }, - ".NETStandard,Version=v2.0": { + }, "Microsoft.Bcl.AsyncInterfaces": { - "type": "Direct", + "type": "CentralTransitive", "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "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" + } + } + }, + ".NETFramework,Version=v4.8.1": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net481": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -121,50 +98,21 @@ "Microsoft.SourceLink.Common": "8.0.0" } }, - "NETStandard.Library": { - "type": "Direct", - "requested": "[2.0.3, )", - "resolved": "2.0.3", - "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "dependencies": { - "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.5.5, )", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "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", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==", + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Memory": "4.5.5" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Build.Tasks.Git": { @@ -172,10 +120,10 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.NETCore.Platforms": { + "Microsoft.NETFramework.ReferenceAssemblies.net481": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "1.0.3", + "contentHash": "Vv/20vgHS7VglVOVh8J3Iz/MA+VYKVRp9f7r2qiKBMuzviTOmocG70yq0Q8T5OTmCONkEAIJwETD1zhEfLkAXQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -184,8 +132,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -199,14 +147,37 @@ "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.1": { + ".NETStandard,Version=v2.0": { "Microsoft.Bcl.AsyncInterfaces": { "type": "Direct", "requested": "[8.0.0, )", "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -218,12 +189,32 @@ "Microsoft.SourceLink.Common": "8.0.0" } }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "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==", + "dependencies": { + "System.Buffers": "4.6.0", + "System.Numerics.Vectors": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" + } + }, "System.Text.Encoding.CodePages": { "type": "Direct", "requested": "[8.0.0, )", @@ -236,10 +227,12 @@ }, "ZstdSharp.Port": { "type": "Direct", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==", + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==", "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, @@ -248,6 +241,11 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -255,22 +253,19 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.0", + "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.0", + "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg==" }, - "System.Memory": { - "type": "CentralTransitive", - "requested": "[4.5.5, )", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", "System.Runtime.CompilerServices.Unsafe": "4.5.3" } } @@ -294,9 +289,9 @@ }, "ZstdSharp.Port": { "type": "Direct", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==" + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -312,9 +307,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.7, )", - "resolved": "8.0.7", - "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" + "requested": "[8.0.12, )", + "resolved": "8.0.12", + "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -334,9 +329,9 @@ }, "ZstdSharp.Port": { "type": "Direct", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==" + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -350,4 +345,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/SharpCompress.Test/ArchiveTests.cs b/tests/SharpCompress.Test/ArchiveTests.cs index 29903efe..94f402c9 100644 --- a/tests/SharpCompress.Test/ArchiveTests.cs +++ b/tests/SharpCompress.Test/ArchiveTests.cs @@ -295,7 +295,7 @@ protected void ArchiveFileReadEx(string testArchive) ExtractFullPath = true, Overwrite = true, PreserveAttributes = true, - PreserveFileTime = true + PreserveFileTime = true, } ); } diff --git a/tests/SharpCompress.Test/Filters/BranchExecTests.cs b/tests/SharpCompress.Test/Filters/BranchExecTests.cs index ca9686a4..8cd3123d 100644 --- a/tests/SharpCompress.Test/Filters/BranchExecTests.cs +++ b/tests/SharpCompress.Test/Filters/BranchExecTests.cs @@ -91,7 +91,7 @@ public class BranchExecTests 0x00, 0x00, 0x1C, - 0x00 + 0x00, ]; private static byte[] X86Data { get; } = @@ -173,7 +173,7 @@ public class BranchExecTests 0x00, 0x00, 0x1C, - 0x00 + 0x00, ]; private static byte[] PpcResultData { get; } = @@ -273,7 +273,7 @@ public class BranchExecTests 0x7A, 0xB2, 0xD4, - 0xED + 0xED, ]; private static byte[] PpcData { get; } = @@ -373,7 +373,7 @@ public class BranchExecTests 0x7A, 0xB2, 0xD4, - 0xED + 0xED, ]; private static byte[] ArmResultData { get; } = @@ -473,7 +473,7 @@ public class BranchExecTests 0x00, 0xC6, 0x8F, - 0xE2 + 0xE2, ]; private static byte[] ArmData { get; } = @@ -573,7 +573,7 @@ public class BranchExecTests 0x00, 0xC6, 0x8F, - 0xE2 + 0xE2, ]; private static byte[] ArmtResultData { get; } = @@ -689,7 +689,7 @@ public class BranchExecTests 0x7D, 0xED, 0x11, - 0x0F + 0x0F, ]; private static byte[] ArmtData { get; } = @@ -805,7 +805,7 @@ public class BranchExecTests 0x7D, 0xED, 0x11, - 0x0F + 0x0F, ]; private static byte[] Ia64ResultData { get; } = @@ -905,7 +905,7 @@ public class BranchExecTests 0x2B, 0x72, 0xD5, - 0x0D + 0x0D, ]; private static byte[] Ia64Data { get; } = @@ -1005,7 +1005,7 @@ public class BranchExecTests 0x2B, 0x72, 0xD5, - 0x0D + 0x0D, ]; private static byte[] SparcResultData { get; } = @@ -1087,7 +1087,7 @@ public class BranchExecTests 0x91, 0x00, 0x10, - 0x00 + 0x00, ]; private static byte[] SparcData { get; } = @@ -1169,7 +1169,7 @@ public class BranchExecTests 0x91, 0x00, 0x10, - 0x00 + 0x00, ]; private void CompareBuffer(byte[] testBuffer, byte[] targetBuffer) => diff --git a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs index 373af692..81d2c089 100644 --- a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs +++ b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs @@ -235,7 +235,7 @@ public void Rar_Multi_ArchiveStreamRead() => "Rar.multi.part03.rar", "Rar.multi.part04.rar", "Rar.multi.part05.rar", - "Rar.multi.part06.rar" + "Rar.multi.part06.rar", ], false ); @@ -249,7 +249,7 @@ public void Rar5_Multi_ArchiveStreamRead() => "Rar5.multi.part03.rar", "Rar5.multi.part04.rar", "Rar5.multi.part05.rar", - "Rar5.multi.part06.rar" + "Rar5.multi.part06.rar", ], false ); @@ -278,7 +278,7 @@ public void Rar5_MultiSolid_ArchiveStreamRead() => "Rar.multi.solid.part03.rar", "Rar.multi.solid.part04.rar", "Rar.multi.solid.part05.rar", - "Rar.multi.solid.part06.rar" + "Rar.multi.solid.part06.rar", ], true ); @@ -348,7 +348,7 @@ public void Rar2_Multi_ArchiveStreamRead() => "Rar2.multi.r02", "Rar2.multi.r03", "Rar2.multi.r04", - "Rar2.multi.r05" + "Rar2.multi.r05", ], false ); @@ -424,7 +424,7 @@ public void Rar_GetPartsSplit() => "Rar4.split.003", "Rar4.split.004", "Rar4.split.005", - "Rar4.split.006" + "Rar4.split.006", } ); @@ -440,7 +440,7 @@ public void Rar_GetPartsOld() => "Rar2.multi.r02", "Rar2.multi.r03", "Rar2.multi.r04", - "Rar2.multi.r05" + "Rar2.multi.r05", } ); @@ -456,7 +456,7 @@ public void Rar_GetPartsNew() => "Rar4.multi.part04.rar", "Rar4.multi.part05.rar", "Rar4.multi.part06.rar", - "Rar4.multi.part07.rar" + "Rar4.multi.part07.rar", } ); @@ -470,7 +470,7 @@ public void Rar4_Multi_ArchiveStreamRead() => "Rar4.multi.part04.rar", "Rar4.multi.part05.rar", "Rar4.multi.part06.rar", - "Rar4.multi.part07.rar" + "Rar4.multi.part07.rar", ], false ); @@ -486,7 +486,7 @@ public void Rar4_Split_ArchiveStreamRead() => "Rar4.split.003", "Rar4.split.004", "Rar4.split.005", - "Rar4.split.006" + "Rar4.split.006", ] ); @@ -515,7 +515,7 @@ public void Rar4_Split_ArchiveStreamFirstFileRead() => ArchiveStreamMultiRead( null, [ - "Rar4.split.001" + "Rar4.split.001", //"Rar4.split.002", //"Rar4.split.003", //"Rar4.split.004", @@ -557,7 +557,7 @@ public void Rar4_Multi_ArchiveOpenEntryVolumeIndexTest() => [ [0, 1], //exe - Rar4.multi.part01.rar to Rar4.multi.part02.rar [1, 5], //jpg - Rar4.multi.part02.rar to Rar4.multi.part06.rar - [5, 6] //txt - Rar4.multi.part06.rar to Rar4.multi.part07.rar + [5, 6], //txt - Rar4.multi.part06.rar to Rar4.multi.part07.rar ], null, "Rar4.multi.part01.rar", diff --git a/tests/SharpCompress.Test/Rar/RarReaderTests.cs b/tests/SharpCompress.Test/Rar/RarReaderTests.cs index 6ba605a5..5d3c0e64 100644 --- a/tests/SharpCompress.Test/Rar/RarReaderTests.cs +++ b/tests/SharpCompress.Test/Rar/RarReaderTests.cs @@ -19,7 +19,7 @@ public void Rar_Multi_Reader() => "Rar.multi.part03.rar", "Rar.multi.part04.rar", "Rar.multi.part05.rar", - "Rar.multi.part06.rar" + "Rar.multi.part06.rar", ] ); @@ -32,7 +32,7 @@ public void Rar5_Multi_Reader() => "Rar5.multi.part03.rar", "Rar5.multi.part04.rar", "Rar5.multi.part05.rar", - "Rar5.multi.part06.rar" + "Rar5.multi.part06.rar", ] ); @@ -66,7 +66,7 @@ public void Rar_Multi_Reader_Encrypted() => "Rar.EncryptedParts.part03.rar", "Rar.EncryptedParts.part04.rar", "Rar.EncryptedParts.part05.rar", - "Rar.EncryptedParts.part06.rar" + "Rar.EncryptedParts.part06.rar", ] ); @@ -102,7 +102,7 @@ public void Rar_Multi_Reader_Delete_Files() => "Rar.multi.part03.rar", "Rar.multi.part04.rar", "Rar.multi.part05.rar", - "Rar.multi.part06.rar" + "Rar.multi.part06.rar", ] ); @@ -115,7 +115,7 @@ public void Rar5_Multi_Reader_Delete_Files() => "Rar5.multi.part03.rar", "Rar5.multi.part04.rar", "Rar5.multi.part05.rar", - "Rar5.multi.part06.rar" + "Rar5.multi.part06.rar", ] ); @@ -338,7 +338,7 @@ public void Rar_NullReference() "Rar.EncryptedParts.part03.rar", "Rar.EncryptedParts.part04.rar", "Rar.EncryptedParts.part05.rar", - "Rar.EncryptedParts.part06.rar" + "Rar.EncryptedParts.part06.rar", }; using var reader = RarReader.Open( diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj index a47b2174..b47aefe0 100644 --- a/tests/SharpCompress.Test/SharpCompress.Test.csproj +++ b/tests/SharpCompress.Test/SharpCompress.Test.csproj @@ -1,6 +1,6 @@  - net8.0;net462 + net8.0;net472 SharpCompress.Test SharpCompress.Test SharpCompress.Test.snk diff --git a/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs b/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs index 2eea6607..634929b1 100644 --- a/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs +++ b/tests/SharpCompress.Test/Streams/LzmaStreamTests.cs @@ -174,7 +174,7 @@ public void TestLzma2Decompress1Byte() 0xF1, 0x76, 0x03, - 0x90 + 0x90, ]; /// @@ -509,7 +509,7 @@ public void TestLzma2Decompress1Byte() 0x0A, 0x00, 0x00, - 0x00 + 0x00, ]; [Fact] diff --git a/tests/SharpCompress.Test/Streams/ZlibBaseStreamTests.cs b/tests/SharpCompress.Test/Streams/ZlibBaseStreamTests.cs index 56f934d6..ab8e6656 100644 --- a/tests/SharpCompress.Test/Streams/ZlibBaseStreamTests.cs +++ b/tests/SharpCompress.Test/Streams/ZlibBaseStreamTests.cs @@ -34,7 +34,7 @@ public void TestChunkedZlibCompressesEverything() 0x8b, 0xce, 0x49, - 0xd2 + 0xd2, }; var buf = new byte[plainData.Length * 2]; diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs index 1024e945..efbde472 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs @@ -252,7 +252,7 @@ public void Tar_Japanese_Name(int length) [Fact] public void Tar_Read_One_At_A_Time() { - var archiveEncoding = new ArchiveEncoding { Default = Encoding.UTF8, }; + var archiveEncoding = new ArchiveEncoding { Default = Encoding.UTF8 }; var tarWriterOptions = new TarWriterOptions(CompressionType.None, true) { ArchiveEncoding = archiveEncoding, diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs index 3b6a6a88..d2b01ef0 100644 --- a/tests/SharpCompress.Test/Tar/TarReaderTests.cs +++ b/tests/SharpCompress.Test/Tar/TarReaderTests.cs @@ -232,7 +232,7 @@ public void Tar_GZip_With_Symlink_Entries() } link.CreateSymbolicLinkTo(targetPath); } - } + }, } ); if (!isWindows) diff --git a/tests/SharpCompress.Test/WriterTests.cs b/tests/SharpCompress.Test/WriterTests.cs index 50695ef1..ba08b3d2 100644 --- a/tests/SharpCompress.Test/WriterTests.cs +++ b/tests/SharpCompress.Test/WriterTests.cs @@ -22,7 +22,7 @@ protected void Write( { using (Stream stream = File.OpenWrite(Path.Combine(SCRATCH2_FILES_PATH, archive))) { - var writerOptions = new WriterOptions(compressionType) { LeaveStreamOpen = true, }; + var writerOptions = new WriterOptions(compressionType) { LeaveStreamOpen = true }; writerOptions.ArchiveEncoding.Default = encoding ?? Encoding.Default; diff --git a/tests/SharpCompress.Test/Xz/XZTestsBase.cs b/tests/SharpCompress.Test/Xz/XZTestsBase.cs index a679934e..d1c15638 100644 --- a/tests/SharpCompress.Test/Xz/XZTestsBase.cs +++ b/tests/SharpCompress.Test/Xz/XZTestsBase.cs @@ -61,7 +61,7 @@ public void Dispose() 0x00, 0x01, 0x59, - 0x5a + 0x5a, ]; protected static byte[] OriginalEmptyBytes => Encoding.ASCII.GetBytes(OriginalEmpty); @@ -451,7 +451,7 @@ public void Dispose() 0x00, 0x04, 0x59, - 0x5a + 0x5a, ]; protected static byte[] OriginalBytes => Encoding.ASCII.GetBytes(Original); @@ -1119,7 +1119,7 @@ public void Dispose() 0x00, 0x01, 0x59, - 0x5a + 0x5a, ]; protected static byte[] OriginalIndexedBytes => Encoding.ASCII.GetBytes(OriginalIndexed); diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs index 34de7422..4fb6d89a 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs @@ -121,7 +121,7 @@ public void Zip_GetPartsSplit() => "Zip.deflate.split.003", "Zip.deflate.split.004", "Zip.deflate.split.005", - "Zip.deflate.split.006" + "Zip.deflate.split.006", } ); @@ -755,7 +755,7 @@ public void Zip_Uncompressed_Skip_All() "Folder/File2.rtf", "Folder2/File1.txt", "Folder2/File2.txt", - "DEADBEEF" + "DEADBEEF", }; var zipPath = Path.Combine(TEST_ARCHIVES_PATH, "Zip.uncompressed.zip"); using var stream = File.Open(zipPath, FileMode.Open, FileAccess.Read); @@ -784,7 +784,7 @@ public void Zip_Forced_Ignores_UnicodePathExtra() ArchiveEncoding = new ArchiveEncoding { Default = Encoding.GetEncoding("shift_jis"), - } + }, } ); var reader = archive.ExtractAllEntries(); @@ -800,7 +800,7 @@ public void Zip_Forced_Ignores_UnicodePathExtra() ArchiveEncoding = new ArchiveEncoding { Forced = Encoding.GetEncoding("shift_jis"), - } + }, } ); var reader = archive.ExtractAllEntries(); diff --git a/tests/SharpCompress.Test/Zip/ZipReaderTests.cs b/tests/SharpCompress.Test/Zip/ZipReaderTests.cs index 3296bcb0..69c6326f 100644 --- a/tests/SharpCompress.Test/Zip/ZipReaderTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipReaderTests.cs @@ -248,7 +248,7 @@ public void TestSharpCompressWithEmptyStream() var expected = new[] { new Tuple("foo.txt", Array.Empty()), - new Tuple("foo2.txt", new byte[10]) + new Tuple("foo2.txt", new byte[10]), }; using var memory = new MemoryStream(); diff --git a/tests/SharpCompress.Test/packages.lock.json b/tests/SharpCompress.Test/packages.lock.json index 94f193fc..b0b649c0 100644 --- a/tests/SharpCompress.Test/packages.lock.json +++ b/tests/SharpCompress.Test/packages.lock.json @@ -1,32 +1,23 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.2": { + ".NETFramework,Version=v4.7.2": { "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "mTLbcU991EQ1SEmNbVBaGGGJy0YFzvGd1sYJGNZ07nlPKuyHSn1I22aeKzqQXgEiaKyRO6MSCto9eN9VxMwBdA==", "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.0" + "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.10.0" - } - }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "requested": "[17.12.0, )", + "resolved": "17.12.0", + "contentHash": "kt/PKBZ91rFCWxVIJZSgVLk+YR+4KxTuHf799ho8WNiK5ZQpJNAEZCAWX86vcKrs+DiYjiibpYKdGZP6+/N17w==", "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + "Microsoft.CodeCoverage": "17.12.0" } }, "Microsoft.SourceLink.GitHub": { @@ -41,31 +32,31 @@ }, "xunit": { "type": "Direct", - "requested": "[2.9.0, )", - "resolved": "2.9.0", - "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==", + "requested": "[2.9.3, )", + "resolved": "2.9.3", + "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==", "dependencies": { - "xunit.analyzers": "1.15.0", - "xunit.assert": "2.9.0", - "xunit.core": "[2.9.0]" + "xunit.analyzers": "1.18.0", + "xunit.assert": "2.9.3", + "xunit.core": "[2.9.3]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.8.2, )", - "resolved": "2.8.2", - "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==", + "requested": "[3.0.1, )", + "resolved": "3.0.1", + "contentHash": "lbyYtsBxA8Pz8kaf5Xn/Mj1mL9z2nlBWdZhqFaj66nxXBa4JwiTDm4eGcpSMet6du9TOWI6bfha+gQR6+IHawg==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0" + "Microsoft.TestPlatform.ObjectModel": "17.12.0" } }, "Xunit.SkippableFact": { "type": "Direct", - "requested": "[1.4.13, )", - "resolved": "1.4.13", - "contentHash": "IyzZNvJEtXGlXrzxDiSbtH5Lyxf4iJdRQADuyjGdDf00LjXRLJwIoezQNFhFGKTMtvk8IIgaSHxW4mAV4O7b8A==", + "requested": "[1.5.23, )", + "resolved": "1.5.23", + "contentHash": "JlKobLTlsGcuJ8OtoodxL63bUagHSVBnF+oQ2GgnkwNqK+XYjeYyhQasULi5Ebx1MNDGNbOMplQYr89mR+nItQ==", "dependencies": { - "Validation": "2.4.18", + "Validation": "2.5.51", "xunit.extensibility.execution": "2.4.0" } }, @@ -76,13 +67,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" - }, - "Microsoft.NETFramework.ReferenceAssemblies.net462": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + "resolved": "17.12.0", + "contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -91,8 +77,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.12.0", + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } @@ -104,8 +90,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.0", + "contentHash": "t+SoieZsRuEyiw/J+qXUbolyO219tKQQI0+2/YI+Qv7YdGValA6WiuokrNKqjrTNsy5ABWU11bdKOzUdheteXg==" }, "System.Reflection.Metadata": { "type": "Transitive", @@ -117,8 +103,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.0", + "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -130,8 +116,8 @@ }, "Validation": { "type": "Transitive", - "resolved": "2.4.18", - "contentHash": "NfvWJ1QeuZ1FQCkqgXTu1cOkRkbNCfxs4Tat+abXLwom6OXbULVhRGp34BTvVB4XPxj6VIAl7KfLfStXMt/Ehw==" + "resolved": "2.5.51", + "contentHash": "g/Aug7PVWaenlJ0QUyt/mEetngkQNsMCuNeRVXbcJED1nZS7JcK+GTU4kz3jcQ7bFuKfi8PF4ExXH7XSFNuSLQ==" }, "xunit.abstractions": { "type": "Transitive", @@ -140,37 +126,37 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.15.0", - "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ==" + "resolved": "1.18.0", + "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA==" + "resolved": "2.9.3", + "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA==" }, "xunit.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==", + "resolved": "2.9.3", + "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]", - "xunit.extensibility.execution": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]", + "xunit.extensibility.execution": "[2.9.3]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==", + "resolved": "2.9.3", + "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==", "dependencies": { "xunit.abstractions": "2.0.3" } }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==", + "resolved": "2.9.3", + "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]" } }, "sharpcompress": { @@ -178,9 +164,9 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.Buffers": "[4.6.0, )", - "System.Memory": "[4.5.5, )", + "System.Memory": "[4.6.0, )", "System.Text.Encoding.CodePages": "[8.0.0, )", - "ZstdSharp.Port": "[0.8.1, )" + "ZstdSharp.Port": "[0.8.4, )" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -200,13 +186,13 @@ }, "System.Memory": { "type": "CentralTransitive", - "requested": "[4.5.5, )", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "requested": "[4.6.0, )", + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.0", + "System.Numerics.Vectors": "4.6.0", + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "System.Text.Encoding.CodePages": { @@ -221,33 +207,34 @@ }, "ZstdSharp.Port": { "type": "CentralTransitive", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==", + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Memory": "4.5.5" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } } }, "net8.0": { "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "mTLbcU991EQ1SEmNbVBaGGGJy0YFzvGd1sYJGNZ07nlPKuyHSn1I22aeKzqQXgEiaKyRO6MSCto9eN9VxMwBdA==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.4.0" + "System.Configuration.ConfigurationManager": "6.0.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.12.0, )", + "resolved": "17.12.0", + "contentHash": "kt/PKBZ91rFCWxVIJZSgVLk+YR+4KxTuHf799ho8WNiK5ZQpJNAEZCAWX86vcKrs+DiYjiibpYKdGZP6+/N17w==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.12.0", + "Microsoft.TestPlatform.TestHost": "17.12.0" } }, "Microsoft.SourceLink.GitHub": { @@ -268,28 +255,28 @@ }, "xunit": { "type": "Direct", - "requested": "[2.9.0, )", - "resolved": "2.9.0", - "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==", + "requested": "[2.9.3, )", + "resolved": "2.9.3", + "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==", "dependencies": { - "xunit.analyzers": "1.15.0", - "xunit.assert": "2.9.0", - "xunit.core": "[2.9.0]" + "xunit.analyzers": "1.18.0", + "xunit.assert": "2.9.3", + "xunit.core": "[2.9.3]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.8.2, )", - "resolved": "2.8.2", - "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==" + "requested": "[3.0.1, )", + "resolved": "3.0.1", + "contentHash": "lbyYtsBxA8Pz8kaf5Xn/Mj1mL9z2nlBWdZhqFaj66nxXBa4JwiTDm4eGcpSMet6du9TOWI6bfha+gQR6+IHawg==" }, "Xunit.SkippableFact": { "type": "Direct", - "requested": "[1.4.13, )", - "resolved": "1.4.13", - "contentHash": "IyzZNvJEtXGlXrzxDiSbtH5Lyxf4iJdRQADuyjGdDf00LjXRLJwIoezQNFhFGKTMtvk8IIgaSHxW4mAV4O7b8A==", + "requested": "[1.5.23, )", + "resolved": "1.5.23", + "contentHash": "JlKobLTlsGcuJ8OtoodxL63bUagHSVBnF+oQ2GgnkwNqK+XYjeYyhQasULi5Ebx1MNDGNbOMplQYr89mR+nItQ==", "dependencies": { - "Validation": "2.4.18", + "Validation": "2.5.51", "xunit.extensibility.execution": "2.4.0" } }, @@ -300,8 +287,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.12.0", + "contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -310,21 +297,26 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.12.0", + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.12.0", + "contentHash": "MiPEJQNyADfwZ4pJNpQex+t9/jOClBGMiCiVVFuELCMSX2nmNfvUor3uFVxNNCg30uxDP8JDYfPnMXQzsfzYyg==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.12.0", "Newtonsoft.Json": "13.0.1" } }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, "Newtonsoft.Json": { "type": "Transitive", "resolved": "13.0.1", @@ -332,10 +324,19 @@ }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==", + "resolved": "6.0.0", + "contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.4.0" + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" } }, "System.Reflection.Metadata": { @@ -343,15 +344,37 @@ "resolved": "1.6.0", "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Windows.Extensions": "6.0.0" + } + }, + "System.Windows.Extensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } }, "Validation": { "type": "Transitive", - "resolved": "2.4.18", - "contentHash": "NfvWJ1QeuZ1FQCkqgXTu1cOkRkbNCfxs4Tat+abXLwom6OXbULVhRGp34BTvVB4XPxj6VIAl7KfLfStXMt/Ehw==" + "resolved": "2.5.51", + "contentHash": "g/Aug7PVWaenlJ0QUyt/mEetngkQNsMCuNeRVXbcJED1nZS7JcK+GTU4kz3jcQ7bFuKfi8PF4ExXH7XSFNuSLQ==" }, "xunit.abstractions": { "type": "Transitive", @@ -360,44 +383,44 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.15.0", - "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ==" + "resolved": "1.18.0", + "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA==" + "resolved": "2.9.3", + "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA==" }, "xunit.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==", + "resolved": "2.9.3", + "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]", - "xunit.extensibility.execution": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]", + "xunit.extensibility.execution": "[2.9.3]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==", + "resolved": "2.9.3", + "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==", "dependencies": { "xunit.abstractions": "2.0.3" } }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==", + "resolved": "2.9.3", + "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]" } }, "sharpcompress": { "type": "Project", "dependencies": { "System.Buffers": "[4.6.0, )", - "ZstdSharp.Port": "[0.8.1, )" + "ZstdSharp.Port": "[0.8.4, )" } }, "System.Buffers": { @@ -408,9 +431,9 @@ }, "ZstdSharp.Port": { "type": "CentralTransitive", - "requested": "[0.8.1, )", - "resolved": "0.8.1", - "contentHash": "19tNz33kn2EkyViFXuxfVn338UJaRmkwBphVqP2dVJIYQUQgFrgG5h061mxkRRg1Ax6r+6WOj1FxaFZ5qaWqqg==" + "requested": "[0.8.4, )", + "resolved": "0.8.4", + "contentHash": "eieSXq3kakCUXbgdxkKaRqWS6hF0KBJcqok9LlDCs60GOyrynLvPOcQ0pRw7shdPF7lh/VepJ9cP9n9HHc759g==" } } }