Code cleanup and update to .NET 8

This commit is contained in:
Henry Asbridge 2024-01-17 00:59:56 +00:00
parent 7b88e27843
commit d0a0c28605
8 changed files with 13 additions and 14 deletions

View file

@ -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 }}

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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);

View file

@ -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>

View file

@ -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>