From 5f8d003c1c308950829fe7a8fc57cf806cb22fb2 Mon Sep 17 00:00:00 2001
From: Archi <JustArchi@JustArchi.net>
Date: Sun, 4 Jul 2021 15:58:09 +0200
Subject: [PATCH] Bump non-source files to net6.0

---
 .github/appveyor.yml          | 4 ++--
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/publish.yml | 4 ++--
 Directory.Build.props         | 4 ++--
 Dockerfile                    | 6 +++---
 Dockerfile.Service            | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/appveyor.yml b/.github/appveyor.yml
index a4363495a..cd4c29afa 100644
--- a/.github/appveyor.yml
+++ b/.github/appveyor.yml
@@ -6,12 +6,12 @@ image: Visual Studio 2019
 configuration: Release
 clone_depth: 10
 environment:
-  DOTNET_CHANNEL: 5.0
+  DOTNET_CHANNEL: 6.0
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_INSTALL_DIR: C:\Program Files\dotnet
   DOTNET_NOLOGO: true
 #  DOTNET_SDK: 5.0.103
-  NET_CORE_VERSION: net5.0
+  NET_CORE_VERSION: net6.0
   NET_FRAMEWORK_VERSION: net48
   NODE_JS_VERSION: lts
   STEAM_TOKEN_DUMPER_NAME: ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8ccd044c..c7d13ce20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ env:
   CONFIGURATION: Release
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: 1
-  DOTNET_SDK_VERSION: 5.0.x
+  DOTNET_SDK_VERSION: 6.0.x
 
 jobs:
   main:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1030fe8da..9182898cb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -6,8 +6,8 @@ env:
   CONFIGURATION: Release
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: 1
-  DOTNET_SDK_VERSION: 5.0.x
-  NET_CORE_VERSION: net5.0
+  DOTNET_SDK_VERSION: 6.0.x
+  NET_CORE_VERSION: net6.0
   NET_FRAMEWORK_VERSION: net48
   NODE_JS_VERSION: 'lts/*'
   STEAM_TOKEN_DUMPER_NAME: ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
diff --git a/Directory.Build.props b/Directory.Build.props
index 15c0e007e..90133505c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -50,10 +50,10 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''">
-    <TargetFrameworks>net5.0;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' != 'Windows_NT' AND '$(ASFNetFramework)' == ''">
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/Dockerfile b/Dockerfile
index 3ae5e5b3d..d2c540d07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,14 +8,14 @@ RUN echo "node: $(node --version)" && \
     npm ci --no-progress && \
     npm run deploy --no-progress
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:5.0${IMAGESUFFIX} AS build-dotnet
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0${IMAGESUFFIX} AS build-dotnet
 ARG STEAM_TOKEN_DUMPER_TOKEN
 ARG TARGETARCH
 ARG TARGETOS
 ENV CONFIGURATION Release
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
 ENV DOTNET_NOLOGO 1
-ENV NET_CORE_VERSION net5.0
+ENV NET_CORE_VERSION net6.0
 ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
@@ -44,7 +44,7 @@ RUN dotnet --info && \
     if [ -d "ArchiSteamFarm/overlay/generic" ]; then cp -pR "ArchiSteamFarm/overlay/generic/"* "out/result"; fi && \
     if [ -d "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp -pR "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/"* "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:5.0${IMAGESUFFIX} AS runtime
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0${IMAGESUFFIX} AS runtime
 ENV ASPNETCORE_URLS=
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
 ENV DOTNET_NOLOGO 1
diff --git a/Dockerfile.Service b/Dockerfile.Service
index f59cf1315..c7f6d64b9 100644
--- a/Dockerfile.Service
+++ b/Dockerfile.Service
@@ -8,14 +8,14 @@ RUN echo "node: $(node --version)" && \
     npm ci --no-progress && \
     npm run deploy --no-progress
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:5.0${IMAGESUFFIX} AS build-dotnet
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0${IMAGESUFFIX} AS build-dotnet
 ARG STEAM_TOKEN_DUMPER_TOKEN
 ARG TARGETARCH
 ARG TARGETOS
 ENV CONFIGURATION Release
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
 ENV DOTNET_NOLOGO 1
-ENV NET_CORE_VERSION net5.0
+ENV NET_CORE_VERSION net6.0
 ENV STEAM_TOKEN_DUMPER_NAME ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
@@ -44,7 +44,7 @@ RUN dotnet --info && \
     if [ -d "ArchiSteamFarm/overlay/${asf_variant}" ]; then cp -pR "ArchiSteamFarm/overlay/${asf_variant}/"* "out/result"; fi && \
     if [ -d "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" ]; then mkdir -p "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; cp -pR "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}/"* "out/result/plugins/${STEAM_TOKEN_DUMPER_NAME}"; fi
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:5.0${IMAGESUFFIX} AS runtime
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:6.0${IMAGESUFFIX} AS runtime
 ENV ASPNETCORE_URLS=
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
 ENV DOTNET_NOLOGO 1