From 96eaee2fd7c18aac6eaf96474676b035d9644aa9 Mon Sep 17 00:00:00 2001
From: Peter Giacomo Lombardo <pglombardo@hey.com>
Date: Fri, 17 Jan 2025 16:16:35 +0100
Subject: [PATCH] yaml cleanup

---
 .github/workflows/build.yml     | 50 ++++++++++++++++++++-------------
 Source/HiveMQtt/HiveMQtt.csproj |  3 +-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e323d07..de68164 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,19 +11,15 @@ on:
   workflow_dispatch:
 
 env:
-  # Disable the .NET logo in the console output.
   DOTNET_NOLOGO: true
-  # Disable the .NET first time experience to skip caching NuGet packages and speed up the build.
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  # Disable sending .NET CLI telemetry to Microsoft.
   DOTNET_CLI_TELEMETRY_OPTOUT: true
-  # Set the build number in MinVer.
-  MINVERBUILDMETADATA: build.${{github.run_number}}
+  MINVERBUILDMETADATA: build.${{ github.run_number }}
 
 jobs:
   build:
-    name: pipeline-${{matrix.os}}-dotnet-${{matrix.dotnet-version}}
-    runs-on: ${{matrix.os}}
+    name: pipeline-${{ matrix.os }}-dotnet-${{ matrix.dotnet-version }}
+    runs-on: ${{ matrix.os }}
 
     services:
       hivemq:
@@ -41,35 +37,43 @@ jobs:
 
     strategy:
       matrix:
-        # Docker containers not supported on windows and macOS in Github runners.
-        # os: [ubuntu-latest, windows-latest, macOS-latest]
         os: [ubuntu-latest]
         dotnet-version: ['6.0.x', '7.0.x', '8.0.x', '9.0.x']
     steps:
-      - name: "Checkout"
+      - name: Checkout
         uses: actions/checkout@v4.2.2
         with:
           lfs: true
           fetch-depth: 0
-      - name: "Install .NET Core SDK"
+
+      - name: Install .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '${{ matrix.dotnet-version }}'
+
+      - name: List Installed SDKs
+        run: dotnet --list-sdks
+
       - name: Create temporary global.json
         run: echo '{"sdk":{"version":"${{ matrix.dotnet-version }}"}}' > global.json
-      - name: "Dotnet Tool Restore"
+
+      - name: Dotnet Tool Restore
         run: dotnet tool restore
         shell: pwsh
-      - name: "Dotnet Cake Build"
+
+      - name: Dotnet Cake Build
         run: dotnet cake --target=Build
         shell: pwsh
-      - name: "Dotnet Cake Test"
+
+      - name: Dotnet Cake Test
         run: dotnet cake --target=Test
         shell: pwsh
-      - name: "Dotnet Cake Pack"
+
+      - name: Dotnet Cake Pack
         run: dotnet cake --target=Pack
         shell: pwsh
-      - name: "Upload NuGet packages"
+
+      - name: Upload NuGet packages
         uses: actions/upload-artifact@v4
         with:
           name: nuget-packages-${{ matrix.dotnet-version }}
@@ -79,22 +83,30 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - name: "Download NuGet packages"
+      - name: Download NuGet packages for .NET 6.0
         uses: actions/download-artifact@v4
         with:
           name: nuget-packages-6.0.x
           path: ./Artifacts
-      - name: "Download NuGet packages"
+
+      - name: Download NuGet packages for .NET 7.0
         uses: actions/download-artifact@v4
         with:
           name: nuget-packages-7.0.x
           path: ./Artifacts
-      - name: "Download NuGet packages"
+
+      - name: Download NuGet packages for .NET 8.0
         uses: actions/download-artifact@v4
         with:
           name: nuget-packages-8.0.x
           path: ./Artifacts
 
+      - name: Download NuGet packages for .NET 9.0
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages-9.0.x
+          path: ./Artifacts
+
       - name: Push to NuGet
         if: github.event_name == 'release'
         run: dotnet nuget push ./Artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/Source/HiveMQtt/HiveMQtt.csproj b/Source/HiveMQtt/HiveMQtt.csproj
index f0b3796..3afbc17 100644
--- a/Source/HiveMQtt/HiveMQtt.csproj
+++ b/Source/HiveMQtt/HiveMQtt.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(NETCoreSdkVersion)' >= '9.0.0'">net9.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>