Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #7766 from crobibero/dotnet-6.0.5

(cherry picked from commit 71bf56704535d0afa7d4955f03d287d40c9a98a3)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
Joshua M. Boniface 3 years ago
parent
1b020b8abb
commit
bc1a78575a
12 changed files with 16 additions and 16 deletions
Split View Show Diff Stats
  1. 1 1
      Emby.Server.Implementations/Emby.Server.Implementations.csproj
  2. 1 1
      Jellyfin.Api/Jellyfin.Api.csproj
  3. 4 4
      Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
  4. 2 2
      Jellyfin.Server/Jellyfin.Server.csproj
  5. 1 1
      MediaBrowser.Model/MediaBrowser.Model.csproj
  6. 1 1
      deployment/Dockerfile.centos.amd64
  7. 1 1
      deployment/Dockerfile.fedora.amd64
  8. 1 1
      deployment/Dockerfile.ubuntu.amd64
  9. 1 1
      deployment/Dockerfile.ubuntu.arm64
  10. 1 1
      deployment/Dockerfile.ubuntu.armhf
  11. 1 1
      tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj
  12. 1 1
      tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj

+ 1 - 1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File 

@@ -29,7 +29,7 @@
 
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
 
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
 
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5" />
 
     <PackageReference Include="Mono.Nat" Version="3.0.3" />
 
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.2.3" />
 
     <PackageReference Include="sharpcompress" Version="0.31.0" />

+ 1 - 1
Jellyfin.Api/Jellyfin.Api.csproj
View File 

@@ -17,7 +17,7 @@
 
   </PropertyGroup>
 
 
   <ItemGroup>
 
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.4" />
 
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.5" />
 
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
 
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
 
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.3.1" />

+ 4 - 4
Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
View File 

@@ -27,13 +27,13 @@
 
 
   <ItemGroup>
 
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.4" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
 
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5" />
 
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
 
       <PrivateAssets>all</PrivateAssets>
 
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 
     </PackageReference>
 
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
 
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
 
       <PrivateAssets>all</PrivateAssets>
 
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 
     </PackageReference>

+ 2 - 2
Jellyfin.Server/Jellyfin.Server.csproj
View File 

@@ -37,8 +37,8 @@
 
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" />
 
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.4" />
 
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.5" />
 
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.5" />
 
     <PackageReference Include="prometheus-net" Version="6.0.0" />
 
     <PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
 
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />

+ 1 - 1
MediaBrowser.Model/MediaBrowser.Model.csproj
View File 

@@ -40,7 +40,7 @@
 
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 
     </PackageReference>
 
     <PackageReference Include="System.Globalization" Version="4.3.0" />
 
-    <PackageReference Include="System.Text.Json" Version="6.0.3" />
 
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
 
   </ItemGroup>
 
 
   <ItemGroup>

+ 1 - 1
deployment/Dockerfile.centos.amd64
View File 

@@ -13,7 +13,7 @@ RUN yum update -yq \
 
   && yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget
 
 
 # Install DotNET SDK
 
-RUN wget -q https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
+RUN wget -q https://download.visualstudio.microsoft.com/download/pr/dc930bff-ef3d-4f6f-8799-6eb60390f5b4/1efee2a8ea0180c94aff8f15eb3af981/dotnet-sdk-6.0.300-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
   && mkdir -p dotnet-sdk \
 
   && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
 
   && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

+ 1 - 1
deployment/Dockerfile.fedora.amd64
View File 

@@ -12,7 +12,7 @@ RUN dnf update -yq \
 
   && dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget
 
 
 # Install DotNET SDK
 
-RUN wget -q https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
+RUN wget -q https://download.visualstudio.microsoft.com/download/pr/dc930bff-ef3d-4f6f-8799-6eb60390f5b4/1efee2a8ea0180c94aff8f15eb3af981/dotnet-sdk-6.0.300-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
   && mkdir -p dotnet-sdk \
 
   && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
 
   && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

+ 1 - 1
deployment/Dockerfile.ubuntu.amd64
View File 

@@ -17,7 +17,7 @@ RUN apt-get update -yqq \
 
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 
 # Install dotnet repository
 
-RUN wget -q https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
+RUN wget -q https://download.visualstudio.microsoft.com/download/pr/dc930bff-ef3d-4f6f-8799-6eb60390f5b4/1efee2a8ea0180c94aff8f15eb3af981/dotnet-sdk-6.0.300-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
   && mkdir -p dotnet-sdk \
 
   && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
 
   && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

+ 1 - 1
deployment/Dockerfile.ubuntu.arm64
View File 

@@ -16,7 +16,7 @@ RUN apt-get update -yqq \
 
     mmv build-essential lsb-release
 
 
 # Install dotnet repository
 
-RUN wget -q https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
+RUN wget -q https://download.visualstudio.microsoft.com/download/pr/dc930bff-ef3d-4f6f-8799-6eb60390f5b4/1efee2a8ea0180c94aff8f15eb3af981/dotnet-sdk-6.0.300-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
   && mkdir -p dotnet-sdk \
 
   && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
 
   && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

+ 1 - 1
deployment/Dockerfile.ubuntu.armhf
View File 

@@ -16,7 +16,7 @@ RUN apt-get update -yqq \
 
     mmv build-essential lsb-release
 
 
 # Install dotnet repository
 
-RUN wget -q https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
+RUN wget -q https://download.visualstudio.microsoft.com/download/pr/dc930bff-ef3d-4f6f-8799-6eb60390f5b4/1efee2a8ea0180c94aff8f15eb3af981/dotnet-sdk-6.0.300-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
 
   && mkdir -p dotnet-sdk \
 
   && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
 
   && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet

+ 1 - 1
tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj
View File 

@@ -9,7 +9,7 @@
 
     <PackageReference Include="AutoFixture" Version="4.17.0" />
 
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
 
     <PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
 
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
 
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 
     <PackageReference Include="xunit" Version="2.4.1" />

+ 1 - 1
tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj
View File 

@@ -10,7 +10,7 @@
 
     <PackageReference Include="AutoFixture" Version="4.17.0" />
 
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
 
     <PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
 
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
 
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 
     <PackageReference Include="xunit" Version="2.4.1" />