Update to PDFtoImage 2.4.3 (#39)

* Update to PDFtoImage 2.4.3 * Add filtered solution for SonarCloud
sungaila · Nov 19, 2023 · 839885d · 839885d
1 parent a8aa1c4
commit 839885d
Show file tree

Hide file tree

Showing 19 changed files with 239 additions and 94 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -63,10 +63,16 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: 7.x
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@main
+        with:
+          dotnet-version: 8.x
       - name: Setup .NET workload android
         run: dotnet workload install android
       - name: Setup .NET workload wasm-tools
         run: dotnet workload install wasm-tools
+      - name: Setup .NET workload wasm-tools-net7
+        run: dotnet workload install wasm-tools-net7
       - name: Setup JDK 17
         uses: actions/setup-java@main
         with:
@@ -122,6 +128,10 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: 7.x
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@main
+        with:
+          dotnet-version: 8.x
       - name: Download test assemblies
         uses: actions/download-artifact@main
         with:
@@ -138,6 +148,9 @@ jobs:
       - name: .NET 7
         if: success() || failure()
         run: dotnet test net7.0/*.Tests.dll --logger trx --verbosity detailed
+      - name: .NET 8
+        if: success() || failure()
+        run: dotnet test net8.0/*.Tests.dll --logger trx --verbosity detailed
       - name: Upload test results
         if: success() || failure()
         uses: actions/upload-artifact@main
@@ -197,12 +210,14 @@ jobs:
         uses: actions/setup-dotnet@main
         with:
           dotnet-version: 7.x
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@main
+        with:
+          dotnet-version: 8.x
       - name: Setup dotnet-coverage
         run: dotnet tool install --global dotnet-coverage
       - name: Setup .NET workload android
         run: dotnet workload install android
-      - name: Setup .NET workload wasm-tools
-        run: dotnet workload install wasm-tools
       - name: Setup JDK 17
         uses: actions/setup-java@main
         with:
@@ -235,7 +250,7 @@ jobs:
         shell: powershell
         run: |
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"sungaila_PDFtoZPL" /o:"sungaila" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
-          dotnet restore PDFtoZPL.sln
-          msbuild PDFtoZPL.sln /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}
-          dotnet-coverage collect "dotnet test PDFtoZPL.sln --verbosity detailed" -f xml -o "coverage.xml"
+          dotnet restore PDFtoZPL.SonarCloud.slnf
+          msbuild PDFtoZPL.SonarCloud.slnf /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}
+          dotnet-coverage collect "dotnet test PDFtoZPL.SonarCloud.slnf --verbosity detailed" -f xml -o "coverage.xml"
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/.github/workflows/githubpages.yml b/.github/workflows/githubpages.yml
@@ -8,8 +8,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'webconverter'
-
+
 concurrency:
   group: "pages"
   cancel-in-progress: false
@@ -23,14 +22,16 @@ jobs:
         uses: actions/checkout@main
         with:
           fetch-depth: 0
-      - name: Setup .NET 7
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@main
         with:
-          dotnet-version: 7.x
+          dotnet-version: 8.x
       - name: Setup .NET workload android
         run: dotnet workload install android
       - name: Setup .NET workload wasm-tools
         run: dotnet workload install wasm-tools
+      - name: Setup .NET workload wasm-tools-net7
+        run: dotnet workload install wasm-tools-net7
       - name: Update relative paths
         working-directory: WebConverter/wwwroot
         run: |

diff --git a/Console/Console.csproj b/Console/Console.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Assembly -->
   <PropertyGroup>
-    <TargetFrameworks>net462;net481;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net481;net6.0;net7.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>PDFtoZPL.Console</AssemblyName>
     <RootNamespace>PDFtoZPL.Console</RootNamespace>
     <StartupObject>PDFtoZPL.Console.Program</StartupObject>
-    <Version>3.6.2</Version>
+    <Version>3.6.3</Version>
     <Configurations>Debug;Release;ReleaseSigned</Configurations>
   </PropertyGroup>
 

diff --git a/Console/Properties/PublishProfiles/DotNet.pubxml b/Console/Properties/PublishProfiles/DotNet.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>ReleaseSigned</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Publish\net7.0\</PublishDir>
+    <PublishDir>bin\Publish\net8.0\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>
diff --git a/PDFtoZPL.SonarCloud.slnf b/PDFtoZPL.SonarCloud.slnf
@@ -0,0 +1,9 @@
+{
+  "solution": {
+    "path": "PDFtoZPL.sln",
+    "projects": [
+      "PDFtoZPL\\PDFtoZPL.csproj",
+      "Tests\\Tests.csproj"
+    ]
+  }
+}
diff --git a/PDFtoZPL.sln b/PDFtoZPL.sln
@@ -7,7 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDFtoZPL", "PDFtoZPL\PDFtoZ
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{573E786B-4B2F-4B68-B156-801E62C21659}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		Icon.png = Icon.png
 		Icon_128.png = Icon_128.png
 		README.md = README.md

diff --git a/PDFtoZPL/PDFtoZPL.CodeSigning.targets b/PDFtoZPL/PDFtoZPL.CodeSigning.targets
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Code sign assemblies -->
   <Target Name="CodeSignAssembliesBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)'=='ReleaseSigned'">
-    <Exec Command="powershell &quot;cd $(OutDir); &amp;'$(SignToolPath)signtool.exe' sign /n '$(SignSubjectName)' /tr '$(SignTimestampServerUrl)' /fd certHash /td certHash /tdchw /v ((Get-ChildItem -Include ('*.dll', '*.exe') -Recurse . | select -ExpandProperty FullName | ForEach-Object {'\&quot;' + $_ + '\&quot;\&quot;'}) -join ' ')&quot;" />
+    <Exec Command="powershell &quot;cd $(OutDir); &amp;'$(SignToolPath)signtool.exe' sign /n '$(SignSubjectName)' /tr '$(SignTimestampServerUrl)' /fd certHash /td certHash /fdchw /tdchw /v ((Get-ChildItem -Include ('*.dll', '*.exe') -Recurse . | select -ExpandProperty FullName | ForEach-Object {'\&quot;' + $_ + '\&quot;\&quot;'}) -join ' ')&quot;" />
   </Target>
 
   <Target Name="CodeSignAssembliesPublish" AfterTargets="Publish" Condition="'$(Configuration)'=='ReleaseSigned'">
-    <Exec Command="powershell &quot;cd $(PublishDir); &amp;'$(SignToolPath)signtool.exe' sign /n '$(SignSubjectName)' /tr '$(SignTimestampServerUrl)' /fd certHash /td certHash /tdchw /v ((Get-ChildItem -Include ('*.dll', '*.exe') -Recurse . | select -ExpandProperty FullName | ForEach-Object {'\&quot;' + $_ + '\&quot;\&quot;'}) -join ' ')&quot;" />
+    <Exec Command="powershell &quot;cd $(PublishDir); &amp;'$(SignToolPath)signtool.exe' sign /n '$(SignSubjectName)' /tr '$(SignTimestampServerUrl)' /fd certHash /td certHash /fdchw /tdchw /v ((Get-ChildItem -Include ('*.dll', '*.exe') -Recurse . | select -ExpandProperty FullName | ForEach-Object {'\&quot;' + $_ + '\&quot;\&quot;'}) -join ' ')&quot;" />
   </Target>
 </Project>
diff --git a/PDFtoZPL/PDFtoZPL.csproj b/PDFtoZPL/PDFtoZPL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <!-- Assembly -->
   <PropertyGroup>
-    <TargetFrameworks>net462;net481;net6.0;net7.0;net7.0-android;monoandroid10.0</TargetFrameworks>
+    <TargetFrameworks>net462;net481;net6.0;net7.0;net7.0-android;net8.0;net8.0-android;monoandroid10.0</TargetFrameworks>
     <AssemblyName>PDFtoZPL</AssemblyName>
     <RootNamespace>PDFtoZPL</RootNamespace>
     <EmbedAllSources>true</EmbedAllSources>
@@ -12,7 +12,7 @@
 
   <!-- NuGet -->
   <PropertyGroup>
-    <VersionPrefix>3.6.2</VersionPrefix>
+    <VersionPrefix>3.6.3</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>David Sungaila</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -21,7 +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>- Fixed an issue where Android release builds would fail to load libpdfium.</PackageReleaseNotes>
+    <PackageReleaseNotes>- Cleanup of native lib loading for .NET (Core).</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>
@@ -66,15 +66,11 @@
 
   <!-- SourceLink build steps and NuGet packages -->
   <ItemGroup>
-    <PackageReference Include="PDFtoImage" Version="2.4.2" PrivateAssets="analyzers" />
+    <PackageReference Include="PDFtoImage" Version="2.4.3" PrivateAssets="analyzers" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
   </ItemGroup>