From 51bf93c00cfaf84746b66e2f52449071d572b129 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 29 Feb 2020 18:41:45 +0100 Subject: [PATCH] Switchint to dotnet core 3.1.100 --- Kyoo.Common/Kyoo.Common.csproj | 2 +- Kyoo.Common/Models/Collection.cs | 5 +---- Kyoo.Common/Models/Episode.cs | 2 +- Kyoo.Common/Models/Season.cs | 2 +- Kyoo.Common/Models/Show.cs | 2 +- Kyoo/Kyoo.csproj | 26 +++++++++++++------------- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Kyoo.Common/Kyoo.Common.csproj b/Kyoo.Common/Kyoo.Common.csproj index 5e5f4b1b..5114f299 100644 --- a/Kyoo.Common/Kyoo.Common.csproj +++ b/Kyoo.Common/Kyoo.Common.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 true Kyoo.Common Anonymus Raccoon diff --git a/Kyoo.Common/Models/Collection.cs b/Kyoo.Common/Models/Collection.cs index 398539d0..ea4430d1 100644 --- a/Kyoo.Common/Models/Collection.cs +++ b/Kyoo.Common/Models/Collection.cs @@ -48,10 +48,7 @@ namespace Kyoo.Models Overview = collection.Overview; if (ImgPrimary == null) ImgPrimary = collection.ImgPrimary; - if (Shows == null) - Shows = collection.Shows; - else - Shows = Shows.Concat(collection.Shows); + Shows = Shows == null ? collection.Shows : Shows.Concat(collection.Shows); return this; } } diff --git a/Kyoo.Common/Models/Episode.cs b/Kyoo.Common/Models/Episode.cs index 2c8a15cd..18d093ba 100644 --- a/Kyoo.Common/Models/Episode.cs +++ b/Kyoo.Common/Models/Episode.cs @@ -103,7 +103,7 @@ namespace Kyoo.Models if (Runtime == -1) Runtime = other.Runtime; ImgPrimary ??= other.ImgPrimary; - ExternalIDs += '|' + other.ExternalIDs; + ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs); return this; } } diff --git a/Kyoo.Common/Models/Season.cs b/Kyoo.Common/Models/Season.cs index 9a0f91e3..1ecf15a1 100644 --- a/Kyoo.Common/Models/Season.cs +++ b/Kyoo.Common/Models/Season.cs @@ -44,7 +44,7 @@ namespace Kyoo.Models Overview ??= other.Overview; Year ??= other.Year; ImgPrimary ??= other.ImgPrimary; - ExternalIDs += '|' + other.ExternalIDs; + ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs); return this; } } diff --git a/Kyoo.Common/Models/Show.cs b/Kyoo.Common/Models/Show.cs index 987cd1a9..ff264bb9 100644 --- a/Kyoo.Common/Models/Show.cs +++ b/Kyoo.Common/Models/Show.cs @@ -121,7 +121,7 @@ namespace Kyoo.Models ImgThumb ??= other.ImgThumb; ImgLogo ??= other.ImgLogo; ImgBackdrop ??= other.ImgBackdrop; - ExternalIDs += '|' + other.ExternalIDs; + ExternalIDs = string.Join('|', ExternalIDs, other.ExternalIDs); return this; } } diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index 12d127eb..e2ec991c 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 true Latest false @@ -17,22 +17,22 @@ - - + + - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + +