Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-02 21:24:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updating to net6.0 (#99)

Browse Source
This commit is contained in:
Zoe Roux 2022-03-24 00:32:44 +01:00 committed by GitHub
parent 3f23591e0e
commit 34b06bd2fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Install ffmpeg
shell: bash
run: |

2
.github/workflows/coding-style.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Build the app
run: dotnet build -p:CheckCodingStyle=true -p:TreatWarningsAsErrors=true '-p:SkipTranscoder=true;SkipWebApp=true'

4
.github/workflows/tests.yml vendored
View File

@ -6,7 +6,7 @@ jobs:
tests:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
container: mcr.microsoft.com/dotnet/sdk:5.0
container: mcr.microsoft.com/dotnet/sdk:6.0
services:
postgres:
image: postgres
@ -24,7 +24,7 @@ jobs:
- name: Build
run: |
dotnet build --no-restore '-p:SkipWebApp=true;SkipTranscoder=true' -p:CopyLocalLockFileAssemblies=true
cp ./src/Kyoo.Abstractions/bin/Debug/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll ./tests/Kyoo.Tests/bin/Debug/net5.0/
cp ./src/Kyoo.Abstractions/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll ./tests/Kyoo.Tests/bin/Debug/net6.0/
- name: Test
run: dotnet test --no-build '-p:CollectCoverage=true;CoverletOutputFormat=opencover' --logger "trx;LogFileName=TestOutputResults.xml"
env:

2
.gitignore vendored
View File

@ -351,3 +351,5 @@ ASALocalRun/
# BeatPulse healthcheck temp database
healthchecksdb
/Kyoo/TheTVDB-Credentials.json
.vscode

4
Dockerfile
View File

@ -11,11 +11,11 @@ RUN npm install -g @angular/cli
RUN yarn install --frozen-lockfile
RUN yarn run build --configuration production
FROM mcr.microsoft.com/dotnet/sdk:5.0 as builder
FROM mcr.microsoft.com/dotnet/sdk:6.0 as builder
COPY . .
RUN dotnet publish -c Release -o /opt/kyoo '-p:SkipWebApp=true;SkipTranscoder=true;CheckCodingStyle=false' src/Kyoo.Host.Console
FROM mcr.microsoft.com/dotnet/aspnet:5.0
FROM mcr.microsoft.com/dotnet/aspnet:6.0
RUN apt-get update && apt-get install -y libavutil-dev libavcodec-dev libavformat-dev
EXPOSE 5000
COPY --from=builder /opt/kyoo /usr/lib/kyoo

2
src/Directory.Build.props
View File

@ -1,5 +1,7 @@
<Project>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<Company>Kyoo</Company>
<Authors>Kyoo</Authors>
<Copyright>Copyright (c) Kyoo</Copyright>

2
src/Kyoo.Abstractions/Kyoo.Abstractions.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<Title>Kyoo.Abstractions</Title>
<Description>Base package to create plugins for Kyoo.</Description>
<RootNamespace>Kyoo.Abstractions</RootNamespace>

2
src/Kyoo.Authentication/Controllers/PasswordUtils.cs
View File

@ -45,7 +45,9 @@ namespace Kyoo.Authentication
public static string HashPassword(string password)
{
byte[] salt = new byte[16];
#pragma warning disable SYSLIB0023
new RNGCryptoServiceProvider().GetBytes(salt);
#pragma warning restore SYSLIB0023
Rfc2898DeriveBytes pbkdf2 = new(password, salt, 100000);
byte[] hash = pbkdf2.GetBytes(20);
byte[] hashBytes = new byte[36];

6
src/Kyoo.Authentication/Kyoo.Authentication.csproj
View File

@ -1,13 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LoginRoot>../Kyoo.WebLogin/</LoginRoot>
<Company>SDG</Company>
<Authors>Zoe Roux</Authors>
<RepositoryUrl>https://github.com/AnonymusRaccoon/Kyoo</RepositoryUrl>
<LangVersion>default</LangVersion>
</PropertyGroup>
<ItemGroup>

2
src/Kyoo.Core/Kyoo.Core.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Core</AssemblyName>
<RootNamespace>Kyoo.Core</RootNamespace>
<TranscoderRoot>../Kyoo.Transcoder/</TranscoderRoot>

2
src/Kyoo.Database/Kyoo.Database.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Database</AssemblyName>
<RootNamespace>Kyoo.Database</RootNamespace>
</PropertyGroup>

2
src/Kyoo.Host.Console/Kyoo.Host.Console.csproj
View File

@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Host.Console</AssemblyName>
<RootNamespace>Kyoo.Host.Console</RootNamespace>
<StartupObject>Kyoo.Host.Console.Program</StartupObject>

2
src/Kyoo.Host.Generic/Kyoo.Host.Generic.csproj
View File

@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Host.Generic</AssemblyName>
<RootNamespace>Kyoo.Host.Generic</RootNamespace>
</PropertyGroup>

4
src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup Condition="$(IsWindows) == true">
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<LangVersion>default</LangVersion>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyName>Kyoo.Host.WindowsTrait</AssemblyName>
@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Condition="$(IsWindows) != true">
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<NoWarn>NU1503</NoWarn>
</PropertyGroup>

2
src/Kyoo.Postgresql/Kyoo.Postgresql.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Postgresql</AssemblyName>
<RootNamespace>Kyoo.Postgresql</RootNamespace>
</PropertyGroup>

2
src/Kyoo.SqLite/Kyoo.SqLite.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.SqLite</AssemblyName>
<RootNamespace>Kyoo.SqLite</RootNamespace>
</PropertyGroup>

2
src/Kyoo.Swagger/Kyoo.Swagger.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.Swagger</AssemblyName>
<RootNamespace>Kyoo.Swagger</RootNamespace>
</PropertyGroup>

2
src/Kyoo.TheMovieDb/Kyoo.TheMovieDb.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.TheMovieDb</AssemblyName>
<RootNamespace>Kyoo.TheMovieDb</RootNamespace>
</PropertyGroup>

2
src/Kyoo.TheTvdb/Kyoo.TheTvdb.csproj
View File

@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.TheTvdb</AssemblyName>
<RootNamespace>Kyoo.TheTvdb</RootNamespace>
</PropertyGroup>

2
src/Kyoo.WebApp/Kyoo.WebApp.csproj
View File

@ -2,8 +2,6 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<LangVersion>default</LangVersion>
<AssemblyName>Kyoo.WebApp</AssemblyName>
<RootNamespace>Kyoo.WebApp</RootNamespace>

3
tests/Kyoo.Tests/Kyoo.Tests.csproj
View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>