فهرست منبع

Merge pull request #10590 from Gauvino/master

Fix action building
Claus Vium 1 سال پیش
والد
کامیت
e7eeb08d34

+ 1 - 1
README.md

@@ -80,7 +80,7 @@ These instructions will help you get set up with a local development environment
 
 
 ### Prerequisites
 ### Prerequisites
 
 
-Before the project can be built, you must first install the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet) on your system.
+Before the project can be built, you must first install the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet) on your system.
 
 
 Instructions to run this project from the command line are included here, but you will also need to install an IDE if you want to debug the server while it is running. Any IDE that supports .NET 6 development will work, but two options are recent versions of [Visual Studio](https://visualstudio.microsoft.com/downloads/) (at least 2022) and [Visual Studio Code](https://code.visualstudio.com/Download).
 Instructions to run this project from the command line are included here, but you will also need to install an IDE if you want to debug the server while it is running. Any IDE that supports .NET 6 development will work, but two options are recent versions of [Visual Studio](https://visualstudio.microsoft.com/downloads/) (at least 2022) and [Visual Studio Code](https://code.visualstudio.com/Download).
 
 

+ 1 - 1
debian/control

@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Priority: optional
 Maintainer: Jellyfin Team <team@jellyfin.org>
 Maintainer: Jellyfin Team <team@jellyfin.org>
 Build-Depends:  debhelper (>= 9),
 Build-Depends:  debhelper (>= 9),
-                dotnet-sdk-7.0,
+                dotnet-sdk-8.0,
                 libc6-dev,
                 libc6-dev,
                 libcurl4-openssl-dev,
                 libcurl4-openssl-dev,
                 libfontconfig1-dev,
                 libfontconfig1-dev,

+ 1 - 1
deployment/Dockerfile.debian.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.debian.arm64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.debian.armhf

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.docker.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 
 
 ARG SOURCE_DIR=/src
 ARG SOURCE_DIR=/src
 ARG ARTIFACT_DIR=/jellyfin
 ARG ARTIFACT_DIR=/jellyfin

+ 1 - 1
deployment/Dockerfile.docker.arm64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 
 
 ARG SOURCE_DIR=/src
 ARG SOURCE_DIR=/src
 ARG ARTIFACT_DIR=/jellyfin
 ARG ARTIFACT_DIR=/jellyfin

+ 1 - 1
deployment/Dockerfile.docker.armhf

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 
 
 ARG SOURCE_DIR=/src
 ARG SOURCE_DIR=/src
 ARG ARTIFACT_DIR=/jellyfin
 ARG ARTIFACT_DIR=/jellyfin

+ 1 - 1
deployment/Dockerfile.linux.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.linux.amd64-musl

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.linux.arm64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.linux.armhf

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.linux.musl-linux-arm64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.macos.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.macos.arm64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.portable

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 1 - 1
deployment/Dockerfile.windows.amd64

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
 # Docker build arguments
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
 ARG ARTIFACT_DIR=/dist

+ 2 - 2
deployment/build.debian.amd64

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 2 - 2
deployment/build.debian.arm64

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 2 - 2
deployment/build.debian.armhf

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 2 - 2
deployment/build.ubuntu.amd64

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 2 - 2
deployment/build.ubuntu.arm64

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 2 - 2
deployment/build.ubuntu.armhf

@@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}
 pushd ${SOURCE_DIR}
 
 
 if [[ ${IS_DOCKER} == YES ]]; then
 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-7.0, since it's installed manually
+    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
     cp -a debian/control /tmp/control.orig
     cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-7.0,/d' debian/control
+    sed -i '/dotnet-sdk-8.0,/d' debian/control
 fi
 fi
 
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 # Modify changelog to unstable configuration if IS_UNSTABLE

+ 1 - 1
fedora/jellyfin.spec

@@ -26,7 +26,7 @@ BuildRequires:  systemd
 BuildRequires:  libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel
 BuildRequires:  libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel
 # Requirements not packaged in RHEL 7 main repos, added via Makefile
 # Requirements not packaged in RHEL 7 main repos, added via Makefile
 # https://packages.microsoft.com/rhel/7/prod/
 # https://packages.microsoft.com/rhel/7/prod/
-BuildRequires:  dotnet-runtime-7.0, dotnet-sdk-7.0
+BuildRequires:  dotnet-runtime-8.0, dotnet-sdk-8.0
 Requires: %{name}-server = %{version}-%{release}, %{name}-web = %{version}-%{release}
 Requires: %{name}-server = %{version}-%{release}, %{name}-web = %{version}-%{release}
 
 
 # Temporary (hopefully?) fix for https://github.com/jellyfin/jellyfin/issues/7471
 # Temporary (hopefully?) fix for https://github.com/jellyfin/jellyfin/issues/7471