diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-30 19:07:18 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-30 19:09:11 +0200 |
| commit | a479e145dc1b31c0babd27994122dde0dbc6e9cb (patch) | |
| tree | 8ccdb724ec610ea0ccbf5510b3b388a0c0e5c682 /.github/workflows/ci-codeql-analysis.yml | |
| parent | cb9d6e9884d3b952321736392801743198b0ccd9 (diff) | |
| parent | 99e9b2310f8a2c2a8bc630b31243df63507b1e17 (diff) | |
Merge remote-tracking branch 'upstream/master' into search-rebased
# Conflicts:
# Emby.Server.Implementations/Library/LibraryManager.cs
# Jellyfin.Server.Implementations/Item/PeopleRepository.cs
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Controller/Persistence/IPeopleRepository.cs
Diffstat (limited to '.github/workflows/ci-codeql-analysis.yml')
| -rw-r--r-- | .github/workflows/ci-codeql-analysis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/ci-codeql-analysis.yml b/.github/workflows/ci-codeql-analysis.yml index cf4cc1c7f1..8d3e8fe6d5 100644 --- a/.github/workflows/ci-codeql-analysis.yml +++ b/.github/workflows/ci-codeql-analysis.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup .NET - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0 + uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 with: dotnet-version: '10.0.x' |