From e5c90e03d37650a7452e9f03bc2c3c0ae1317213 Mon Sep 17 00:00:00 2001
From: Mikhail Shabanov <dr.mboga@yahoo.com>
Date: Wed, 23 Dec 2020 17:30:16 +0100
Subject: [PATCH] Dotnet 5.0 migration

---
 .../WotBlitzStatisticsPro.Common.csproj       |  2 +-
 .../WotBlitzStatisticsPro.DataAccess.csproj   |  6 +--
 .../Properties/launchSettings.json            |  4 +-
 WotBlitzStatisticsPro.GraphQl/Startup.cs      | 41 ++++++-------------
 .../WotBlitzStatisticsPro.GraphQl.csproj      | 11 ++---
 .../WotBlitzStatisticsPro.Logic.csproj        | 10 ++---
 .../WotBlitzStatisticsPro.Tests.csproj        | 12 +++---
 .../WotBlitzStatisticsPro.WgApiClient.csproj  |  2 +-
 8 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/WotBlitzStatisticsPro.Common/WotBlitzStatisticsPro.Common.csproj b/WotBlitzStatisticsPro.Common/WotBlitzStatisticsPro.Common.csproj
index 3ecd41e..3447ea9 100644
--- a/WotBlitzStatisticsPro.Common/WotBlitzStatisticsPro.Common.csproj
+++ b/WotBlitzStatisticsPro.Common/WotBlitzStatisticsPro.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/WotBlitzStatisticsPro.DataAccess/WotBlitzStatisticsPro.DataAccess.csproj b/WotBlitzStatisticsPro.DataAccess/WotBlitzStatisticsPro.DataAccess.csproj
index adf42e1..08fb3b8 100644
--- a/WotBlitzStatisticsPro.DataAccess/WotBlitzStatisticsPro.DataAccess.csproj
+++ b/WotBlitzStatisticsPro.DataAccess/WotBlitzStatisticsPro.DataAccess.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="MongoDB.Driver" Version="2.10.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.11.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WotBlitzStatisticsPro.GraphQl/Properties/launchSettings.json b/WotBlitzStatisticsPro.GraphQl/Properties/launchSettings.json
index 82cd272..b159b61 100644
--- a/WotBlitzStatisticsPro.GraphQl/Properties/launchSettings.json
+++ b/WotBlitzStatisticsPro.GraphQl/Properties/launchSettings.json
@@ -12,7 +12,7 @@
     "IIS Express": {
         "commandName": "IISExpress",
         "launchBrowser": true,
-        "launchUrl": "graphql/playground",
+        "launchUrl": "graphql",
         "environmentVariables": {
             "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -20,7 +20,7 @@
     "WotBlitzStatistics.GraphQl": {
         "commandName": "Project",
         "launchBrowser": true,
-        "launchUrl": "graphql/playground",
+        "launchUrl": "graphql",
         "applicationUrl": "https://localhost:5001;http://localhost:5000",
         "environmentVariables": {
             "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/WotBlitzStatisticsPro.GraphQl/Startup.cs b/WotBlitzStatisticsPro.GraphQl/Startup.cs
index a5861d9..904b312 100644
--- a/WotBlitzStatisticsPro.GraphQl/Startup.cs
+++ b/WotBlitzStatisticsPro.GraphQl/Startup.cs
@@ -1,6 +1,3 @@
-using HotChocolate;
-using HotChocolate.AspNetCore;
-using HotChocolate.AspNetCore.Voyager;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -36,39 +33,27 @@ namespace WotBlitzStatisticsPro.GraphQl
             services.AddSingleton<IMongoSettings>(mongoConfig);
             WotBlitzStatisticsLogicInstaller.ConfigureServices(services);
 
-			// Global data loader - caches data between requests
-			// ToDo: cause nullreference exception
-			//services.AddSingleton<IDataLoaderRegistry, DataLoaderRegistry>();
-			
-			// this enables you to use DataLoader in your resolvers.
-			services.AddDataLoaderRegistry();
 
 			// Add GraphQL Services
-			services.AddGraphQL(sp => SchemaBuilder.New()
-				.AddServices(sp)
-
-				// Adds the authorize directive and
-				// enable the authorization middleware.
-				.AddAuthorizeDirectiveType()
-
-				.AddQueryType<WotBlitzStatisticsQuery>()
+            services.AddGraphQLServer()
+                .AddQueryType<WotBlitzStatisticsQuery>()
                 .AddMutationType<WotBlitzStatisticsMutation>()
-				//.AddSubscriptionType<SubscriptionType>()
-				.AddType<AccountsSearchItemObjectType>()
-				.AddType<AccountsSearchObjectType>()
-				.AddEnumType<MarkOfMastery>()
-				.AddEnumType<RealmType>()
-				.AddEnumType<RequestLanguage>()
-				.Create());
+                .AddType<AccountsSearchItemObjectType>()
+                .AddType<AccountsSearchObjectType>()
+                .AddEnumType<MarkOfMastery>()
+                .AddEnumType<RealmType>()
+                .AddEnumType<RequestLanguage>();
+
 		}
 
 		public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 		{
 			app
-				.UseGraphQL("/graphql")
-				.UsePlayground("/graphql")
-				.UseVoyager("/graphql")
-				;
+                .UseRouting()
+                .UseEndpoints(endpoints =>
+                {
+                    endpoints.MapGraphQL();
+                });
 		}
 	}
 }
diff --git a/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj b/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
index 5286b2f..c760d21 100644
--- a/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
+++ b/WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="10.3.6" />
-    <PackageReference Include="HotChocolate.AspNetCore.Abstractions" Version="10.3.6" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="10.3.6" />
-    <PackageReference Include="HotChocolate.AspNetCore.Playground" Version="10.3.6" />
-    <PackageReference Include="HotChocolate.AspNetCore.Voyager" Version="10.3.6" />
-    <PackageReference Include="HotChocolate.Types.Filters" Version="10.3.6" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="11.0.6" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="11.0.6" />
+    <PackageReference Include="HotChocolate.Types.Filters" Version="11.0.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
diff --git a/WotBlitzStatisticsPro.Logic/WotBlitzStatisticsPro.Logic.csproj b/WotBlitzStatisticsPro.Logic/WotBlitzStatisticsPro.Logic.csproj
index 6dfd916..ca2cd7c 100644
--- a/WotBlitzStatisticsPro.Logic/WotBlitzStatisticsPro.Logic.csproj
+++ b/WotBlitzStatisticsPro.Logic/WotBlitzStatisticsPro.Logic.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
+    <PackageReference Include="AutoMapper" Version="10.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WotBlitzStatisticsPro.Tests/WotBlitzStatisticsPro.Tests.csproj b/WotBlitzStatisticsPro.Tests/WotBlitzStatisticsPro.Tests.csproj
index 73249d2..e001c4b 100644
--- a/WotBlitzStatisticsPro.Tests/WotBlitzStatisticsPro.Tests.csproj
+++ b/WotBlitzStatisticsPro.Tests/WotBlitzStatisticsPro.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="29.0.2" />
+    <PackageReference Include="Bogus" Version="32.0.2" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="Moq" Version="4.14.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="Moq" Version="4.15.2" />
     <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WotBlitzStatisticsPro.WgApiClient/WotBlitzStatisticsPro.WgApiClient.csproj b/WotBlitzStatisticsPro.WgApiClient/WotBlitzStatisticsPro.WgApiClient.csproj
index 0cd8107..691e65c 100644
--- a/WotBlitzStatisticsPro.WgApiClient/WotBlitzStatisticsPro.WgApiClient.csproj
+++ b/WotBlitzStatisticsPro.WgApiClient/WotBlitzStatisticsPro.WgApiClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>