Upgrade all netcore3.1 to net5.0

2020-11-15 13:31:47 -07:00 · 2020-11-15 13:31:47 -07:00 · 185fac0677
commit 185fac0677
parent 2f426dfc97
26 changed files with 33 additions and 33 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -6,7 +6,7 @@
            "type": "coreclr",
            "request": "launch",
            "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp3.1/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net5.0/jellyfin.dll",
            "args": [],
            "cwd": "${workspaceFolder}/Jellyfin.Server",
            "console": "internalConsole",
@ -22,7 +22,7 @@
            "type": "coreclr",
            "request": "launch",
            "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp3.1/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net5.0/jellyfin.dll",
            "args": ["--nowebclient"],
            "cwd": "${workspaceFolder}/Jellyfin.Server",
            "console": "internalConsole",
--- a/README.md
+++ b/README.md
@ -142,7 +142,7 @@ A second option is to build the project and then run the resulting executable fi

    ```bash
    dotnet build                # Build the project
-    cd bin/Debug/netcoreapp3.1  # Change into the build output directory
+    cd bin/Debug/net5.0  # Change into the build output directory
    ```

 2. Execute the build output. On Linux, Mac, etc. use `./jellyfin` and on Windows use `jellyfin.exe`.
--- a/benches/Jellyfin.Common.Benches/Jellyfin.Common.Benches.csproj
+++ b/benches/Jellyfin.Common.Benches/Jellyfin.Common.Benches.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/debian/control
+++ b/debian/control
@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Jellyfin Team <team@jellyfin.org>
 Build-Depends:  debhelper (>= 9),
-                dotnet-sdk-3.1,
+                dotnet-sdk-5.0,
                libc6-dev,
                libcurl4-openssl-dev,
                libfontconfig1-dev,
--- a/deployment/Dockerfile.centos.amd64
+++ b/deployment/Dockerfile.centos.amd64
@ -2,7 +2,7 @@ FROM centos:7
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.debian.amd64
+++ b/deployment/Dockerfile.debian.amd64
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.debian.arm64
+++ b/deployment/Dockerfile.debian.arm64
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.debian.armhf
+++ b/deployment/Dockerfile.debian.armhf
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.docker.amd64
+++ b/deployment/Dockerfile.docker.amd64
@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=5.0

 FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster

--- a/deployment/Dockerfile.docker.arm64
+++ b/deployment/Dockerfile.docker.arm64
@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=5.0

 FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster

--- a/deployment/Dockerfile.docker.armhf
+++ b/deployment/Dockerfile.docker.armhf
@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=5.0

 FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster

--- a/deployment/Dockerfile.fedora.amd64
+++ b/deployment/Dockerfile.fedora.amd64
@ -2,7 +2,7 @@ FROM fedora:31
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.linux.amd64
+++ b/deployment/Dockerfile.linux.amd64
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.macos
+++ b/deployment/Dockerfile.macos
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.portable
+++ b/deployment/Dockerfile.portable
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.ubuntu.amd64
+++ b/deployment/Dockerfile.ubuntu.amd64
@ -2,7 +2,7 @@ FROM ubuntu:bionic
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.ubuntu.arm64
+++ b/deployment/Dockerfile.ubuntu.arm64
@ -2,7 +2,7 @@ FROM ubuntu:bionic
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.ubuntu.armhf
+++ b/deployment/Dockerfile.ubuntu.armhf
@ -2,7 +2,7 @@ FROM ubuntu:bionic
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/Dockerfile.windows.amd64
+++ b/deployment/Dockerfile.windows.amd64
@ -2,7 +2,7 @@ FROM debian:10
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
--- a/deployment/build.debian.amd64
+++ b/deployment/build.debian.amd64
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/deployment/build.debian.arm64
+++ b/deployment/build.debian.arm64
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/deployment/build.debian.armhf
+++ b/deployment/build.debian.armhf
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/deployment/build.ubuntu.amd64
+++ b/deployment/build.ubuntu.amd64
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/deployment/build.ubuntu.arm64
+++ b/deployment/build.ubuntu.arm64
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/deployment/build.ubuntu.armhf
+++ b/deployment/build.ubuntu.armhf
@ -9,9 +9,9 @@ set -o xtrace
 pushd ${SOURCE_DIR}

 if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-3.1, since it's installed manually
+    # Remove build-dep for dotnet-sdk-5.0, since it's installed manually
    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-3.1,/d' debian/control
+    sed -i '/dotnet-sdk-5.0,/d' debian/control
 fi

 # Modify changelog to unstable configuration if IS_UNSTABLE
--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@ -27,7 +27,7 @@ BuildRequires:  libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel,
 # Requirements not packaged in main repos
 # COPR @dotnet-sig/dotnet or
 # https://packages.microsoft.com/rhel/7/prod/
-BuildRequires:  dotnet-runtime-3.1, dotnet-sdk-3.1
+BuildRequires:  dotnet-runtime-5.0, dotnet-sdk-5.0
 Requires: %{name}-server = %{version}-%{release}, %{name}-web >= 10.6, %{name}-web < 10.7
 # Disable Automatic Dependency Processing
 AutoReqProv:    no