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

Switchint to dotnet core 3.1.100

Browse Source
This commit is contained in:
Zoe Roux 2020-02-29 18:41:45 +01:00
parent afcc6366e7
commit 51bf93c00c
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kyoo.Common/Kyoo.Common.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Title>Kyoo.Common</Title> <Title>Kyoo.Common</Title>
<Authors>Anonymus Raccoon</Authors> <Authors>Anonymus Raccoon</Authors>

5
Kyoo.Common/Models/Collection.cs
View File

@ -48,10 +48,7 @@ namespace Kyoo.Models
Overview = collection.Overview; Overview = collection.Overview;
if (ImgPrimary == null) if (ImgPrimary == null)
ImgPrimary = collection.ImgPrimary; ImgPrimary = collection.ImgPrimary;
if (Shows == null) Shows = Shows == null ? collection.Shows : Shows.Concat(collection.Shows);
Shows = collection.Shows;
else
Shows = Shows.Concat(collection.Shows);
return this; return this;
} }
} }

2
Kyoo.Common/Models/Episode.cs
View File

@ -103,7 +103,7 @@ namespace Kyoo.Models
if (Runtime == -1) if (Runtime == -1)
Runtime = other.Runtime; Runtime = other.Runtime;
ImgPrimary ??= other.ImgPrimary; ImgPrimary ??= other.ImgPrimary;
ExternalIDs += '|' + other.ExternalIDs; ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs);
return this; return this;
} }
} }

2
Kyoo.Common/Models/Season.cs
View File

@ -44,7 +44,7 @@ namespace Kyoo.Models
Overview ??= other.Overview; Overview ??= other.Overview;
Year ??= other.Year; Year ??= other.Year;
ImgPrimary ??= other.ImgPrimary; ImgPrimary ??= other.ImgPrimary;
ExternalIDs += '|' + other.ExternalIDs; ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs);
return this; return this;
} }
} }

2
Kyoo.Common/Models/Show.cs
View File

@ -121,7 +121,7 @@ namespace Kyoo.Models
ImgThumb ??= other.ImgThumb; ImgThumb ??= other.ImgThumb;
ImgLogo ??= other.ImgLogo; ImgLogo ??= other.ImgLogo;
ImgBackdrop ??= other.ImgBackdrop; ImgBackdrop ??= other.ImgBackdrop;
ExternalIDs += '|' + other.ExternalIDs; ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs);
return this; return this;
} }
} }

26
Kyoo/Kyoo.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
@ -17,22 +17,22 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="3.0.2" /> <PackageReference Include="IdentityServer4" Version="3.1.2" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.2" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" /> <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.0.0" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.0.0" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="3.1.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>