From d0a0c28605adb3b65d79f79c9a29f1e90b47a7a4 Mon Sep 17 00:00:00 2001
From: Henry Asbridge <henry@vorax.org>
Date: Wed, 17 Jan 2024 00:59:56 +0000
Subject: [PATCH] Code cleanup and update to .NET 8

---
 .github/workflows/build.yml                              | 8 ++++----
 UnionPatcher.Cli/UnionPatcher.Cli.csproj                 | 2 +-
 UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj     | 2 +-
 UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj     | 2 +-
 UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj | 2 +-
 UnionPatcher.Gui/Gui.cs                                  | 5 ++---
 UnionPatcher.Gui/UnionPatcher.Gui.csproj                 | 4 ++--
 UnionPatcher/UnionPatcher.csproj                         | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0aa0fe4..8cec7e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,17 +14,17 @@ jobs:
       fail-fast: false
       matrix: 
         os:
-          - { prettyName: Windows, platform: windows-latest, configurationName: Windows, extraArgs: "", buildPath: "Release/net6.0-windows/publish"}
-          - { prettyName: Linux, platform: ubuntu-latest, configurationName: Linux, extraArgs: "", buildPath: "Release/net6.0/publish"}
+          - { prettyName: Windows, platform: windows-latest, configurationName: Windows, extraArgs: "", buildPath: "Release/net8.0-windows/publish"}
+          - { prettyName: Linux, platform: ubuntu-latest, configurationName: Linux, extraArgs: "", buildPath: "Release/net8.0/publish"}
 #          - { prettyName: MacOS, platform: ubuntu-latest, configurationName: Release, platform: osx-x64 }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install .NET 6.0
+      - name: Install .NET 8.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
           
       - name: Compile for ${{ matrix.os.prettyName }}
         run: dotnet publish -c ${{ matrix.os.configurationName }} ${{ matrix.os.extraArgs }}
diff --git a/UnionPatcher.Cli/UnionPatcher.Cli.csproj b/UnionPatcher.Cli/UnionPatcher.Cli.csproj
index a4adeee..5c6e24d 100644
--- a/UnionPatcher.Cli/UnionPatcher.Cli.csproj
+++ b/UnionPatcher.Cli/UnionPatcher.Cli.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>UnionPatcher</AssemblyName>
diff --git a/UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj b/UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj
index f9f7aa8..74f3bd8 100644
--- a/UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj
+++ b/UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.Linux</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.Linux</RootNamespace>
diff --git a/UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj b/UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj
index 62fb7a3..ca56ad9 100644
--- a/UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj
+++ b/UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.MacOS</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.MacOS</RootNamespace>
diff --git a/UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj b/UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj
index f754306..8c18143 100644
--- a/UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj
+++ b/UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
         <RootNamespace>LBPUnion.UnionPatcher.Gui.Windows</RootNamespace>
         <AssemblyName>LBPUnion.UnionPatcher.Gui.Windows</AssemblyName>
         <ApplicationIcon>Icon64.ico</ApplicationIcon>
diff --git a/UnionPatcher.Gui/Gui.cs b/UnionPatcher.Gui/Gui.cs
index 808094f..fec6065 100644
--- a/UnionPatcher.Gui/Gui.cs
+++ b/UnionPatcher.Gui/Gui.cs
@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
+using Eto.Forms;
 using LBPUnion.UnionPatcher.Gui.Forms;
 
 namespace LBPUnion.UnionPatcher.Gui; 
@@ -10,7 +9,7 @@ public static class Gui {
     }
 
     public static void CreateOkDialog(string title, string errorMessage) {
-        MessageBox.Show(errorMessage, title, MessageBoxButtons.OK, MessageBoxType.Information);
+        MessageBox.Show(errorMessage, title, MessageBoxButtons.OK);
     }
     public static bool CreateConfirmationDialog(string title, string errorMessage) {
         DialogResult result = MessageBox.Show(errorMessage, title, MessageBoxButtons.YesNo, MessageBoxType.Question);
diff --git a/UnionPatcher.Gui/UnionPatcher.Gui.csproj b/UnionPatcher.Gui/UnionPatcher.Gui.csproj
index 1400570..7915919 100644
--- a/UnionPatcher.Gui/UnionPatcher.Gui.csproj
+++ b/UnionPatcher.Gui/UnionPatcher.Gui.csproj
@@ -7,11 +7,11 @@
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/UnionPatcher/UnionPatcher.csproj b/UnionPatcher/UnionPatcher.csproj
index 00942c0..b55e086 100644
--- a/UnionPatcher/UnionPatcher.csproj
+++ b/UnionPatcher/UnionPatcher.csproj
@@ -3,7 +3,7 @@
         <AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
         <RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
         <Configurations>Debug;Release;Windows</Configurations>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Platforms>AnyCPU</Platforms>
         <ApplicationIcon>Icon64.ico</ApplicationIcon>
     </PropertyGroup>