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

Use net7.0

Browse source
This commit is contained in:
Tyrrrz 2022-12-08 01:44:26 +02:00
parent 90bf4975b9
commit db23971b08
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
- name: Install .NET - name: Install .NET
uses: actions/setup-dotnet@v2 uses: actions/setup-dotnet@v2
with: with:
dotnet-version: 6.0.x dotnet-version: 7.0.x
- name: Run tests - name: Run tests
# 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
@ -49,7 +49,7 @@ jobs:
- name: Install .NET - name: Install .NET
uses: actions/setup-dotnet@v2 uses: actions/setup-dotnet@v2
with: with:
dotnet-version: 6.0.x dotnet-version: 7.0.x
- name: Publish (CLI) - name: 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

2
Directory.Build.props
View file

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Version>2.36.4</Version> <Version>2.36.4</Version>
<Company>Tyrrrz</Company> <Company>Tyrrrz</Company>
<Copyright>Copyright (c) Oleksii Holub</Copyright> <Copyright>Copyright (c) Oleksii Holub</Copyright>

6
DiscordChatExporter.Cli.dockerfile
View file

@ -1,5 +1,5 @@
# Build # Build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
COPY favicon.ico ./ COPY favicon.ico ./
COPY NuGet.config ./ COPY NuGet.config ./
@ -10,7 +10,7 @@ COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
RUN dotnet publish DiscordChatExporter.Cli --configuration Release --output ./publish RUN dotnet publish DiscordChatExporter.Cli --configuration Release --output ./publish
# Run # Run
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run FROM mcr.microsoft.com/dotnet/runtime:7.0 AS run
RUN useradd dce RUN useradd dce
USER dce USER dce
@ -19,4 +19,4 @@ COPY --from=build ./publish ./
WORKDIR ./out WORKDIR ./out
ENTRYPOINT ["dotnet", "../DiscordChatExporter.Cli.dll"] ENTRYPOINT ["dotnet", "../DiscordChatExporter.Cli.dll"]

2
DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
View file

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<AssemblyName>DiscordChatExporter</AssemblyName> <AssemblyName>DiscordChatExporter</AssemblyName>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<ApplicationIcon>../favicon.ico</ApplicationIcon> <ApplicationIcon>../favicon.ico</ApplicationIcon>