From e518f0c062e1662224904b344bba6357d232ee65 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:16:32 +0200
Subject: [PATCH 01/14] Delete .github/workflows/build-and-test.yml

---
 .github/workflows/build-and-test.yml | 34 ----------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/build-and-test.yml

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
deleted file mode 100644
index f0a0194..0000000
--- a/.github/workflows/build-and-test.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Build and test
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v6
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Restore
-        run: dotnet restore src/NLog.MailKit.sln
-
-      - name: Build
-        run: dotnet build src/NLog.MailKit.sln --configuration Release --no-restore
-
-      - name: Test
-        run: dotnet test src/NLog.MailKit.sln --configuration Release --no-build --logger "console;verbosity=normal"

From b4cf5b52f7548f42fa14dee61c8e00b784011ebb Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:16:44 +0200
Subject: [PATCH 02/14] Delete .github/workflows/nuget.yml

---
 .github/workflows/nuget.yml | 92 -------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 .github/workflows/nuget.yml

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
deleted file mode 100644
index c803dd1..0000000
--- a/.github/workflows/nuget.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-name: NuGet
-
-on:
-  workflow_run:
-    workflows: ["Build and test"]
-    types:
-      - completed
-    branches:
-      - master
-  workflow_dispatch:
-
-jobs:
-  pack:
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
-    runs-on: windows-latest
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v6
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Restore
-        run: dotnet restore src/NLog.MailKit.sln
-
-      - name: Build
-        run: dotnet build src/NLog.MailKit.sln --configuration Release --no-restore
-
-      - name: Determine version suffix
-        id: version
-        shell: pwsh
-        run: |
-          $ref = "${{ github.ref }}"
-          if ($ref -eq "refs/heads/master") {
-            echo "suffix=" >> $env:GITHUB_OUTPUT
-          } else {
-            # For a PR: use head_ref (actual branch name), otherwise the ref name
-            $branchName = "${{ github.head_ref }}"
-            if ([string]::IsNullOrEmpty($branchName)) {
-              $branchName = "${{ github.ref_name }}"
-            }
-
-            # Sanitize: non-alphanumeric -> '-', multiple '-' -> one, trim '-'
-            $clean = $branchName -replace '[^a-zA-Z0-9]', '-' `
-                                 -replace '-+', '-' `
-                                 -replace '^-|-$', ''
-            # Truncate to max 40 characters and remove trailing '-'
-            $short = if ($clean.Length -gt 0) { $clean.Substring(0, [Math]::Min(40, $clean.Length)).TrimEnd('-') } else { "" }
-
-            # PR number prefix
-            $prNumber = "${{ github.event.pull_request.number }}"
-            $prPrefix = if ($prNumber) { "pr${prNumber}-" } else { "" }
-
-            # Build number
-            $build = "${{ github.run_number }}"
-
-            $suffix = "${prPrefix}${short}.${build}"
-            echo "suffix=$suffix" >> $env:GITHUB_OUTPUT
-          }
-
-      - name: Pack
-        shell: pwsh
-        run: |
-          $versionSuffix = "${{ steps.version.outputs.suffix }}"
-          if ($versionSuffix) {
-            dotnet pack src/NLog.MailKit.sln --no-build --configuration Release --output artifacts --version-suffix "$versionSuffix"
-          } else {
-            dotnet pack src/NLog.MailKit.sln --no-build --configuration Release --output artifacts
-          }
-
-      - name: Upload nuget package
-        uses: actions/upload-artifact@v7
-        with:
-          name: nupkg
-          path: artifacts/*pkg
-
-      - name: NuGet login
-        if: github.ref == 'refs/heads/master'
-        uses: NuGet/login@v1
-        id: login
-        with:
-          user: ${{ secrets.NUGET_USER }}
-
-      - name: Push to NuGet.org
-        if: github.ref == 'refs/heads/master'
-        shell: pwsh
-        run: dotnet nuget push artifacts\*.nupkg --api-key ${{ steps.login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

From 3927e06da7e901397ee7d615b662f1e335503cdb Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:17:06 +0200
Subject: [PATCH 03/14] Create ci.yml

---
 .github/workflows/ci.yml | 134 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..cd595bc
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,134 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      force_nuget_publish:
+        description: Force NuGet publish
+        type: boolean
+        default: false
+
+env:
+  SOLUTION: src/NLog.MailKit.sln
+  DOTNET_VERSION: '8.0.x'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: windows-latest
+            create_nuget_package: true
+          - os: ubuntu-latest
+            create_nuget_package: false
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Restore
+        run: dotnet restore ${{ env.SOLUTION }}
+
+      - name: Build
+        run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
+
+      - name: Test
+        run: dotnet test ${{ env.SOLUTION }} --configuration Release --no-build --logger "console;verbosity=normal"
+
+      - name: Determine version suffix
+        if: matrix.create_nuget_package
+        id: version
+        shell: pwsh
+        env:
+          REF: ${{ github.ref }}
+          HEAD_REF: ${{ github.head_ref }}
+          REF_NAME: ${{ github.ref_name }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          RUN_NUMBER: ${{ github.run_number }}
+        run: |
+          if ($env:REF -eq "refs/heads/master") {
+            echo "suffix=" >> $env:GITHUB_OUTPUT
+          } else {
+            # For a PR: use head_ref (actual branch name), otherwise the ref name
+            $branchName = $env:HEAD_REF
+            if ([string]::IsNullOrEmpty($branchName)) {
+              $branchName = $env:REF_NAME
+            }
+
+            # Sanitize: non-alphanumeric -> '-', multiple '-' -> one, trim '-'
+            $clean = $branchName -replace '[^a-zA-Z0-9]', '-' `
+                                 -replace '-+', '-' `
+                                 -replace '^-|-$', ''
+            # Truncate to max 40 characters and remove trailing '-'
+            $short = if ($clean.Length -gt 0) { $clean.Substring(0, [Math]::Min(40, $clean.Length)).TrimEnd('-') } else { "" }
+
+            # PR number prefix
+            $prPrefix = if ($env:PR_NUMBER) { "pr$($env:PR_NUMBER)-" } else { "" }
+
+            $suffix = "${prPrefix}${short}.$($env:RUN_NUMBER)"
+            echo "suffix=$suffix" >> $env:GITHUB_OUTPUT
+          }
+
+      - name: Pack
+        if: matrix.create_nuget_package
+        shell: pwsh
+        env:
+          VERSION_SUFFIX: ${{ steps.version.outputs.suffix }}
+        run: |
+          if ($env:VERSION_SUFFIX) {
+            dotnet pack $env:SOLUTION --no-build --configuration Release --output artifacts --version-suffix "$env:VERSION_SUFFIX"
+          } else {
+            dotnet pack $env:SOLUTION --no-build --configuration Release --output artifacts
+          }
+
+      - name: Upload nuget package
+        if: matrix.create_nuget_package
+        uses: actions/upload-artifact@v7
+        with:
+          name: nupkg
+          path: artifacts/*pkg
+
+  publish:
+    needs: build
+    if: >-
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
+      (github.event_name == 'workflow_dispatch' && inputs.force_nuget_publish)
+    runs-on: windows-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Download nuget package
+        uses: actions/download-artifact@v7
+        with:
+          name: nupkg
+          path: artifacts
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: NuGet login
+        uses: NuGet/login@v1
+        id: login
+        with:
+          user: ${{ secrets.NUGET_USER }}
+
+      - name: Push to NuGet.org
+        shell: pwsh
+        env:
+          NUGET_API_KEY: ${{ steps.login.outputs.NUGET_API_KEY }}
+        run: dotnet nuget push artifacts\*.nupkg --api-key $env:NUGET_API_KEY --source https://api.nuget.org/v3/index.json --skip-duplicate

From 49fedfb60d13102fb0872a9e2fe21c55a685c107 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:17:46 +0200
Subject: [PATCH 04/14] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ad62fb5..03c0816 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # NLog.MailKit
 
 [![NuGet](https://img.shields.io/nuget/v/NLog.MailKit.svg)](https://www.nuget.org/packages/NLog.MailKit)
-[![Build and test](https://github.com/NLog/NLog.MailKit/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/NLog/NLog.MailKit/actions/workflows/build-and-test.yml)
+[![Build and test](https://github.com/NLog/NLog.MailKit/actions/workflows/ci.yml/badge.svg)](https://github.com/NLog/NLog.MailKit/actions/workflows/build-and-test.yml)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=bugs)](https://sonarcloud.io/summary/new_code?id=nlog.mailkit)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=nlog.mailkit)
 [![](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=code_smells)](https://sonarcloud.io/project/issues?id=nlog.mailkit&resolved=false&types=CODE_SMELL) 
@@ -66,7 +66,7 @@ BSD. License of MailKit is MIT
 
 
 ### Builds
-Builds and NuGet publishing is running on GitHub actions. See [build-and-test.yml](/.github/workflows/build-and-test.yml) and [nuget.yml](/.github/workflows/nuget.yml)
+Builds and NuGet publishing is running on GitHub actions. See [ci.yml](/.github/workflows/ci.yml)
 
 SonarQube analysis is running on Azure Devops: [![SonarQube Cloud Build Status](https://dev.azure.com/NLogLogging/NLog/_apis/build/status/NLog.MailKit?branchName=master)](https://dev.azure.com/NLogLogging/NLog/_build/latest?definitionId=25&branchName=master)
 

From 0a534fc2ca68fb78e61258f8e91566575c57bbe5 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:25:14 +0200
Subject: [PATCH 05/14] names and commit hash login

---
 .github/workflows/ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd595bc..27287c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,12 +18,15 @@ env:
 
 jobs:
   build:
+    name: ${{ matrix.name }}
     strategy:
       matrix:
         include:
           - os: windows-latest
+            name: "Build, test & NuGet package (Windows)"
             create_nuget_package: true
           - os: ubuntu-latest
+            name: "Build & test (Ubuntu)"
             create_nuget_package: false
     runs-on: ${{ matrix.os }}
     permissions:
@@ -80,7 +83,7 @@ jobs:
             echo "suffix=$suffix" >> $env:GITHUB_OUTPUT
           }
 
-      - name: Pack
+      - name: Create NuGet package
         if: matrix.create_nuget_package
         shell: pwsh
         env:
@@ -92,7 +95,7 @@ jobs:
             dotnet pack $env:SOLUTION --no-build --configuration Release --output artifacts
           }
 
-      - name: Upload nuget package
+      - name: Upload NuGet package
         if: matrix.create_nuget_package
         uses: actions/upload-artifact@v7
         with:
@@ -100,6 +103,7 @@ jobs:
           path: artifacts/*pkg
 
   publish:
+    name: Publish NuGet package
     needs: build
     if: >-
       (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
@@ -110,7 +114,7 @@ jobs:
       id-token: write
 
     steps:
-      - name: Download nuget package
+      - name: Download NuGet package
         uses: actions/download-artifact@v7
         with:
           name: nupkg
@@ -122,7 +126,7 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: NuGet login
-        uses: NuGet/login@v1
+        uses: NuGet/login@8d196754b4036150537f80ac539e15c2f1028841 # v1.2
         id: login
         with:
           user: ${{ secrets.NUGET_USER }}

From 41e8ef49873146db7850444dae165b61230525dd Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:26:43 +0200
Subject: [PATCH 06/14] remove quotes

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27287c9..12be7fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   SOLUTION: src/NLog.MailKit.sln
-  DOTNET_VERSION: '8.0.x'
+  DOTNET_VERSION: 8.0.x
 
 jobs:
   build:
@@ -23,10 +23,10 @@ jobs:
       matrix:
         include:
           - os: windows-latest
-            name: "Build, test & NuGet package (Windows)"
+            name: Build, test & NuGet package (Windows)
             create_nuget_package: true
           - os: ubuntu-latest
-            name: "Build & test (Ubuntu)"
+            name: Build & test (Ubuntu)
             create_nuget_package: false
     runs-on: ${{ matrix.os }}
     permissions:

From 3f7e0cb123b8a75c6e9857f229451439d772d8cd Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:32:16 +0200
Subject: [PATCH 07/14] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03c0816..f140f63 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # NLog.MailKit
 
 [![NuGet](https://img.shields.io/nuget/v/NLog.MailKit.svg)](https://www.nuget.org/packages/NLog.MailKit)
-[![Build and test](https://github.com/NLog/NLog.MailKit/actions/workflows/ci.yml/badge.svg)](https://github.com/NLog/NLog.MailKit/actions/workflows/build-and-test.yml)
+[![Build and test](https://github.com/NLog/NLog.MailKit/actions/workflows/ci.yml/badge.svg)](https://github.com/NLog/NLog.MailKit/actions/workflows/ci.yml)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=bugs)](https://sonarcloud.io/summary/new_code?id=nlog.mailkit)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=nlog.mailkit)
 [![](https://sonarcloud.io/api/project_badges/measure?project=nlog.mailkit&metric=code_smells)](https://sonarcloud.io/project/issues?id=nlog.mailkit&resolved=false&types=CODE_SMELL) 

From 045b9184349890768c6a01e97eeb6e374fed37ed Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:48:44 +0200
Subject: [PATCH 08/14] no-restore

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12be7fd..fa30d76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
         run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
 
       - name: Test
-        run: dotnet test ${{ env.SOLUTION }} --configuration Release --no-build --logger "console;verbosity=normal"
+        run: dotnet test ${{ env.SOLUTION }} --configuration Release --no-restore --no-build --logger "console;verbosity=normal"
 
       - name: Determine version suffix
         if: matrix.create_nuget_package

From 29387bc59d51b53b86aacd62590c3a9e96a74c62 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:49:40 +0200
Subject: [PATCH 09/14] Update Upload NuGet package

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa30d76..7bf5e8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,8 +99,9 @@ jobs:
         if: matrix.create_nuget_package
         uses: actions/upload-artifact@v7
         with:
-          name: nupkg
-          path: artifacts/*pkg
+          name: NuGet package
+          path: artifacts/*.*nupkg
+          if-no-files-found: error
 
   publish:
     name: Publish NuGet package

From 28962c061eba97b493df43b281664f22b4cb657b Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 17:58:32 +0200
Subject: [PATCH 10/14] docs

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7bf5e8a..6d42bab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       force_nuget_publish:
-        description: Force NuGet publish
+        description: Force NuGet publish # for non-master. The package version get the PR number of branch name, see Create NuGet Package step
         type: boolean
         default: false
 
@@ -100,7 +100,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: NuGet package
-          path: artifacts/*.*nupkg
+          path: artifacts/*.*nupkg # also upload snupkg
           if-no-files-found: error
 
   publish:

From 92c6398275a94df4b64c2ae6aff2e7da7601c0c3 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:06:22 +0200
Subject: [PATCH 11/14] simplify version suffix

---
 .github/workflows/ci.yml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d42bab..465ee9b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,32 +55,15 @@ jobs:
         shell: pwsh
         env:
           REF: ${{ github.ref }}
-          HEAD_REF: ${{ github.head_ref }}
-          REF_NAME: ${{ github.ref_name }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           RUN_NUMBER: ${{ github.run_number }}
         run: |
           if ($env:REF -eq "refs/heads/master") {
             echo "suffix=" >> $env:GITHUB_OUTPUT
+          } elseif ($env:PR_NUMBER) {
+            echo "suffix=PR$($env:PR_NUMBER)-$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           } else {
-            # For a PR: use head_ref (actual branch name), otherwise the ref name
-            $branchName = $env:HEAD_REF
-            if ([string]::IsNullOrEmpty($branchName)) {
-              $branchName = $env:REF_NAME
-            }
-
-            # Sanitize: non-alphanumeric -> '-', multiple '-' -> one, trim '-'
-            $clean = $branchName -replace '[^a-zA-Z0-9]', '-' `
-                                 -replace '-+', '-' `
-                                 -replace '^-|-$', ''
-            # Truncate to max 40 characters and remove trailing '-'
-            $short = if ($clean.Length -gt 0) { $clean.Substring(0, [Math]::Min(40, $clean.Length)).TrimEnd('-') } else { "" }
-
-            # PR number prefix
-            $prPrefix = if ($env:PR_NUMBER) { "pr$($env:PR_NUMBER)-" } else { "" }
-
-            $suffix = "${prPrefix}${short}.$($env:RUN_NUMBER)"
-            echo "suffix=$suffix" >> $env:GITHUB_OUTPUT
+            echo "suffix=-$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           }
 
       - name: Create NuGet package

From 80d9a21e1cfc91ad310ff297bb2c81fb287ad5f9 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:08:50 +0200
Subject: [PATCH 12/14] fix artifact name

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 465ee9b..fe94ca1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
         if: matrix.create_nuget_package
         uses: actions/upload-artifact@v7
         with:
-          name: NuGet package
+          name: NuGetPackages
           path: artifacts/*.*nupkg # also upload snupkg
           if-no-files-found: error
 
@@ -101,7 +101,7 @@ jobs:
       - name: Download NuGet package
         uses: actions/download-artifact@v7
         with:
-          name: nupkg
+          name: NuGetPackages
           path: artifacts
 
       - name: Setup .NET

From ca911655c0f46366463d60c7ca3961be83211da2 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:17:12 +0200
Subject: [PATCH 13/14] -ci

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe94ca1..a0a150c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,9 +61,9 @@ jobs:
           if ($env:REF -eq "refs/heads/master") {
             echo "suffix=" >> $env:GITHUB_OUTPUT
           } elseif ($env:PR_NUMBER) {
-            echo "suffix=PR$($env:PR_NUMBER)-$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
+            echo "suffix=PR$($env:PR_NUMBER)-ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           } else {
-            echo "suffix=-$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
+            echo "suffix=-ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           }
 
       - name: Create NuGet package

From dcf253368d7e84c8c05e21300f30b5546b2c4843 Mon Sep 17 00:00:00 2001
From: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:21:15 +0200
Subject: [PATCH 14/14] Update ci.yml

---
 .github/workflows/ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0a150c..2167601 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       force_nuget_publish:
-        description: Force NuGet publish # for non-master. The package version get the PR number of branch name, see Create NuGet Package step
+        description: Force NuGet publish # for non-master. The package version gets a suffix. See Create NuGet Package step
         type: boolean
         default: false
 
@@ -61,9 +61,9 @@ jobs:
           if ($env:REF -eq "refs/heads/master") {
             echo "suffix=" >> $env:GITHUB_OUTPUT
           } elseif ($env:PR_NUMBER) {
-            echo "suffix=PR$($env:PR_NUMBER)-ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
+            echo "suffix=pr.$($env:PR_NUMBER).ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           } else {
-            echo "suffix=-ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
+            echo "suffix=ci.$($env:RUN_NUMBER)" >> $env:GITHUB_OUTPUT
           }
 
       - name: Create NuGet package
@@ -83,7 +83,9 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: NuGetPackages
-          path: artifacts/*.*nupkg # also upload snupkg
+          path: |
+            artifacts/*.nupkg
+            artifacts/*.snupkg
           if-no-files-found: error
 
   publish: