diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 61e75911..6a58ac2d 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -17,15 +17,10 @@ jobs: id: get_version uses: dawidd6/action-get-tag@v1 - - name: Install .NET (v3.1) + - name: Install .NET uses: actions/setup-dotnet@v1.7.2 with: - dotnet-version: 3.1.x - - - name: Install .NET (v5.0) - uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Build & publish (CLI) run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b79a9738..edf75f56 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,15 +10,10 @@ jobs: - name: Checkout uses: actions/checkout@v2.3.3 - - name: Install .NET (v3.1) + - name: Install .NET uses: actions/setup-dotnet@v1.7.2 with: - dotnet-version: 3.1.x - - - name: Install .NET (v5.0) - uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Build & test # Tests need access to secrets, so we can't run them against PRs because of limited trust diff --git a/Directory.Build.props b/Directory.Build.props index 1b9eb6b1..3573b119 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 2.30.1 Tyrrrz Copyright (c) Alexey Golub diff --git a/Dockerfile b/Dockerfile index e2567ffd..9e1c8494 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY favicon.ico ./ @@ -11,7 +11,7 @@ COPY DiscordChatExporter.Cli DiscordChatExporter.Cli RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release # Run -FROM mcr.microsoft.com/dotnet/runtime:3.1 AS run +FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run WORKDIR /app COPY --from=build /src/DiscordChatExporter.Cli/publish ./ diff --git a/Readme.md b/Readme.md index c894a864..616d5af4 100644 --- a/Readme.md +++ b/Readme.md @@ -93,8 +93,7 @@ The following table lists all available download options: Prerequisites: -- [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) -- [.NET 3.1 SDK](https://dotnet.microsoft.com/download/dotnet/3.1) (temporarily as the app still targets .NET 3.1, but requires .NET 5.0 to build) +- [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) - _(Recommended)_ C#/.NET IDE, such as [JetBrains Rider](https://www.jetbrains.com/rider), [VS Code](https://code.visualstudio.com/docs/languages/csharp), or [Visual Studio](https://visualstudio.microsoft.com). To build the entire solution run the following command in the root of the repository: