diff --git a/Directory.Build.props b/Directory.Build.props index bc1b9017..201f39e1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,11 +11,10 @@ latest-AllEnabledByDefault true true - false true true - true - true + false + false true diff --git a/src/SharpCompress/Algorithms/Adler32.cs b/src/SharpCompress/Algorithms/Adler32.cs index 19d0e3aa..548ae687 100644 --- a/src/SharpCompress/Algorithms/Adler32.cs +++ b/src/SharpCompress/Algorithms/Adler32.cs @@ -9,6 +9,7 @@ using System; using System.Runtime.CompilerServices; #if SUPPORTS_RUNTIME_INTRINSICS +using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; #endif diff --git a/src/SharpCompress/IO/StackStreamExtensions.cs b/src/SharpCompress/IO/StackStreamExtensions.cs index 6eacc2d4..e7832f34 100644 --- a/src/SharpCompress/IO/StackStreamExtensions.cs +++ b/src/SharpCompress/IO/StackStreamExtensions.cs @@ -1,6 +1,10 @@ using System; using System.Collections.Generic; using System.IO; +#if !NETFRAMEWORK && !NETSTANDARD2_0 +using System.Diagnostics; +using System.Text; +#endif namespace SharpCompress.IO; @@ -230,6 +234,7 @@ internal static class StackStreamExtensions return instanceId; } +#if DEBUG_STREAMS /// /// Writes a debug message for stream construction. /// @@ -242,14 +247,15 @@ internal static class StackStreamExtensions var frame = (new StackTrace()).GetFrame(3); var parentInfo = frame != null +#pragma warning disable IL2026 ? $"{frame.GetMethod()?.DeclaringType?.Name}.{frame.GetMethod()?.Name}()" +#pragma warning restore IL2026 : "Unknown"; if (constructing.FullName == stream.GetType().FullName) //don't debug base IStackStream types { Debug.WriteLine($"{GetStreamStackString(stream, true)} : Constructed by [{parentInfo}]"); } } - /// /// Writes a debug message for stream disposal. /// @@ -260,13 +266,16 @@ internal static class StackStreamExtensions var frame = (new StackTrace()).GetFrame(3); var parentInfo = frame != null - ? $"{frame.GetMethod()?.DeclaringType?.Name}.{frame.GetMethod()?.Name}()" - : "Unknown"; +#pragma warning disable IL2026 + ? $"{frame.GetMethod()?.DeclaringType?.Name}.{frame.GetMethod()?.Name}()" +#pragma warning restore IL2026 + : "Unknown"; if (constructing.FullName == stream.GetType().FullName) //don't debug base IStackStream types { Debug.WriteLine($"{GetStreamStackString(stream, false)} : Disposed by [{parentInfo}]"); } } + #endif /// /// Writes a debug trace message for the stream. diff --git a/tests/SharpCompress.Test/BZip2/BZip2ReaderTests.cs b/tests/SharpCompress.Test/BZip2/BZip2ReaderTests.cs index 030a627d..bae9c30c 100644 --- a/tests/SharpCompress.Test/BZip2/BZip2ReaderTests.cs +++ b/tests/SharpCompress.Test/BZip2/BZip2ReaderTests.cs @@ -16,6 +16,6 @@ public class BZip2ReaderTests : ReaderTests Stream stream = new MemoryStream( [0x42, 0x5a, 0x68, 0x34, 0x31, 0x41, 0x59, 0x26, 0x53, 0x59, 0x35] ); - Assert.Throws(typeof(InvalidOperationException), () => ReaderFactory.Open(stream)); + Assert.Throws(() => ReaderFactory.Open(stream)); } } diff --git a/tests/SharpCompress.Test/GZip/GZipArchiveTests.cs b/tests/SharpCompress.Test/GZip/GZipArchiveTests.cs index 6a2b9795..db93c0c1 100644 --- a/tests/SharpCompress.Test/GZip/GZipArchiveTests.cs +++ b/tests/SharpCompress.Test/GZip/GZipArchiveTests.cs @@ -122,6 +122,6 @@ public class GZipArchiveTests : ArchiveTests { using var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar.gz")); using var archive = GZipArchive.Open(stream); - Assert.Equal(archive.Type, ArchiveType.GZip); + Assert.Equal(ArchiveType.GZip, archive.Type); } } diff --git a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs index 429a0d80..d1a2b4f4 100644 --- a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs +++ b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs @@ -17,8 +17,7 @@ public class RarArchiveTests : ArchiveTests [Fact] public void Rar_EncryptedFileAndHeader_NoPasswordExceptionTest() => - Assert.Throws( - typeof(CryptographicException), + Assert.Throws( () => ReadRarPassword("Rar.encrypted_filesAndHeader.rar", null) ); @@ -28,15 +27,13 @@ public class RarArchiveTests : ArchiveTests [Fact] public void Rar5_EncryptedFileAndHeader_Archive_Err() => - Assert.Throws( - typeof(CryptographicException), + Assert.Throws( () => ReadRarPassword("Rar5.encrypted_filesAndHeader.rar", "failed") ); [Fact] public void Rar5_EncryptedFileAndHeader_NoPasswordExceptionTest() => - Assert.Throws( - typeof(CryptographicException), + Assert.Throws( () => ReadRarPassword("Rar5.encrypted_filesAndHeader.rar", null) ); @@ -46,8 +43,7 @@ public class RarArchiveTests : ArchiveTests [Fact] public void Rar_EncryptedFileOnly_Archive_Err() => - Assert.Throws( - typeof(CryptographicException), + Assert.Throws( () => ReadRarPassword("Rar5.encrypted_filesOnly.rar", "failed") ); diff --git a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs index b52d4bc2..64c26539 100644 --- a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs +++ b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs @@ -34,8 +34,7 @@ public class SevenZipArchiveTests : ArchiveTests [Fact] public void SevenZipArchive_LZMAAES_NoPasswordExceptionTest() => - Assert.Throws( - typeof(CryptographicException), + Assert.Throws( () => ArchiveFileRead("7Zip.LZMA.Aes.7z", new ReaderOptions { Password = null }) ); //was failing with ArgumentNullException not CryptographicException like rar diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs index efbde472..ac21143c 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs @@ -49,7 +49,7 @@ public class TarArchiveTests : ArchiveTests var unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); using (var archive2 = TarArchive.Open(unmodified)) { - Assert.Equal(1, archive2.Entries.Count); + Assert.Single(archive2.Entries); Assert.Contains(filename, archive2.Entries.Select(entry => entry.Key)); foreach (var entry in archive2.Entries) @@ -109,7 +109,7 @@ public class TarArchiveTests : ArchiveTests var unmodified = Path.Combine(SCRATCH2_FILES_PATH, archive); using (var archive2 = TarArchive.Open(unmodified)) { - Assert.Equal(1, archive2.Entries.Count); + Assert.Single(archive2.Entries); Assert.Contains(longFilename, archive2.Entries.Select(entry => entry.Key)); foreach (var entry in archive2.Entries) diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs index a676d2da..f58b9ebb 100644 --- a/tests/SharpCompress.Test/Tar/TarReaderTests.cs +++ b/tests/SharpCompress.Test/Tar/TarReaderTests.cs @@ -256,7 +256,7 @@ public class TarReaderTests : ReaderTests } else { - Assert.True(false, "Symlink has no target"); + Assert.Fail("Symlink has no target"); } } } diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs index 4ad0298b..64974dc6 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs @@ -496,7 +496,7 @@ public class ZipArchiveTests : ArchiveTests new ReaderOptions { Password = "test" } ); var isComplete = reader.IsComplete; - Assert.Equal(1, reader.Volumes.Count); + Assert.Single(reader.Volumes); var expectedComment = "Encoding:utf-8 || Compression:Deflate levelDefault || Encrypt:None || ZIP64:Always\r\nCreated at 2017-Jan-23 14:10:43 || DotNetZip Tool v1.9.1.8\r\nTest zip64 archive";