Merge pull request #21 from caraplana1/dev

Updating Dependecies
caraplana1 · May 23, 2024 · b24bd40 · b24bd40
2 parents fc6b3be + 333769c
commit b24bd40
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 26 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/ComicConverter/ComicConverter.csproj b/ComicConverter/ComicConverter.csproj
@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/caraplana1/ComicConverter</RepositoryUrl>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="PdfSharpCore" Version="1.3.10"/>
-		<PackageReference Include="SharpCompress" Version="0.30.1"/>
+		<PackageReference Include="PdfSharpCore" Version="1.3.63" />
+		<PackageReference Include="SharpCompress" Version="0.37.2" />
 	</ItemGroup>
 </Project>
diff --git a/Tests/ComicCreators/CbtFiles.cs b/Tests/ComicCreators/CbtFiles.cs
@@ -23,7 +23,7 @@ public void CreateCbt()
         [Fact]
         public void ImagesNotFound()
         {
-            string[] fakeFiles = { "fakefile1.jpg", "fakefile2.jpg", "fakefile3.jpg" };
+            string[] fakeFiles = ["fakefile1.jpg", "fakefile2.jpg", "fakefile3.jpg"];
 
             Assert.Throws<IOException>(() => ComicBuilder.CreateCBT(fakeFiles, cbtPath));
         }

diff --git a/Tests/ComicCreators/CbzFiles.cs b/Tests/ComicCreators/CbzFiles.cs
@@ -20,10 +20,10 @@ public void CreateCbz()
             File.Delete($"{cbzPath}.cbz");
         }
 
-        [Fact]
-        public void ImagesNotFound()
-        {
-            string[] files = { "Fakename", "fakename2", "fakename3" };
+		[Fact]
+		public void ImagesNotFound()
+		{
+            string[] files = ["Fakename", "fakename2", "fakename3"];
 
             Assert.Throws<IOException>(() => ComicBuilder.CreateCBZ(files, cbzPath));
         }

diff --git a/Tests/ComicCreators/PdfFiles.cs b/Tests/ComicCreators/PdfFiles.cs
@@ -1,7 +1,5 @@
 using Xunit;
 using System;
-using System.Linq;
-using System.Collections.Generic;
 using System.IO;
 using ComicConverter;
 
@@ -21,11 +19,11 @@ public void CreatePdf()
             File.Delete("pdftest.pdf");
         }
 
-        [Fact]
+		[Fact]
         public void FilesAreNotImages()
-        {
-            var images = Directory.GetFiles(Samples.IMAGESDIR);
-            images = images.ToList().Append(Samples.FAKEIMAGE).ToArray();
+		{
+			var images = Directory.GetFiles(Samples.IMAGESDIR);
+			images = [.. images, Samples.FAKEIMAGE];
 
             Assert.ThrowsAny<Exception>(() => ComicBuilder.CreatePdf(images, "pdftest"));
         }

diff --git a/Tests/ImageCollectors/CbrFiles.cs b/Tests/ImageCollectors/CbrFiles.cs
@@ -1,6 +1,5 @@
 using Xunit;
 using System.IO;
-using System.Linq;
 using ComicConverter;
 using System.Collections.Generic;
 
@@ -40,7 +39,7 @@ public void EmptyAttributeDirectory()
             ImageExtractors.UnRar(Samples.CBRPATH, "Folder");
             ImageExtractors.UnRar(Samples.CBRPATH);
 
-            List<string> filesExtracted = Directory.GetFiles(".").ToList<string>();
+            List<string> filesExtracted = [.. Directory.GetFiles(".")];
 
             foreach (var file in Directory.GetFiles("Folder"))
             {

diff --git a/Tests/ImageCollectors/CbtFiles.cs b/Tests/ImageCollectors/CbtFiles.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using ComicConverter;
 using Xunit;

diff --git a/Tests/ImageCollectors/CbzFiles.cs b/Tests/ImageCollectors/CbzFiles.cs
@@ -1,6 +1,5 @@
 using Xunit;
 using System.IO;
-using System.Linq;
 using ComicConverter;
 using System.Collections.Generic;
 
@@ -45,7 +44,7 @@ public void EmptyAttributeDirectory()
             ImageExtractors.UnZip(Samples.CBZPATH, folderToCompare);
 
             // Get a list of all files in current directory
-            List<string> filesExtracted = Directory.GetFiles(".").ToList<string>();
+            List<string> filesExtracted = [.. Directory.GetFiles(".")];
 
             foreach (var file in Directory.GetFiles(folderToCompare))
             {

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0"/>
-		<PackageReference Include="xunit" Version="2.4.1"/>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="xunit" Version="2.8.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\ComicConverter\ComicConverter.csproj"/>
+		<ProjectReference Include="..\ComicConverter\ComicConverter.csproj" />
 	</ItemGroup>
 </Project>