Update Multi-Target to DotNet 8, 9, and 10.

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "microsoft.sbom.dotnettool": {
-      "version": "3.0.1",
+      "version": "4.1.4",
       "commands": [
         "sbom-tool"
       ]
     },
     "demaconsulting.spdxtool": {
-      "version": "2.2.0",
+      "version": "2.5.0",
       "commands": [
         "spdx-tool"
       ]

.github/workflows/build-on-push.yaml

@@ -7,6 +7,6 @@ jobs:
     name: Build Artifacts
     uses: ./.github/workflows/build.yaml
     with:
-      wrapper: "1.1.0"
-      weasyprint: "63.1"
+      wrapper: "1.2.0"
+      weasyprint: "67.0"
       version: 0.0.0-run.${{ github.run_number }}

.github/workflows/build.yaml

@@ -13,20 +13,16 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    - name: Setup dotnet 8
-      uses: actions/setup-dotnet@v4
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: |
-          8.x          
-
-    - uses: nuget/setup-nuget@v2
-      with:
-        nuget-version: latest
+          10.x          
 
     - name: Restore Tools
       run: >
@@ -38,8 +34,9 @@ jobs:
         wget https://github.com/demaconsulting/DotnetToolWrapper/releases/download/${{ inputs.wrapper }}/manifest.spdx.json
         wget https://github.com/demaconsulting/DotnetToolWrapper/releases/download/${{ inputs.wrapper }}/DotnetToolWrapper.zip
         unzip -o DotnetToolWrapper.zip -d DotnetToolWrapper
-        cp DotnetToolWrapper/net6.0/*.* pack/tools/net6.0/any
         cp DotnetToolWrapper/net8.0/*.* pack/tools/net8.0/any
+        cp DotnetToolWrapper/net9.0/*.* pack/tools/net9.0/any
+        cp DotnetToolWrapper/net10.0/*.* pack/tools/net10.0/any
 
     - name: Insert Weasyprint win-x64
       shell: bash
@@ -70,10 +67,10 @@ jobs:
     - name: Create Dotnet Tool
       run: |
         cd pack
-        nuget pack -Version ${{ inputs.version }}
+        dotnet pack DemaConsulting.WeasyprintTool.csproj -p:Version=${{ inputs.version }} -o .
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: build-artifacts
         path: |

.github/workflows/release.yaml

@@ -4,15 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       wrapper:
-        description: 'Wrapper version (1.1.0)'
+        description: 'Wrapper version (1.2.0)'
         type: string
         required: true
       weasyprint:
-        description: 'WeasyPrint version (63.1)'
+        description: 'WeasyPrint version (67.0)'
         type: string
         required: true
       version:
-        description: 'Release version (63.1.0)'
+        description: 'Release version (67.0.0)'
         type: string
         required: true
       publish:
@@ -39,22 +39,22 @@ jobs:
       contents: write
       packages: write
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     needs: build
 
     steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    - name: Setup dotnet 8
-      uses: actions/setup-dotnet@v4
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: |
-          8.x          
+          10.x
 
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: build-artifacts
         path: build-artifacts

pack/DemaConsulting.WeasyprintTool.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <NuspecFile>DemaConsulting.WeasyprintTool.nuspec</NuspecFile>
+        <NuspecProperties>version=$(Version)</NuspecProperties>
+    </PropertyGroup>
+</Project>

pack/tools/net9.0/any/DotnetToolSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DotNetCliTool Version="1">
+  <Commands>
+    <Command Name="weasyprint" EntryPoint="DemaConsulting.DotnetToolWrapper.dll" Runner="dotnet" />
+  </Commands>
+</DotNetCliTool>

pack/tools/net9.0/any/DotnetToolWrapper.json

@@ -0,0 +1,5 @@
+{
+  "win-x64": {
+    "program": "../../../win-x64/weasyprint.exe"
+  }
+}

spdx-workflow.yaml

@@ -66,36 +66,36 @@ steps:
       comment: WeasyPrint ${{ weasyprint-version }} embedded into DemaConsulting.WeasyprintTool 
 
 
-  # Query the version of nuget
+  # Query for DotNet version
 - command: run-workflow
-  displayName: Query Nuget Version
+  displayName: Query DotNet Version
   inputs:
-    url: https://raw.githubusercontent.com/demaconsulting/SpdxWorkflows/main/GetNugetVersion.yaml
+    url: https://raw.githubusercontent.com/demaconsulting/SpdxWorkflows/main/GetDotNetVersion.yaml
     outputs:
-      version: nuget-version
+      version: dotnet-version
 
 
-  # Add Nuget Package
+  # Add DotNet Package
 - command: run-workflow
-  displayName: Add Nuget Package
+  displayName: Add DotNet Package
   inputs:
-    url: https://raw.githubusercontent.com/demaconsulting/SpdxWorkflows/main/AddNugetPackage.yaml
+    url: https://raw.githubusercontent.com/demaconsulting/SpdxWorkflows/main/AddDotNetPackage.yaml
     parameters:
       spdx: ${{ spdx }}
-      version: ${{ nuget-version }}
-      id: SPDXRef-Package-Nuget-${{ nuget-version }}
+      version: ${{ dotnet-version }}
+      id: SPDXRef-Package-DotNet-${{ dotnet-version }}
 
 
-  # Add Nuget Relationship
+  # Add DotNet Relationship
 - command: add-relationship
-  displayName: Add Nuget Relationship
+  displayName: Add DotNet Relationship
   inputs:
     spdx: ${{ spdx }}
-    id: SPDXRef-Package-Nuget-${{ nuget-version }}
+    id: SPDXRef-Package-DotNet-${{ dotnet-version }}
     relationships:
     - type: BUILD_TOOL_OF
       element: SPDXRef-DemaConsulting-WeasyprintTool-${{ weasyprint-version }}
-      comment: Nuget ${{ nuget-version }} used to package DemaConsulting.WeasyprintTool
+      comment: DotNet ${{ dotnet-version }} used to package DemaConsulting.WeasyprintTool
 
 
   # Update the SBOM sha256