Revert to 203 DPI when no pdfOptions are specified; update CI tests (#56

)
sungaila · Jun 26, 2024 · 21c4197 · 21c4197
1 parent 0bfa5f9
commit 21c4197
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: PDFtoZPL version
       description: Which version of PDFtoZPL is affected?
-      value: 5.0.1
+      value: 5.0.2
     validations:
       required: true
   - type: dropdown
@@ -33,7 +33,7 @@ body:
     attributes:
       label: OS version
       description: Which operating system version was used?
-      placeholder: e.g. Windows 11 23H2, Ubuntu 23.10, macOS 14.1, Android 14, ...
+      placeholder: e.g. Windows 11 24H2, Ubuntu 24.04, macOS 14.5, Android 14, ...
     validations:
       required: false
   - type: dropdown
@@ -58,6 +58,7 @@ body:
         - .NET (Core)
         - .NET Framework
         - Mono
+        - Unity
         - (Other)
       default: 0
     validations:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -128,7 +128,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-2019, windows-2022, ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14]
     runs-on: ${{ matrix.os }}
     if: success() && (github.event_name != 'workflow_dispatch' && true || inputs.run_tests) == true
     steps:

diff --git a/Console/Console.csproj b/Console/Console.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>PDFtoZPL.Console</AssemblyName>
     <RootNamespace>PDFtoZPL.Console</RootNamespace>
     <StartupObject>PDFtoZPL.Console.Program</StartupObject>
-    <Version>5.0.1</Version>
+    <Version>5.0.2</Version>
     <Configurations>Debug;Release;ReleaseSigned</Configurations>
   </PropertyGroup>
 

diff --git a/PDFtoZPL/Conversion.cs b/PDFtoZPL/Conversion.cs
@@ -88,6 +88,9 @@ public static string ConvertPdfPage(Stream pdfStream, bool leaveOpen = false, st
             if (pdfStream == null)
                 throw new ArgumentNullException(nameof(pdfStream));
 
+            if (pdfOptions == default)
+                pdfOptions = new PdfOptions();
+
             // Stream ->PdfiumViewer.PdfDocument -> Image
             var pdfBitmap = PDFtoImage.Conversion.ToImage(pdfStream, leaveOpen, password, page, pdfOptions);
 
@@ -168,6 +171,9 @@ public static IEnumerable<string> ConvertPdf(Stream pdfStream, bool leaveOpen =
             if (pdfStream == null)
                 throw new ArgumentNullException(nameof(pdfStream));
 
+            if (pdfOptions == default)
+                pdfOptions = new PdfOptions();
+
             // Stream ->PdfiumViewer.PdfDocument -> Image
             foreach (var image in PDFtoImage.Conversion.ToImages(pdfStream, leaveOpen, password, pdfOptions))
             {
@@ -253,6 +259,9 @@ public static async IAsyncEnumerable<string> ConvertPdfAsync(Stream pdfStream, b
             if (pdfStream == null)
                 throw new ArgumentNullException(nameof(pdfStream));
 
+            if (pdfOptions == default)
+                pdfOptions = new PdfOptions();
+
             // Stream -> PdfiumViewer.PdfDocument -> Image
             await foreach (var image in PDFtoImage.Conversion.ToImagesAsync(pdfStream, leaveOpen, password, pdfOptions, cancellationToken))
             {

diff --git a/PDFtoZPL/PDFtoZPL.csproj b/PDFtoZPL/PDFtoZPL.csproj
@@ -12,7 +12,7 @@
 
   <!-- NuGet -->
   <PropertyGroup>
-    <VersionPrefix>5.0.1</VersionPrefix>
+    <VersionPrefix>5.0.2</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>David Sungaila</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -21,9 +21,7 @@
     <PackageProjectUrl>https://github.com/sungaila/PDFtoZPL</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/sungaila/PDFtoZPL/master/Icon_128.png</PackageIconUrl>
     <Description>A .NET library to convert PDF files (and bitmaps) into Zebra Programming Language code.</Description>
-    <PackageReleaseNotes>- Revert from 300 to 203 as default DPI. This is a breaking change.
-- Replace PDFtoImage.RenderOptions with PDFtoZPL.PdfOptions. This is a breaking change.
-- Fixed interactions between parameters Bounds and Width/Height.</PackageReleaseNotes>
+    <PackageReleaseNotes>- Revert from 300 to 203 as default DPI when no pdfOptions was specified. This is a breaking change.</PackageReleaseNotes>
     <PackageTags>PDF ZPL Zebra Bitmap Convert Conversion C# PDFium MAUI wasm WebAssembly</PackageTags>
     <RepositoryUrl>https://github.com/sungaila/PDFtoZPL.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/Tests/PdfConversionTests.cs b/Tests/PdfConversionTests.cs
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -61,8 +61,8 @@
 
   <!-- NuGet Icon -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
   </ItemGroup>
 </Project>
diff --git a/WebConverter/WebConverter.csproj b/WebConverter/WebConverter.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>PDFtoZPL.WebConverter</AssemblyName>
     <RootNamespace>PDFtoZPL.WebConverter</RootNamespace>
     <StartupObject>PDFtoZPL.WebConverter.Program</StartupObject>
-    <VersionPrefix>5.0.1</VersionPrefix>
+    <VersionPrefix>5.0.2</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <RunAOTCompilation>true</RunAOTCompilation>
     <WasmNativeStrip>true</WasmNativeStrip>
@@ -46,8 +46,8 @@
   <ItemGroup>
     <PackageReference Include="ByteSize" Version="2.1.2" />
     <PackageReference Include="Markdig.Signed" Version="0.37.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
     <PackageReference Include="Thinktecture.Blazor.FileHandling" Version="2.0.0" />
     <PackageReference Include="Thinktecture.Blazor.WebShare" Version="2.0.0" />
   </ItemGroup>