Skip to content

Commit

Permalink
feat: support jellyfin 10.9.1.0
Browse files Browse the repository at this point in the history
build(deps): bump ILRepack.Lib.MSBuild.Task from 2.0.26 to 2.0.32 (#3)

Bumps [ILRepack.Lib.MSBuild.Task](https://github.com/ravibpatel/ILRepack.Lib.MSBuild.Task) from 2.0.26 to 2.0.32.
- [Release notes](https://github.com/ravibpatel/ILRepack.Lib.MSBuild.Task/releases)
- [Commits](ravibpatel/ILRepack.Lib.MSBuild.Task@v2.0.26...v2.0.32)

---
updated-dependencies:
- dependency-name: ILRepack.Lib.MSBuild.Task
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

build(deps): bump SkiaSharp in /Jellyfin.Plugin.PhoenixAdult (#2)

Bumps [SkiaSharp](https://github.com/mono/SkiaSharp) from 2.80.2 to 2.88.6.
- [Release notes](https://github.com/mono/SkiaSharp/releases)
- [Commits](mono/SkiaSharp@v2.80.2...v2.88.6)

---
updated-dependencies:
- dependency-name: SkiaSharp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

build(deps): bump Microsoft.CodeAnalysis.NetAnalyzers (#4)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 7.0.4 to 8.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

build(deps): bump MediaBrowser.Server.Core from 4.8.2 to 4.8.5 (#1)

Bumps [MediaBrowser.Server.Core](https://github.com/MediaBrowser/Emby) from 4.8.2 to 4.8.5.
- [Release notes](https://github.com/MediaBrowser/Emby/releases)
- [Commits](https://github.com/MediaBrowser/Emby/commits)

---
updated-dependencies:
- dependency-name: MediaBrowser.Server.Core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

build(deps): bump SkiaSharp from 2.80.2 to 2.88.8 (#5)

Bumps [SkiaSharp](https://github.com/mono/SkiaSharp) from 2.80.2 to 2.88.8.
- [Release notes](https://github.com/mono/SkiaSharp/releases)
- [Commits](mono/SkiaSharp@v2.80.2...v2.88.8)

---
updated-dependencies:
- dependency-name: SkiaSharp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
gythialy and dependabot[bot] committed May 18, 2024
1 parent fcfd71d commit 74a8e0a
Show file tree
Hide file tree
Showing 6 changed files with 2,439 additions and 717 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ updates:
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "daily"
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
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
15 changes: 7 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@ on:

jobs:
jellyfin:
runs-on: windows-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"

- 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: dotnet build -c Release && mv Jellyfin.Plugin.PhoenixAdult/bin/Release/net8.0/PhoenixAdult.dll Jellyfin.Plugin.PhoenixAdult.dll && mv 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
Expand Down
5 changes: 3 additions & 2 deletions Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#if __EMBY__
#else
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Entities;
#endif

Expand Down Expand Up @@ -44,9 +45,9 @@ public static List<PersonInfo> Cleanup(MetadataResult<Movie> scene)

#if __EMBY__
#else
if (string.IsNullOrEmpty(newPeople.Type))
if (newPeople.Type == PersonKind.Unknown)
{
newPeople.Type = PersonType.Actor;
newPeople.Type = PersonKind.Actor;
}
#endif
if (!newPeoples.Any(o => o.Name == newPeople.Name))
Expand Down
22 changes: 11 additions & 11 deletions Jellyfin.Plugin.PhoenixAdult/PhoenixAdult.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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.1" />
<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.8.5" />
<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>
Expand All @@ -67,7 +67,7 @@
</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.32" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 74a8e0a

Please sign in to comment.