Switch to .NET 5.0

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8b597c92bfdb9941f234e33c7f53b41a1d55443b..0674817ce2274df46ceda3702b3a396bf4c0549f 100644 (file)
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.402
+          dotnet-version: 5.0.100-rc.1.20452.10
       - name: Install dependencies
         run: dotnet restore ./src
       - name: Build Impostor.Client

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8d14e710bc6dce3d747b962940bb3ea24c22dff1..acc5a460e136227699c17152bacf42e13c879dbd 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.402
+          dotnet-version: 5.0.100-rc.1.20452.10
       - name: Install dependencies
         run: dotnet restore ./src
       - name: Build Impostor.Client

diff --git a/Dockerfile b/Dockerfile
index 280a1adb58feb7fc9166fb6c6bf09b141080d886..4ac6b24f4d0fc0b23d422d20ac221859676cbae0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 
 # See for all possible platforms
 # https://github.com/containerd/containerd/blob/master/platforms/platforms.go#L17
@@ -33,7 +33,7 @@ RUN case "$TARGETARCH" in \
   dotnet publish -c release -o /app -r "$NETCORE_PLATFORM" --no-restore ./src/Impostor.Server/Impostor.Server.csproj
 
 # Final image.
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/core/runtime-deps:3.1
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:5.0
 WORKDIR /app
 COPY --from=build /app ./
 EXPOSE 22023/udp

diff --git a/src/Impostor.Server/Data/ServerRedirectorConfig.cs b/src/Impostor.Server/Data/ServerRedirectorConfig.cs
index fa458561db28a07a681d6636809f99502f61e1ef..3233167f887197a0797d48c274c5f58699fe5247 100644 (file)
--- a/src/Impostor.Server/Data/ServerRedirectorConfig.cs
+++ b/src/Impostor.Server/Data/ServerRedirectorConfig.cs
@@ -5,7 +5,7 @@ namespace Impostor.Server.Data
     public class ServerRedirectorConfig
     {
         public const string Section = "ServerRedirector";
-        
+
         public bool Enabled { get; set; }
         public bool Master { get; set; }
         public NodeLocator Locator { get; set; }

diff --git a/src/Impostor.Server/Impostor.Server.csproj b/src/Impostor.Server/Impostor.Server.csproj
index 20e46ed784beeffd280763842e1523ff74aed4f4..f4979f1691379d2c6511e124e2d46b26df0072b5 100644 (file)
--- a/src/Impostor.Server/Impostor.Server.csproj
+++ b/src/Impostor.Server/Impostor.Server.csproj
@@ -2,8 +2,10 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <PublishTrimmed>true</PublishTrimmed>
+        <TrimMode>Link</TrimMode>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
         <AssemblyTitle>Impostor.Server</AssemblyTitle>
         <Product>Impostor.Server</Product>
         <Copyright>Copyright © AeonLucid 2020</Copyright>
@@ -18,8 +20,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.8" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
+      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-rc.1.20451.7" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20451.14" />
       <PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
       <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     </ItemGroup>

diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs
index b852db6140f8c3b6d57876cbb510a72005dd88f0..dfd57754b34a512b700352f662c5ef74d303991e 100644 (file)
--- a/src/Impostor.Server/Program.cs
+++ b/src/Impostor.Server/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Impostor.Server.Data;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Manager;
@@ -57,7 +58,7 @@ namespace Impostor.Server
                 {
                     var redirector = host.Configuration
                         .GetSection(ServerRedirectorConfig.Section)
-                        .Get<ServerRedirectorConfig>();
+                        .Get<ServerRedirectorConfig>() ?? new ServerRedirectorConfig();
                     
                     services.Configure<ServerConfig>(host.Configuration.GetSection(ServerConfig.Section));
                     services.Configure<ServerRedirectorConfig>(host.Configuration.GetSection(ServerRedirectorConfig.Section));

diff --git a/src/Impostor.Shared/Impostor.Shared.csproj b/src/Impostor.Shared/Impostor.Shared.csproj
index efa3f8f01394da9a69da7e6e76738466fd7a2c1d..a15b966ec2c2da5fb34a11a63ce7a3a2495c6ce4 100644 (file)
--- a/src/Impostor.Shared/Impostor.Shared.csproj
+++ b/src/Impostor.Shared/Impostor.Shared.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net452;net5.0</TargetFrameworks>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Impostor.Tests/Impostor.Tests.csproj b/src/Impostor.Tests/Impostor.Tests.csproj
index 88929eb0f7b21eb7182ee2a091f6302ca23ca21b..bc5a7cc1a998fac19f60a12d5bdf688e5fbc46b5 100644 (file)
--- a/src/Impostor.Tests/Impostor.Tests.csproj
+++ b/src/Impostor.Tests/Impostor.Tests.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-
+        <TargetFramework>net5.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200921-01" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="coverlet.collector" Version="1.3.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/submodules/Hazel-Networking b/submodules/Hazel-Networking
index 7ba3d5bed5d2609d6db829228908ae8e81ee54ee..0c61aa426a2e47be9ac82c601c2f19b9345992a1 160000 (submodule)
--- a/submodules/Hazel-Networking
+++ b/submodules/Hazel-Networking
@@ -1 +1 @@
-Subproject commit 7ba3d5bed5d2609d6db829228908ae8e81ee54ee
+Subproject commit 0c61aa426a2e47be9ac82c601c2f19b9345992a1