[Go Live Apr 15] .NET 5.0 support (#3373)

* .NET 5.0 support Could it be this simple? Seems so * try removing global.json * Update Dockerfile * Update Dockerfile.arm64 * Update appveyor.yml Co-authored-by: Ty Conner <[email protected]>
ACEmulator · Apr 15, 2021 · b5a13b0 · b5a13b0
1 parent c28198f
commit b5a13b0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /Source
 
 # copy csproj and restore as distinct layers
@@ -20,7 +20,7 @@ COPY . ../.
 RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace --no-restore
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:3.1-buster-slim
+FROM mcr.microsoft.com/dotnet/runtime:5.0-buster-slim
 ARG DEBIAN_FRONTEND="noninteractive"
 WORKDIR /ace
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /Source
 
 # copy csproj and restore as distinct layers
@@ -20,7 +20,7 @@ COPY . ../.
 RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace -r linux-arm64 --self-contained false --no-restore
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:3.1-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:5.0-buster-slim-arm64v8
 ARG DEBIAN_FRONTEND="noninteractive"
 WORKDIR /ace
 

diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 

diff --git a/Source/global.json b/Source/global.json
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.24.{build}
+version: 1.25.{build}
 pull_requests:
   do_not_increment_build_number: true
 skip_tags: true