mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2024-09-19 12:18:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to .NET 6

Browse source 
Closes #521
This commit is contained in:
Tyrrrz 2021-11-08 22:44:38 +02:00
parent 092f0cade9
commit f456297881
5 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/CD.yml vendored
View file

@ -17,15 +17,10 @@ jobs:
id: get_version id: get_version
uses: dawidd6/action-get-tag@v1 uses: dawidd6/action-get-tag@v1
- name: Install .NET (v3.1) - name: Install .NET
uses: actions/setup-dotnet@v1.7.2 uses: actions/setup-dotnet@v1.7.2
with: with:
dotnet-version: 3.1.x dotnet-version: 6.0.x
- name: Install .NET (v5.0)
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: 5.0.x
- name: Build & publish (CLI) - name: Build & publish (CLI)
run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release

9
.github/workflows/CI.yml vendored
View file

@ -10,15 +10,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2.3.3 uses: actions/checkout@v2.3.3
- name: Install .NET (v3.1) - name: Install .NET
uses: actions/setup-dotnet@v1.7.2 uses: actions/setup-dotnet@v1.7.2
with: with:
dotnet-version: 3.1.x dotnet-version: 6.0.x
- name: Install .NET (v5.0)
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: 5.0.x
- name: Build & test - name: Build & test
# Tests need access to secrets, so we can't run them against PRs because of limited trust # Tests need access to secrets, so we can't run them against PRs because of limited trust

2
Directory.Build.props
View file

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>2.30.1</Version> <Version>2.30.1</Version>
<Company>Tyrrrz</Company> <Company>Tyrrrz</Company>
<Copyright>Copyright (c) Alexey Golub</Copyright> <Copyright>Copyright (c) Alexey Golub</Copyright>

4
Dockerfile
View file

@ -1,5 +1,5 @@
# Build # Build
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src WORKDIR /src
COPY favicon.ico ./ COPY favicon.ico ./
@ -11,7 +11,7 @@ COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release
# Run # Run
FROM mcr.microsoft.com/dotnet/runtime:3.1 AS run FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
WORKDIR /app WORKDIR /app
COPY --from=build /src/DiscordChatExporter.Cli/publish ./ COPY --from=build /src/DiscordChatExporter.Cli/publish ./

3
Readme.md
View file

@ -93,8 +93,7 @@ The following table lists all available download options:
Prerequisites: Prerequisites:
- [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) - [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.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)
- _(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). - _(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: To build the entire solution run the following command in the root of the repository: