Merge pull request #789 from adamhathcock/dotnet8

Dotnet8
adamhathcock · Dec 18, 2023 · 8f27121 · 8f27121
2 parents 28ea50b + b986bf6
commit 8f27121
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 81 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.26.1",
+      "version": "0.26.7",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -17,16 +17,9 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
-    - name: NuGet Caching
-      uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('packages.lock.json', '*/packages.lock.json') }}
-        restore-keys: |
-            ${{ runner.os }}-nuget-
+        dotnet-version: 8.0.x
     - run: dotnet run --project build/build.csproj
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.os }}-sharpcompress.nupkg
         path: artifacts/*
diff --git a/build/Program.cs b/build/Program.cs
@@ -61,7 +61,7 @@ void RemoveDirectory(string d)
 Target(
     Test,
     DependsOn(Build),
-    ForEach("net7.0", "net462"),
+    ForEach("net8.0", "net462"),
     framework =>
     {
         IEnumerable<string> GetFiles(string d)

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.101",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/SharpCompress/Archives/ArchiveFactory.cs b/src/SharpCompress/Archives/ArchiveFactory.cs
@@ -26,8 +26,7 @@ public static IArchive Open(Stream stream, ReaderOptions? readerOptions = null)
     public static IWritableArchive Create(ArchiveType type)
     {
         var factory = Factory
-            .Factories
-            .OfType<IWriteableArchiveFactory>()
+            .Factories.OfType<IWriteableArchiveFactory>()
             .FirstOrDefault(item => item.KnownArchiveType == type);
 
         if (factory != null)

diff --git a/src/SharpCompress/Archives/Rar/RarArchive.cs b/src/SharpCompress/Archives/Rar/RarArchive.cs
@@ -40,9 +40,9 @@ protected override IEnumerable<RarVolume> LoadVolumes(SourceStream srcStream)
             streams[1].Position = 0;
             SrcStream.Position = 0;
 
-            return srcStream
-                .Streams
-                .Select(a => new StreamRarArchiveVolume(a, ReaderOptions, idx++));
+            return srcStream.Streams.Select(
+                a => new StreamRarArchiveVolume(a, ReaderOptions, idx++)
+            );
         }
         else //split mode or single file
         {

diff --git a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
@@ -236,13 +236,11 @@ protected override IEnumerable<SevenZipEntry> GetEntries(Stream stream)
                 }
                 else
                 {
-                    currentStream = archive
-                        .database
-                        .GetFolderStream(
-                            stream,
-                            currentFolder,
-                            new PasswordProvider(Options.Password)
-                        );
+                    currentStream = archive.database.GetFolderStream(
+                        stream,
+                        currentFolder,
+                        new PasswordProvider(Options.Password)
+                    );
                 }
                 foreach (var entry in group)
                 {

diff --git a/src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs b/src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs
@@ -48,15 +48,15 @@ keySize switch
 
     private void Initialize()
     {
-#if NET7_0
+#if NETFRAMEWORK || NETSTANDARD2_0
+        var rfc2898 = new Rfc2898DeriveBytes(_password, _salt, RFC2898_ITERATIONS);
+#else
         var rfc2898 = new Rfc2898DeriveBytes(
             _password,
             _salt,
             RFC2898_ITERATIONS,
             HashAlgorithmName.SHA1
         );
-#else
-        var rfc2898 = new Rfc2898DeriveBytes(_password, _salt, RFC2898_ITERATIONS);
 #endif
 
         KeyBytes = rfc2898.GetBytes(KeySizeInBytes); // 16 or 24 or 32 ???

diff --git a/src/SharpCompress/Common/Zip/ZipHeaderFactory.cs b/src/SharpCompress/Common/Zip/ZipHeaderFactory.cs
@@ -142,9 +142,9 @@ private void LoadHeader(ZipFileEntry entryHeader, Stream stream)
 
             if (entryHeader.CompressionMethod == ZipCompressionMethod.WinzipAes)
             {
-                var data = entryHeader
-                    .Extra
-                    .SingleOrDefault(x => x.Type == ExtraDataType.WinZipAes);
+                var data = entryHeader.Extra.SingleOrDefault(
+                    x => x.Type == ExtraDataType.WinZipAes
+                );
                 if (data != null)
                 {
                     var keySize = (WinzipAesKeySize)data.DataBytes[4];

diff --git a/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs b/src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs
@@ -1269,10 +1269,9 @@ private bool AddVMCode(int firstByte, List<byte> vmCode, int length)
             if (CurSize < DataSize + RarVM.VM_FIXEDGLOBALSIZE)
             {
                 // StackFilter->Prg.GlobalData.Add(DataSize+VM_FIXEDGLOBALSIZE-CurSize);
-                StackFilter
-                    .Program
-                    .GlobalData
-                    .SetSize(DataSize + RarVM.VM_FIXEDGLOBALSIZE - CurSize);
+                StackFilter.Program.GlobalData.SetSize(
+                    DataSize + RarVM.VM_FIXEDGLOBALSIZE - CurSize
+                );
             }
             var offset = RarVM.VM_FIXEDGLOBALSIZE;
             globalData = StackFilter.Program.GlobalData;

diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj
@@ -6,7 +6,7 @@
 		<AssemblyVersion>0.34.2</AssemblyVersion>
 		<FileVersion>0.34.2</FileVersion>
 		<Authors>Adam Hathcock</Authors>
-		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
 		<AssemblyName>SharpCompress</AssemblyName>
 		<AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>true</SignAssembly>
@@ -27,18 +27,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="ZstdSharp.Port" Version="0.7.2" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+		<PackageReference Include="ZstdSharp.Port" Version="0.7.4" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 		<PackageReference Include="System.Memory" Version="4.5.5" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' == 'NETFRAMEWORK' ">
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 		<PackageReference Include="System.Memory" Version="4.5.5" />
 	</ItemGroup>
 </Project>
diff --git a/src/SharpCompress/Writers/WriterFactory.cs b/src/SharpCompress/Writers/WriterFactory.cs
@@ -10,9 +10,7 @@ public static class WriterFactory
     public static IWriter Open(Stream stream, ArchiveType archiveType, WriterOptions writerOptions)
     {
         var factory = Factories
-            .Factory
-            .Factories
-            .OfType<IWriterFactory>()
+            .Factory.Factories.OfType<IWriterFactory>()
             .FirstOrDefault(item => item.KnownArchiveType == archiveType);
 
         if (factory != null)

diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <AssemblyName>SharpCompress.Test</AssemblyName>
     <PackageId>SharpCompress.Test</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\SharpCompress\SharpCompress.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.6.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
   <ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' != 'NETFRAMEWORK' ">

diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs
@@ -198,9 +198,9 @@ public void Tar_Random_Write_Remove()
 
         using (var archive = TarArchive.Open(unmodified))
         {
-            var entry = archive
-                .Entries
-                .Single(x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase));
+            var entry = archive.Entries.Single(
+                x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)
+            );
             archive.RemoveEntry(entry);
             archive.SaveTo(scratchPath, CompressionType.None);
         }

diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs
@@ -209,11 +209,9 @@ public void Tar_Broken_Stream()
     [Fact]
     public void Tar_GZip_With_Symlink_Entries()
     {
-        var isWindows = System
-            .Runtime
-            .InteropServices
-            .RuntimeInformation
-            .IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows);
+        var isWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
+            System.Runtime.InteropServices.OSPlatform.Windows
+        );
         using (
             Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "TarWithSymlink.tar.gz"))
         )
@@ -256,15 +254,12 @@ public void Tar_GZip_With_Symlink_Entries()
                         {
                             // need to convert the link to an absolute path for comparison
                             var target = reader.Entry.LinkTarget;
-                            var realTarget = System
-                                .IO
-                                .Path
-                                .GetFullPath(
-                                    System
-                                        .IO
-                                        .Path
-                                        .Combine($"{System.IO.Path.GetDirectoryName(path)}", target)
-                                );
+                            var realTarget = System.IO.Path.GetFullPath(
+                                System.IO.Path.Combine(
+                                    $"{System.IO.Path.GetDirectoryName(path)}",
+                                    target
+                                )
+                            );
 
                             Assert.Equal(realTarget, link.GetContents().ToString());
                         }

diff --git a/tests/SharpCompress.Test/TestBase.cs b/tests/SharpCompress.Test/TestBase.cs
@@ -20,10 +20,10 @@ public class TestBase : IDisposable
 
     public TestBase()
     {
-        var index = AppDomain
-            .CurrentDomain
-            .BaseDirectory
-            .IndexOf("SharpCompress.Test", StringComparison.OrdinalIgnoreCase);
+        var index = AppDomain.CurrentDomain.BaseDirectory.IndexOf(
+            "SharpCompress.Test",
+            StringComparison.OrdinalIgnoreCase
+        );
         var path = AppDomain.CurrentDomain.BaseDirectory.Substring(0, index);
         SOLUTION_BASE_PATH = Path.GetDirectoryName(path) ?? throw new ArgumentNullException();
 

diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs
@@ -184,9 +184,9 @@ public void Zip_Random_Write_Remove()
 
         using (var archive = ZipArchive.Open(unmodified))
         {
-            var entry = archive
-                .Entries
-                .Single(x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase));
+            var entry = archive.Entries.Single(
+                x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)
+            );
             archive.RemoveEntry(entry);
 
             WriterOptions writerOptions = new ZipWriterOptions(CompressionType.Deflate);
@@ -252,9 +252,9 @@ public void Zip_Removal_Poly()
                 )
             );
             Assert.Null(
-                ((IArchive)vfs)
-                    .Entries
-                    .FirstOrDefault(v => v.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase))
+                ((IArchive)vfs).Entries.FirstOrDefault(
+                    v => v.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)
+                )
             );
         }
     }
@@ -391,14 +391,14 @@ public void Zip_Create_New_Add_Remove()
         {
             archive.AddAllFromDirectory(SCRATCH_FILES_PATH);
             archive.RemoveEntry(
-                archive
-                    .Entries
-                    .Single(x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase))
+                archive.Entries.Single(
+                    x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)
+                )
             );
             Assert.Null(
-                archive
-                    .Entries
-                    .FirstOrDefault(x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase))
+                archive.Entries.FirstOrDefault(
+                    x => x.Key.EndsWith("jpg", StringComparison.OrdinalIgnoreCase)
+                )
             );
         }
         Directory.Delete(SCRATCH_FILES_PATH, true);