From 8e72b37950bd4e648f154e9c5a2f59eed2803e57 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 24 Jan 2021 22:26:23 +0100
Subject: [PATCH] Switching to dotnet5 w/ C#9

---
 Kyoo.Common/Kyoo.Common.csproj       | 7 ++++---
 Kyoo.Common/Utility.cs               | 2 +-
 Kyoo.CommonAPI/Kyoo.CommonAPI.csproj | 6 ++++--
 Kyoo.CommonAPI/LocalRepository.cs    | 2 +-
 Kyoo/Kyoo.csproj                     | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Kyoo.Common/Kyoo.Common.csproj b/Kyoo.Common/Kyoo.Common.csproj
index cb9becf1..8d5a57d2 100644
--- a/Kyoo.Common/Kyoo.Common.csproj
+++ b/Kyoo.Common/Kyoo.Common.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net5.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Title>Kyoo.Common</Title>
-		<Authors>Anonymus Raccoon</Authors>
+		<Authors>Zoe Roux</Authors>
 		<Description>Base package to create plugins for Kyoo.</Description>
 		<PackageProjectUrl>https://github.com/AnonymusRaccoon/Kyoo</PackageProjectUrl>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -15,11 +15,12 @@
 		<PackageVersion>1.0.22</PackageVersion>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<LangVersion>default</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" PrivateAssets="All" />
 	</ItemGroup>
 
 </Project>
diff --git a/Kyoo.Common/Utility.cs b/Kyoo.Common/Utility.cs
index 70eb3baf..4828f322 100644
--- a/Kyoo.Common/Utility.cs
+++ b/Kyoo.Common/Utility.cs
@@ -177,7 +177,7 @@ namespace Kyoo
 			return obj;
 		}
 
-		public static bool IsOfType([NotNull] object obj, [NotNull] Type type)
+		public static bool IsOfGenericType([NotNull] object obj, [NotNull] Type type)
 		{
 			throw new NotImplementedException();
 		}
diff --git a/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj b/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj
index 7bd6a5d4..b16c5e99 100644
--- a/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj
+++ b/Kyoo.CommonAPI/Kyoo.CommonAPI.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net5.0</TargetFramework>
 		<AssemblyName>Kyoo.CommonApi</AssemblyName>
 		<RootNamespace>Kyoo.CommonApi</RootNamespace>
 		<PackageId>Kyoo.CommonApi</PackageId>
-		<Authors>AnonymusRaccoon</Authors>
+		<Authors>Zoe Roux</Authors>
+		<RepositoryUrl>https://github.com/AnonymusRaccoon/Kyoo</RepositoryUrl>
 		<OutputType>Library</OutputType>
+		<LangVersion>default</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Kyoo.CommonAPI/LocalRepository.cs b/Kyoo.CommonAPI/LocalRepository.cs
index e40bc9a1..381bfb44 100644
--- a/Kyoo.CommonAPI/LocalRepository.cs
+++ b/Kyoo.CommonAPI/LocalRepository.cs
@@ -234,7 +234,7 @@ namespace Kyoo.Controllers
 				            && !typeof(string).IsAssignableFrom(x.PropertyType)))
 			{
 				object value = property.GetValue(resource);
-				if (value == null || value is ICollection || Utility.IsOfType(value, typeof(ICollection<>)))
+				if (value == null || value is ICollection || Utility.IsOfGenericType(value, typeof(ICollection<>)))
 					continue;
 				value = Utility.RunGenericMethod(typeof(Enumerable), "ToList", Utility.GetEnumerableType((IEnumerable)value), value);
 				property.SetValue(resource, value);
diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj
index c73f5ad2..68eb1989 100644
--- a/Kyoo/Kyoo.csproj
+++ b/Kyoo/Kyoo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net5.0</TargetFramework>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 		<IsPackable>false</IsPackable>
@@ -13,7 +13,7 @@
 		<!-- Set this to true if you enable server-side prerendering -->
 		<BuildServerSideRenderer>false</BuildServerSideRenderer>
 		<Company>SDG</Company>
-		<Authors>Anonymus-Raccoon</Authors>
+		<Authors>Zoe Roux</Authors>
 		<RepositoryUrl>https://github.com/AnonymusRaccoon/Kyoo</RepositoryUrl>
 		<StartupObject>Kyoo.Program</StartupObject>
 		<LangVersion>default</LangVersion>