From 1567a74a44c40ab41b56a27f03eb866f6afbd715 Mon Sep 17 00:00:00 2001 From: spiral Date: Fri, 26 Nov 2021 22:24:24 -0500 Subject: [PATCH] fix: update GH workflows and Docker image to .NET 6 --- .github/workflows/dotnetcore.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 461c1c59..89f4775c 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Build with dotnet run: dotnet build --configuration Release test: @@ -24,6 +24,6 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Run automated tests run: dotnet test --configuration Release diff --git a/Dockerfile b/Dockerfile index 370b823b..c1ace2e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /app # Restore/fetch dependencies excluding app code to make use of caching @@ -17,7 +17,7 @@ COPY . /app RUN dotnet build -c Release -o bin # Build runtime stage (doesn't include SDK) -FROM mcr.microsoft.com/dotnet/aspnet:5.0 +FROM mcr.microsoft.com/dotnet/aspnet:6.0 LABEL org.opencontainers.image.source = "https://github.com/xSke/PluralKit" WORKDIR /app