Updating for .net 6

Author: d4nt

.circleci/config.yml

@@ -2,13 +2,13 @@ version: 2
 jobs:
   build:
     docker:
-      - image: mcr.microsoft.com/dotnet/core/sdk:3.1
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
     steps:
       - checkout
       - run: dotnet build ./Web/QueryTree.csproj -v n
   test:
     docker:
-      - image: mcr.microsoft.com/dotnet/core/sdk:3.1
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
     steps:
       - checkout
       - run: dotnet test ./Tests/Tests.csproj -v n

Dockerfile

@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as builder
 WORKDIR /build
 COPY . .
 RUN dotnet restore
 RUN dotnet publish --no-restore -c Release ./Web/QueryTree.csproj -o /dist
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 as runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
 WORKDIR /app
 COPY --from=builder /dist .
 COPY --from=builder /build/Web/EmailTemplates ./EmailTemplates

README.md

@@ -44,7 +44,7 @@ for more information.
 
 ### Prerequisites
 
-To build binaries or run from source you need the [.NET Core SDK v3.1](https://www.microsoft.com/net/download) installed.
+To build binaries or run from source you need the [.NET 6.0](https://www.microsoft.com/net/download) installed.
 
 ### Running from Source
 
@@ -83,7 +83,7 @@ This will create a release folder in `dist` of all the unpacked QueryTree binari
 
 ### Running from Binaries
 
-To run QueryTree on your server you will need to install the .NET Core 3.1.x runtime. (It is not necessary to install the full .NET SDK, just the runtime.) You can download the installer [here](https://www.microsoft.com/net/download/core#/runtime).
+To run QueryTree on your server you will need to install the ASP.NET Core Runtime 6.0.x. (It is not necessary to install the full .NET SDK, just the runtime.) You can download the installer [here](https://dotnet.microsoft.com/en-us/download/dotnet/6.0).
 
 To verify that you have the .NET runtime installed, open a terminal/cmd window and type
 

Tests/Tests.csproj

@@ -5,9 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

Web/QueryTree.csproj

@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
     <PackageReference Include="Npgsql" Version="6.0.7" />
     <PackageReference Include="MySql.Data" Version="8.0.31" />
-    <PackageReference Include="Hangfire" Version="1.7.31" />
+    <PackageReference Include="Hangfire" Version="1.7.32" />
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
     <PackageReference Include="MailKit" Version="2.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.11">

appveyor.yml

@@ -2,7 +2,7 @@ version: 3.0.{build}-beta
 branches:
   only:
   - master
-image: Visual Studio 2017
+image: Visual Studio 2019
 dotnet_csproj:
   patch: true
   file: 'Web\QueryTree.csproj'