Remove warnings and net7.0

julien1619 · julien1619 · commit bf5fdf4df2c2 · 2025-11-03T11:21:07.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,6 @@ jobs:
     strategy:
       matrix:
         dotnet:
-          - 7.0.x
           - 8.0.x
           - 9.0.x
           - 10.0.x
@@ -22,7 +21,6 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            7.0.x
             8.0.x
             9.0.x
             10.0.x
diff --git a/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj b/MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj b/MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj b/PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
@@ -1,6 +1,6 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/PdfSharpCore.Test/CreateSimplePDF.cs b/PdfSharpCore.Test/CreateSimplePDF.cs
@@ -131,7 +131,7 @@ private static void ReadStreamAndVerifyPdfHeaderSignature(Stream stream)
             var readBuffer = new byte[5];
             var pdfSignature = Encoding.ASCII.GetBytes("%PDF-"); // PDF must start with %PDF-
 
-            stream.Read(readBuffer, 0, readBuffer.Length);
+            stream.ReadExactly(readBuffer);
             readBuffer.Should().Equal(pdfSignature);
         }
 
diff --git a/PdfSharpCore.Test/Helpers/PdfHelper.cs b/PdfSharpCore.Test/Helpers/PdfHelper.cs
@@ -74,13 +74,12 @@ public static string WriteImage(IMagickImage image, string outDir, string fileNa
         //   For instance, actual and expected must both be sourced from .png files
         public static DiffOutput Diff(string actualImagePath, string expectedImagePath, string outputPath = null, string filePrefix = null, int fuzzPct = 4)
         {
-            var diffImg = new MagickImage();
             var actual = new MagickImage(actualImagePath);
             var expected = new MagickImage(expectedImagePath);
 
             // Allow for subtle differences due to cross-platform rendering of the PDF fonts
             actual.ColorFuzz = new Percentage(fuzzPct);
-            var diffVal = actual.Compare(expected, ErrorMetric.Absolute, diffImg);
+            var diffImg = actual.Compare(expected, ErrorMetric.Absolute, out double diffVal);
             
             if (diffVal > 0 && outputPath != null && filePrefix != null)
             {
diff --git a/PdfSharpCore.Test/IO/IoBaseTest.cs b/PdfSharpCore.Test/IO/IoBaseTest.cs
@@ -50,7 +50,7 @@ private static void ReadStreamAndVerifyPdfHeaderSignature(Stream stream)
             var readBuffer = new byte[5];
             var pdfSignature = Encoding.ASCII.GetBytes("%PDF-"); // PDF must start with %PDF-
 
-            stream.Read(readBuffer, 0, readBuffer.Length);
+            stream.ReadExactly(readBuffer);
             readBuffer.Should().Equal(pdfSignature);
         }
 
diff --git a/PdfSharpCore.Test/PdfSharpCore.Test.csproj b/PdfSharpCore.Test/PdfSharpCore.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/PdfSharpCore/PdfSharpCore.csproj b/PdfSharpCore/PdfSharpCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stefan Steiger and Contributors</Authors>
diff --git a/SampleApp/SampleApp.csproj b/SampleApp/SampleApp.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private static void ReadStreamAndVerifyPdfHeaderSignature(Stream stream)`
`131`	`131`	`var readBuffer = new byte[5];`
`132`	`132`	`var pdfSignature = Encoding.ASCII.GetBytes("%PDF-"); // PDF must start with %PDF-`
`133`	`133`
`134`		`- stream.Read(readBuffer, 0, readBuffer.Length);`
	`134`	`+ stream.ReadExactly(readBuffer);`
`135`	`135`	`readBuffer.Should().Equal(pdfSignature);`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,12 @@ public static string WriteImage(IMagickImage image, string outDir, string fileNa`
`74`	`74`	`// For instance, actual and expected must both be sourced from .png files`
`75`	`75`	`public static DiffOutput Diff(string actualImagePath, string expectedImagePath, string outputPath = null, string filePrefix = null, int fuzzPct = 4)`
`76`	`76`	`{`
`77`		`- var diffImg = new MagickImage();`
`78`	`77`	`var actual = new MagickImage(actualImagePath);`
`79`	`78`	`var expected = new MagickImage(expectedImagePath);`
`80`	`79`
`81`	`80`	`// Allow for subtle differences due to cross-platform rendering of the PDF fonts`
`82`	`81`	`actual.ColorFuzz = new Percentage(fuzzPct);`
`83`		`- var diffVal = actual.Compare(expected, ErrorMetric.Absolute, diffImg);`
	`82`	`+ var diffImg = actual.Compare(expected, ErrorMetric.Absolute, out double diffVal);`
`84`	`83`
`85`	`84`	`if (diffVal > 0 && outputPath != null && filePrefix != null)`
`86`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private static void ReadStreamAndVerifyPdfHeaderSignature(Stream stream)`
`50`	`50`	`var readBuffer = new byte[5];`
`51`	`51`	`var pdfSignature = Encoding.ASCII.GetBytes("%PDF-"); // PDF must start with %PDF-`
`52`	`52`
`53`		`- stream.Read(readBuffer, 0, readBuffer.Length);`
	`53`	`+ stream.ReadExactly(readBuffer);`
`54`	`54`	`readBuffer.Should().Equal(pdfSignature);`
`55`	`55`	`}`
`56`	`56`