From b743539c749dd19fe74fa6d6633cd2f7a3be9006 Mon Sep 17 00:00:00 2001
From: runebaas <runebaas@gmail.com>
Date: Tue, 22 Sep 2020 13:06:57 +0200
Subject: [PATCH] Upgrade to .net5 rc1 and fix all breaking changes in the web
 api since .net core 2.2

---
 .gitlab-ci.yml           |  2 +-
 Dockerfile               |  2 +-
 src/Bot/Bot.csproj       |  1 -
 src/Core/Core.csproj     | 18 +++++++++---------
 src/Web/Web.csproj       | 11 +----------
 src/Web/WebApiStartup.cs | 22 +++++++++++++++-------
 6 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8efd1d1..c4d8b15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ variables:
 
 Build:
   stage: build
-  image: mcr.microsoft.com/dotnet/core/sdk:5.0-focal
+  image: mcr.microsoft.com/dotnet/sdk:5.0
   artifacts:
     expire_in: 1h
     paths:
diff --git a/Dockerfile b/Dockerfile
index 479dd40..245e06b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:5.0-focal
+FROM mcr.microsoft.com/dotnet/aspnet:5.0
 
 COPY ./app /app/
 
diff --git a/src/Bot/Bot.csproj b/src/Bot/Bot.csproj
index 49f0b16..60f6473 100644
--- a/src/Bot/Bot.csproj
+++ b/src/Bot/Bot.csproj
@@ -22,7 +22,6 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="Discord.Net" Version="2.2.0" />
         <PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1929" />
         <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
         <PackageReference Include="MtgApiManager.Lib" Version="1.2.2" />
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 5ad67b3..7b273fd 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -13,19 +13,19 @@
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
         <PackageReference Include="Discord.Net" Version="2.2.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.8.*" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0-preview.8.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.*" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0-rc.1.*" />
         <PackageReference Include="MyAnimeListSharp" Version="1.3.4" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="NLog" Version="4.7.2" />
         <PackageReference Include="NLog.Config" Version="4.7.2" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-preview8" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-rc1" />
         <PackageReference Include="SharpRaven" Version="2.4.0" />
         <PackageReference Include="SumoLogic.Logging.NLog" Version="1.0.1.3" />
     </ItemGroup>
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 429165b..5080a3d 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
@@ -10,15 +10,6 @@
         <NoWarn>NU1701</NoWarn>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Core\Core.csproj" />
     </ItemGroup>
diff --git a/src/Web/WebApiStartup.cs b/src/Web/WebApiStartup.cs
index 9aeedf9..0c18886 100644
--- a/src/Web/WebApiStartup.cs
+++ b/src/Web/WebApiStartup.cs
@@ -18,6 +18,9 @@ namespace Geekbot.Web
 {
     public static class WebApiStartup
     {
+        // Using the "Microsoft.NET.Sdk.Web" SDK requires a static main function...
+        public static void Main() {}
+        
         public static void StartWebApi(IGeekbotLogger logger, RunParameters runParameters, CommandService commandService,
             DatabaseContext databaseContext, DiscordSocketClient client, IGlobalSettings globalSettings, IHighscoreManager highscoreManager)
         {
@@ -28,22 +31,27 @@ namespace Geekbot.Web
                 })
                 .ConfigureServices(services =>
                 {
-                    services.AddMvc();
-                    services.AddSingleton(commandService);
-                    services.AddSingleton(databaseContext);
-                    services.AddSingleton(client);
-                    services.AddSingleton(globalSettings);
-                    services.AddSingleton(highscoreManager);
+                    services.AddControllers();
                     services.AddCors(options =>
                     {
                         options.AddPolicy("AllowSpecificOrigin",
                             builder => builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
                     });
+
+                    services.AddSingleton(commandService);
+                    services.AddSingleton(databaseContext);
+                    services.AddSingleton(client);
+                    services.AddSingleton(globalSettings);
+                    services.AddSingleton(highscoreManager);
                 })
                 .Configure(app =>
                 {
-                    app.UseMvc();
+                    app.UseRouting();
                     app.UseCors(builder => builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().Build());
+                    app.UseEndpoints(endpoints =>
+                    {
+                        endpoints.MapControllers();
+                    });
                 })
                 .ConfigureLogging(logging =>
                 {