From db23971b087a7c3b3a63307a443f5a05a4be5d54 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:44:26 +0200
Subject: [PATCH] Use net7.0

---
 .github/workflows/main.yml                             | 4 ++--
 Directory.Build.props                                  | 2 +-
 DiscordChatExporter.Cli.dockerfile                     | 6 +++---
 DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d7666aa6..5224a23f 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 0e4852c7..ae0c896c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>2.36.4</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
diff --git a/DiscordChatExporter.Cli.dockerfile b/DiscordChatExporter.Cli.dockerfile
index 2d06cee0..cc7525c7 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 cbe81e11..f927a0d5 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <AssemblyName>DiscordChatExporter</AssemblyName>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>