diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 31607fa..009d6c1 100644 --- 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 index 8a61576..d7ae072 100644 --- a/ComicConverter/ComicConverter.csproj +++ b/ComicConverter/ComicConverter.csproj @@ -12,7 +12,7 @@ https://github.com/caraplana1/ComicConverter - - + + \ No newline at end of file diff --git a/Tests/ComicCreators/CbtFiles.cs b/Tests/ComicCreators/CbtFiles.cs index ec9f52b..789b8e4 100644 --- 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(() => ComicBuilder.CreateCBT(fakeFiles, cbtPath)); } diff --git a/Tests/ComicCreators/CbzFiles.cs b/Tests/ComicCreators/CbzFiles.cs index 174c47f..608fa80 100644 --- 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(() => ComicBuilder.CreateCBZ(files, cbzPath)); } diff --git a/Tests/ComicCreators/PdfFiles.cs b/Tests/ComicCreators/PdfFiles.cs index db23092..ed6a358 100644 --- 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(() => ComicBuilder.CreatePdf(images, "pdftest")); } diff --git a/Tests/ImageCollectors/CbrFiles.cs b/Tests/ImageCollectors/CbrFiles.cs index 5d0a29a..b682a16 100644 --- 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 filesExtracted = Directory.GetFiles(".").ToList(); + List filesExtracted = [.. Directory.GetFiles(".")]; foreach (var file in Directory.GetFiles("Folder")) { diff --git a/Tests/ImageCollectors/CbtFiles.cs b/Tests/ImageCollectors/CbtFiles.cs index 56110b4..adbbe70 100644 --- 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 index 814310c..13a0847 100644 --- 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 filesExtracted = Directory.GetFiles(".").ToList(); + List filesExtracted = [.. Directory.GetFiles(".")]; foreach (var file in Directory.GetFiles(folderToCompare)) { diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index aec8aac..cafb3fe 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,21 +1,21 @@ - + - net6.0 + net8.0 false - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + \ No newline at end of file