From 3cc4a06eef9fd4ba2428bb80a0e7368fc8df2505 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Thu, 20 Feb 2025 11:03:34 +0100
Subject: [PATCH 1/4] ci: Pack plugins into platform folder.

---
 .github/workflows/build.yml   | 9 ++++++---
 .github/workflows/release.yml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 207cfdfe..ef196851 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,18 +28,21 @@ jobs:
           dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false
       - uses: actions/upload-artifact@v4
         with:
-          name: NuGetDependencies-${{ matrix.rid }}
-          path: Dependencies/NuGetDependencies/${{ matrix.rid }}
+          name: Plugins-${{ matrix.rid }}
+          path: Dependencies/NuGetDependencies
   install-yetanotherhttphandler:
     name: Install YetAnotherHttpHandler
     runs-on: ubuntu-latest
     steps:
         - uses: actions/checkout@v4
         - run: dotnet build /t:InstallYetAnotherHttpHandler
+        - run: |
+          mkdir tmp
+          cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp
         - uses: actions/upload-artifact@v4
           with:
             name: YetAnotherHttpHandler
-            path: Dependencies/YetAnotherHttpHandler
+            path: tmp
 
   dispatch:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fe2784a7..52c2ee5b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
           git commit -m "release: ${{ steps.nextVersion.outputs.nextTag }}."
           git push
           commitish=$(git rev-parse HEAD)
-          echo ::set-output name=commitish::${commitish}
+          echo "commitish=${commitish}" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Release

From fb3e3f8bf944d9c81c10c2b9f580c99d24c820a0 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Thu, 20 Feb 2025 11:06:19 +0100
Subject: [PATCH 2/4] fix: Gotta love YAML..

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef196851..32e0b2a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,8 +37,8 @@ jobs:
         - uses: actions/checkout@v4
         - run: dotnet build /t:InstallYetAnotherHttpHandler
         - run: |
-          mkdir tmp
-          cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp
+            mkdir tmp
+            cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp
         - uses: actions/upload-artifact@v4
           with:
             name: YetAnotherHttpHandler

From 930cdc5a5e9c56372df04da16cd1f73ec70c168e Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Thu, 20 Feb 2025 11:13:08 +0100
Subject: [PATCH 3/4] ci: More path changes.

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32e0b2a4..24ee5587 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,23 +26,23 @@ jobs:
       - name: Build
         run: |
           dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false
+      - run: |
+          mkdir -p tmp/Plugins
+          cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp/Plugins    
       - uses: actions/upload-artifact@v4
         with:
           name: Plugins-${{ matrix.rid }}
-          path: Dependencies/NuGetDependencies
+          path: tmp
   install-yetanotherhttphandler:
     name: Install YetAnotherHttpHandler
     runs-on: ubuntu-latest
     steps:
         - uses: actions/checkout@v4
         - run: dotnet build /t:InstallYetAnotherHttpHandler
-        - run: |
-            mkdir tmp
-            cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp
         - uses: actions/upload-artifact@v4
           with:
             name: YetAnotherHttpHandler
-            path: tmp
+            path: Dependencies/YetAnotherHttpHandler
 
   dispatch:
     runs-on: ubuntu-latest

From 796eb4f29d41ce47933dbc15c7b090db47c12e55 Mon Sep 17 00:00:00 2001
From: freezy <freezy@kodi.tv>
Date: Thu, 20 Feb 2025 11:15:01 +0100
Subject: [PATCH 4/4] ci: Pack YetAnotherHttpHandler as sub folder.

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24ee5587..3dbe8f7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
         - uses: actions/upload-artifact@v4
           with:
             name: YetAnotherHttpHandler
-            path: Dependencies/YetAnotherHttpHandler
+            path: Dependencies
 
   dispatch:
     runs-on: ubuntu-latest