Merge remote-tracking branch 'upstream/master' into metabrainz-library

.github/workflows/build-dotnet.yml

@@ -19,11 +19,14 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
+          include-prerelease: true
 
       - name: Build Jellyfin Plugin
         uses: oddstr13/jellyfin-plugin-repository-manager@v0.4.2
         id: jprm
+        with:
+          dotnet-target: net6.0
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
+          include-prerelease: true
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

.github/workflows/command-dispatch.yaml

@@ -0,0 +1,21 @@
+# Allows for the definition of PR and Issue /commands
+name: Slash Command Dispatcher
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  launcher:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Command Dispatch
+        uses: peter-evans/slash-command-dispatch@v2
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          permission: write
+          issue-type: pull-request
+          commands: |-
+            rebase
+            update-prep

.github/workflows/command-rebase.yaml

@@ -0,0 +1,34 @@
+name: PR Rebase Command
+
+on:
+  repository_dispatch:
+    types:
+      - rebase-command
+
+jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Rebase PR
+        uses: peter-evans/rebase@v1
+        id: rebase
+        with:
+          head: ${{ github.event.client_payload.pull_request.head.label }}
+
+      - name: Add Success Reaction
+        if: ${{ steps.rebase.outputs.rebased-count == 1 }}
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          reaction-type: hooray
+
+      - name: Add Failure Reaction
+        if: ${{ steps.rebase.outputs.rebased-count == 0 || failure() }}
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          reaction-type: confused, -1

.github/workflows/test-dotnet.yml

@@ -19,7 +19,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
+          include-prerelease: true
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/update-release-draft.yml

@@ -5,7 +5,12 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - build.yaml
   workflow_dispatch:
+  repository_dispatch:
+    types:
+      - update-prep-command
 
 jobs:
   update_release_draft:
@@ -23,9 +28,9 @@ jobs:
       - name: Setup YQ
         uses: chrisdickinson/setup-yq@latest
         with:
-          yq-version: v4.9.6
+          yq-version: v4.12.2
 
-      - name: Parse changelog
+      - name: Set-up Environment
         run: |
           TAG="${{ steps.draft.outputs.tag_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
@@ -41,16 +46,22 @@ jobs:
           cat cl.md >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
+          echo "HAS_CHANGES=$(grep -qie 'No changes$' cl.md && echo false || echo true)" >> $GITHUB_ENV
           rm cl.md
 
-      - name: Checkout repository
+          echo "ABI_VERSION=$(curl -s https://api.jellyfin.org/openapi/jellyfin-openapi-stable.json | jq -r '.info.version').0" >> $GITHUB_ENV
+
+      - name: Checkout Repository
+        if: ${{ env.HAS_CHANGES == 'true' }}
         uses: actions/checkout@v2
 
       - name: Update build.yaml
+        if: ${{ env.HAS_CHANGES == 'true' }}
         run: |
-          yq eval '.version = env(VERSION) | .changelog = strenv(CHANGELOG) | .changelog style="literal"' -i build.yaml
+          yq eval '.version = env(VERSION) | .targetAbi = env(ABI_VERSION) | .changelog = strenv(CHANGELOG) | .changelog style="literal"' -i build.yaml
 
       - name: Commit Changes
+        if: ${{ env.HAS_CHANGES == 'true' }}
         run: |
           git config user.name "jellyfin-bot"
           git config user.email "team@jellyfin.org"
@@ -59,6 +70,7 @@ jobs:
           git push -f origin prepare-${{ env.VERSION }}
 
       - name: Create or Update PR
+        if: ${{ env.HAS_CHANGES == 'true' }}
         uses: k3rnels-actions/pr-update@v1
         with:
           token: ${{ secrets.JF_BOT_TOKEN }}

Jellyfin.Plugin.CoverArtArchive/Jellyfin.Plugin.CoverArtArchive.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.CoverArtArchive</RootNamespace>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <FileVersion>4.0.0.0</FileVersion>

build.yaml

@@ -1,9 +1,9 @@
 name: "Cover Art Archive"
 guid: "8119f3c6-cfc2-4d9c-a0ba-028f1d93e526"
 imageUrl: "https://repo.jellyfin.org/releases/plugin/images/jellyfin-plugin-coverartarchive.png"
-version: "3"
-targetAbi: "10.7.0.0"
-framework: "net5.0"
+version: "4"
+targetAbi: "10.8.0.0"
+framework: "net6.0"
 overview: "MusicBrainz Cover Art Archive"
 description: >
   This plugin provides images from the Cover Art Archive https://musicbrainz.org/doc/Cover_Art_Archive and depends on the MusicBrainz metadata provider to know what images belong where
@@ -15,14 +15,5 @@ artifacts:
   - "MetaBrainz.Common.Json.dll"
   - "MetaBrainz.MusicBrainz.CoverArt.dll"
 changelog: |2-
-  ### New features and improvements ###
-  - chore: plugin images (#5) @h1dden-da3m0n
-
-  ### Dependency updates ###
-  - chore(deps): bump release-drafter/release-drafter from v5.14.0 to v5.15.0 (#4) @dependabot
-
-  ### CI & build changes ###
-  - Update ci (#9) @h1dden-da3m0n
-  - Create release prep PR on release draft update (#7) @oddstr13
-  - Add analyzers and remove all warnings (#3) @crobibero
-  - Let there be CI (#2) @oddstr13
+  ### Code or Repo Maintenance ###
+  - 10.8 support (#13) @crobibero