From 72a7ba6f6fa40bf95d5d2b36acf0467a7f9b4ab7 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sun, 29 Dec 2024 14:53:55 -0800 Subject: [PATCH 1/3] Upgrade .NET version to 8.0 --- AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj | 2 +- AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj index cd19c4e..d542180 100644 --- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj @@ -2,7 +2,7 @@ WinExe - net6.0 + net8.0 icon64.ico LatestMajor latest diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj index 45831e6..d4deba1 100644 --- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj +++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj @@ -13,10 +13,4 @@ - - - ..\..\..\..\..\.cache\NuGet\system.componentmodel.annotations\5.0.0\ref\netstandard2.0\System.ComponentModel.Annotations.dll - - - From 89ca6f4b103e6317d97fd272d705111ed6dcfee9 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sun, 29 Dec 2024 17:08:22 -0800 Subject: [PATCH 2/3] Update MacOS GitHub workflow to use macos-latest --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e474f8..92cd904 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,13 +16,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] configuration: [Release] include: - os: ubuntu-latest COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained - ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net6.0/ubuntu.18.04-x64/publish/ - - os: macos-13 + ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net8.0/ubuntu.18.04-x64/publish/ + - os: macos-latest COMMAND: AM2RLauncher.Mac -o builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest - os: windows-latest @@ -40,9 +40,6 @@ jobs: - name: Install Mac workload working-directory: ./AM2RLauncher run: dotnet workload install macos && dotnet workload restore - - name: Switch XCode - run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app/Contents/Developer - if: matrix.os == 'macos-13' - name: Restore dependencies working-directory: ./AM2RLauncher run: dotnet restore From a9d1b7c269cf5ff419d5f3805091aa7c450a7d55 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Mon, 30 Dec 2024 17:14:04 -0800 Subject: [PATCH 3/3] Update runtime identifier for publishing on Linux --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92cd904..2ffe8df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: configuration: [Release] include: - os: ubuntu-latest - COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained + COMMAND: AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r linux-x64 --no-self-contained ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net8.0/ubuntu.18.04-x64/publish/ - os: macos-latest COMMAND: AM2RLauncher.Mac -o builds/macOS-latest