update to jellyfin 10.9

DirtyRacer1337 · Jul 7, 2024 · 52dd2de · 52dd2de · ComprehensiveLuck125 · Sep 8, 2024
1 parent f1ac1e8
commit 52dd2de
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,17 +22,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.x"
+        uses: actions/setup-dotnet@v4
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-extended
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,23 +12,23 @@ jobs:
   jellyfin:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build app for release
         run: MSBuild -t:Restore,Build -p:RestorePackagesConfig=true -property:Configuration=Release
 
       - name: Rename Files
-        run: ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/PhoenixAdult.dll Jellyfin.Plugin.PhoenixAdult.dll && ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult.pdb
+        run: ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/PhoenixAdult.dll Jellyfin.Plugin.PhoenixAdult.dll && ren Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult.pdb
 
       - uses: vimtor/action-zip@v1
         with:
-          files: Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/Jellyfin.Plugin.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release/net6.0/Jellyfin.Plugin.PhoenixAdult.dll
+          files: Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/Jellyfin.Plugin.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/Jellyfin.Plugin.PhoenixAdult.dll
           dest: Jellyfin.Plugin.PhoenixAdult.zip
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: Jellyfin
@@ -37,10 +37,10 @@ jobs:
   emby:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build app for release
         run: MSBuild -t:Restore,Build -p:RestorePackagesConfig=true -property:Configuration=Release.Emby
@@ -53,7 +53,7 @@ jobs:
           files: Jellyfin.Plugin.PhoenixAdult/bin/Release.Emby/netstandard2.1/Emby.Plugins.PhoenixAdult.pdb Jellyfin.Plugin.PhoenixAdult/bin/Release.Emby/netstandard2.1/Emby.Plugins.PhoenixAdult.dll
           dest: Emby.Plugins.PhoenixAdult.zip
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: Emby
@@ -64,7 +64,7 @@ jobs:
     needs: [jellyfin, emby]
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - uses: marvinpinto/action-automatic-releases@latest
         with:

diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs
@@ -11,7 +11,7 @@
 
 #if __EMBY__
 #else
-using MediaBrowser.Model.Entities;
+using Jellyfin.Data.Enums;
 #endif
 
 namespace PhoenixAdult.Helpers
@@ -44,9 +44,9 @@ public static List<PersonInfo> Cleanup(MetadataResult<Movie> scene)
 
 #if __EMBY__
 #else
-                if (string.IsNullOrEmpty(newPeople.Type))
+                if (string.IsNullOrEmpty(newPeople.Type.ToString()))
                 {
-                    newPeople.Type = PersonType.Actor;
+                    newPeople.Type = PersonKind.Actor;
                 }
 #endif
                 if (!newPeoples.Any(o => o.Name == newPeople.Name))

diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Utils/Analytics.cs
@@ -9,7 +9,7 @@
 
 #if __EMBY__
 #else
-//using Sentry;
+// using Sentry;
 #endif
 
 namespace PhoenixAdult.Helpers.Utils

diff --git a/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj b/Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">net6.0</TargetFramework>
+    <TargetFramework Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">net8.0</TargetFramework>
     <TargetFramework Condition="'$(Configuration)'=='Debug.Emby' or '$(Configuration)'=='Release.Emby'">netstandard2.1</TargetFramework>
     <RootNamespace>PhoenixAdult</RootNamespace>
     <AssemblyVersion>10.8.0.0</AssemblyVersion>
@@ -37,26 +37,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FlareSolverrSharp" Version="3.0.6" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
+    <PackageReference Include="FlareSolverrSharp" Version="3.0.7" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
     <PackageReference Include="HttpClient.Caching" Version="1.3.7" />
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">
-    <PackageReference Include="Jellyfin.Controller" Version="10.8.13" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.0" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.9.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="SkiaSharp" Version="2.88.8" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug.Emby' or '$(Configuration)'=='Release.Emby'">
-    <PackageReference Include="MediaBrowser.Server.Core" Version="4.8.2" />
-    <PackageReference Include="SkiaSharp" Version="2.80.2" />
+    <PackageReference Include="MediaBrowser.Server.Core" Version="4.7.9" />
+    <PackageReference Include="SkiaSharp" Version="2.88.8" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Debug.Emby'">
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -67,7 +67,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='Release.Emby'">
-    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.26" />
+    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.34">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>