diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d7666aa..5224a23 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Run tests # 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 uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Publish (CLI) run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release diff --git a/Directory.Build.props b/Directory.Build.props index 0e4852c..ae0c896 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net6.0 + net7.0 2.36.4 Tyrrrz Copyright (c) Oleksii Holub diff --git a/DiscordChatExporter.Cli.dockerfile b/DiscordChatExporter.Cli.dockerfile index 2d06cee..cc7525c 100644 --- a/DiscordChatExporter.Cli.dockerfile +++ b/DiscordChatExporter.Cli.dockerfile @@ -1,5 +1,5 @@ # 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 NuGet.config ./ @@ -10,7 +10,7 @@ COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli RUN dotnet publish DiscordChatExporter.Cli --configuration Release --output ./publish # Run -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run +FROM mcr.microsoft.com/dotnet/runtime:7.0 AS run RUN useradd dce USER dce @@ -19,4 +19,4 @@ COPY --from=build ./publish ./ WORKDIR ./out -ENTRYPOINT ["dotnet", "../DiscordChatExporter.Cli.dll"] +ENTRYPOINT ["dotnet", "../DiscordChatExporter.Cli.dll"] \ No newline at end of file diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj index cbe81e1..f927a0d 100644 --- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj +++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj @@ -1,8 +1,8 @@  - $(TargetFramework)-windows WinExe + $(TargetFramework)-windows DiscordChatExporter true ../favicon.ico