From d3e13a1e5115a7786669af399f3daea8deab7b0c Mon Sep 17 00:00:00 2001 From: atemporalDarkness <79446410+atemporalDarkness@users.noreply.github.com> Date: Wed, 25 Oct 2023 18:11:00 +0200 Subject: [PATCH 01/16] Update Text.es.resx (#55) Slightly edited the line so it fits the button entirely --- AM2RLauncher/AM2RLauncher/Language/Text.es.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AM2RLauncher/AM2RLauncher/Language/Text.es.resx b/AM2RLauncher/AM2RLauncher/Language/Text.es.resx index f6bbc55..eda43a6 100644 --- a/AM2RLauncher/AM2RLauncher/Language/Text.es.resx +++ b/AM2RLauncher/AM2RLauncher/Language/Text.es.resx @@ -387,7 +387,7 @@ Procede con cautela. El Espacio Oficial de Matrix para AM2R - CREAR ACCESO DIRECTO EN EL ESCRITORIO + CREAR ACCESO DIRECTO EN ESCRITORIO ¡Ejecutar las Actualizaciones de la Comunidad desde el acceso directo ignorará el Launcher evitando actualizaciones automáticas! @@ -413,4 +413,4 @@ Procede con cautela. ¡Si hay varias copias de AM2R funcionando simultáneamente pueden corromperse los datos de partidas guardadas! El "Launcher" evita estas situaciones, pero utilizar accesos directos desde el escritorio puede hacer que se den estos casos. - \ No newline at end of file + From ed00e97c93e0dba40fe0a478951bd1238e5c3d37 Mon Sep 17 00:00:00 2001 From: Miepee Date: Mon, 1 Jan 2024 22:34:20 +0100 Subject: [PATCH 02/16] Use dependabot --- .github/dependabot.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..2d1a6b3 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,20 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "nuget" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" + labels: + - "dependencies" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + labels: + - "dependencies" From b251fd99ddfa423f7b4b717cf8ca2ae1e0e91d3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 22:36:09 +0100 Subject: [PATCH 03/16] Bump actions/checkout from 2 to 4 (#64) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 6e1b9c0..be1f01b 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -28,7 +28,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16671cc..270a81d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v1 with: From 618c33655ef85bc6132bd655ace191c8e125f3d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 22:54:05 +0100 Subject: [PATCH 04/16] Bump actions/upload-artifact from 1.0.0 to 4.0.0 (#63) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1.0.0 to 4.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v1.0.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index be1f01b..3b8fd9b 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -50,7 +50,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v4.0.0 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip From 87f7217392f4c9edd3c15b26b9bdc24a325b860a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:50:31 +0100 Subject: [PATCH 05/16] Bump actions/setup-dotnet from 1 to 4 (#62) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 1 to 4. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v1...v4) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 3b8fd9b..ddc8170 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: 6.0.x - name: Install Mac workload diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 270a81d..f71576f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: 6.0.x - name: Install Mac workload From 014e1b2dcc553882e8a5d36e9885428f418134bd Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:52:26 +0100 Subject: [PATCH 06/16] Update build-and-publish.yml --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index ddc8170..d054c4a 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -35,7 +35,7 @@ jobs: dotnet-version: 6.0.x - name: Install Mac workload working-directory: ./AM2RLauncher - run: dotnet workload install macos + run: dotnet workload install macos && dotnet workload restore - name: Restore dependencies working-directory: ./AM2RLauncher run: dotnet restore From b1d388fdbffb7fa2e79d1cc94f061c44c8b61df6 Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:57:20 +0100 Subject: [PATCH 07/16] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f71576f..16501cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,12 +6,10 @@ on: branches: [ main ] paths-ignore: - 'README.md' - - '.github/**' pull_request: branches: [ main ] paths-ignore: - 'README.md' - - '.github/**' jobs: build: From 274d38fab7a6cad1ef97eec455bcf25d886c69ab Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:09:58 +0100 Subject: [PATCH 08/16] try fix macos (#65) --- .github/workflows/build-and-publish.yml | 9 ++++++--- .github/workflows/build.yml | 11 +++++++---- AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj | 6 +++--- AM2RLauncher/AM2RLauncher.Mac/Info.plist | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index d054c4a..ec8fe2f 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -8,14 +8,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macos-13, 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 -o builds/ubuntu-latest ARTIFACT: AM2RLauncher/builds/ubuntu-latest POSTBUILD: echo "No post build to do!" - - os: macOS-latest + - os: macos-13 COMMAND: AM2RLauncher.Mac -o builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest POSTBUILD: rm -r AM2RLauncher/builds/macOS-latest/* && mv AM2RLauncher/AM2RLauncher.Mac/bin/Release/net6.0-macos/AM2RLauncher.Mac.app AM2RLauncher/builds/macOS-latest/AM2RLauncher.Mac.app @@ -32,13 +32,16 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.x.x - name: Install Mac workload working-directory: ./AM2RLauncher run: dotnet workload install macos && dotnet workload restore - name: Restore dependencies working-directory: ./AM2RLauncher run: dotnet restore + - name: Switch XCode + run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app/Contents/Developer + if: matrix.os == 'macos-13' - name: Build working-directory: ./AM2RLauncher run: dotnet publish ${{ matrix.COMMAND }} -c "${{ matrix.configuration }}" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16501cb..4e474f8 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-latest, windows-latest] + os: [ubuntu-latest, macos-13, 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-latest + - os: macos-13 COMMAND: AM2RLauncher.Mac -o builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest - os: windows-latest @@ -36,10 +36,13 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.x.x - name: Install Mac workload working-directory: ./AM2RLauncher - run: dotnet workload install macos + 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 diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj index 5c90b51..a6dae95 100644 --- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj @@ -2,9 +2,9 @@ Exe - net6.0-macos + net8.0-macos osx-x64;osx-arm64 - 10.14 + 10.15 LatestMajor Debug;Release AnyCPU @@ -43,4 +43,4 @@ - \ No newline at end of file + diff --git a/AM2RLauncher/AM2RLauncher.Mac/Info.plist b/AM2RLauncher/AM2RLauncher.Mac/Info.plist index 715d57c..3d07d4d 100644 --- a/AM2RLauncher/AM2RLauncher.Mac/Info.plist +++ b/AM2RLauncher/AM2RLauncher.Mac/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright @@ -17,4 +17,4 @@ CFBundleIconFile Icon.icns - \ No newline at end of file + From 755ff345872eeebc31c96faed9b99d3c6f1931f8 Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:13:28 +0100 Subject: [PATCH 09/16] Update build-and-publish.yml --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index ec8fe2f..2185ea1 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -18,7 +18,7 @@ jobs: - os: macos-13 COMMAND: AM2RLauncher.Mac -o builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest - POSTBUILD: rm -r AM2RLauncher/builds/macOS-latest/* && mv AM2RLauncher/AM2RLauncher.Mac/bin/Release/net6.0-macos/AM2RLauncher.Mac.app AM2RLauncher/builds/macOS-latest/AM2RLauncher.Mac.app + POSTBUILD: rm -r AM2RLauncher/builds/macOS-latest/* && mv AM2RLauncher/AM2RLauncher.Mac/bin/Release/net8.0-macos/AM2RLauncher.Mac.app AM2RLauncher/builds/macOS-latest/AM2RLauncher.Mac.app - os: windows-latest COMMAND: AM2RLauncher.Wpf -r win-x86 ARTIFACT: AM2RLauncher\AM2RLauncher.Wpf\bin\Release\net48\win-x86\ From d2cde48edb062fe6c785f02ebd28746dc23351dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 12:15:14 +0100 Subject: [PATCH 10/16] Bump actions/upload-artifact from 4.0.0 to 4.1.0 (#66) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 2185ea1..bfd7d26 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v4.0.0 + uses: actions/upload-artifact@v4.1.0 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip From cbb1d997800851d9c1eec8370268c63c95e23fe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:06:02 +0100 Subject: [PATCH 11/16] Bump actions/upload-artifact from 4.1.0 to 4.2.0 (#67) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index bfd7d26..9a16923 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v4.1.0 + uses: actions/upload-artifact@v4.2.0 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip From 653cd74badd465db56ae12d58e79eb831387e246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:46:56 +0100 Subject: [PATCH 12/16] Bump actions/upload-artifact from 4.2.0 to 4.3.1 (#69) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.2.0...v4.3.1) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 9a16923..0bb2519 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v4.2.0 + uses: actions/upload-artifact@v4.3.1 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip From 5fb2a6f033a0629b7ff54aef86fb82e8e13c6f01 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Thu, 7 Mar 2024 15:48:09 -0800 Subject: [PATCH 13/16] Update README.md (#71) Add instructions for running on NixOS --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ff9472..2fb37c9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,13 @@ Downloads can be found at the [Release Page](https://github.com/AM2R-Community-D For all Linux users, a [Flatpak](https://flathub.org/apps/details/io.github.am2r_community_developers.AM2RLauncher) is available and can be installed with all above dependencies bundled. This method is the recommended way for Steam Deck users. -Alternatively, for Arch Linux users an [AUR Package](https://aur.archlinux.org/packages/am2rlauncher/) also exists. Install it with `makepkg -si` or use your favourite AUR helper. +### Arch Linux + +For Arch Linux users an [AUR Package](https://aur.archlinux.org/packages/am2rlauncher/) also exists. Install it with `makepkg -si` or use your favourite AUR helper. + +### NixOS + +The launcher has also been packaged for NixOS. It can be run with `nix run nixpkgs#am2rlauncher`. ## Dependencies Windows needs the [.NET Framework 4.8 runtime](https://dotnet.microsoft.com/download/dotnet-framework/net48) installed. @@ -70,7 +76,12 @@ Alternatively, build via `dotnet build` / the `buildAll` batch file. ## Linux Instructions In order to build for linux, use `dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r ubuntu.18.04-x64 --no-self-contained`, MonoDevelop sadly doesn't work. You *have* to specify it to build for Ubuntu, even on non-Ubuntu distros, because one of our Dependencies, libgit2sharp fails on the `linux-x64` RID. -For Arch Linux users, an `am2rlauncher-git` [AUR Package](https://aur.archlinux.org/packages/am2rlauncher-git/) also exists. + +### Arch Linux +An `am2rlauncher-git` [AUR Package](https://aur.archlinux.org/packages/am2rlauncher-git/) also exists. + +### NixOS +On NixOS, the `am2rlauncher` package can be used for installation. ## Mac Instructions You can open the solution with Visual Studio for Mac, but it likely will crash after compliation. Use `dotnet publish AM2RLauncher.Mac -c release` instead. From c75045f7768a840da668e4341e017f569c32021a Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Thu, 7 Mar 2024 15:49:01 -0800 Subject: [PATCH 14/16] Clear `X509_free` symbol version info from `.runner-unwrapped` (#59) This change allows the 64-bit 1.6 beta to launch by clearing the `OPENSSL_1.0.0` version requirement on linked OpenSSL functions. --- AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs | 2 +- AM2RLauncher/AM2RLauncherLib/Profile.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs index b375231..a769c8c 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs @@ -712,4 +712,4 @@ public partial class MainForm : Form private readonly ProgressBar progressBar; #endregion -} \ No newline at end of file +} diff --git a/AM2RLauncher/AM2RLauncherLib/Profile.cs b/AM2RLauncher/AM2RLauncherLib/Profile.cs index e0e0643..fc116d8 100644 --- a/AM2RLauncher/AM2RLauncherLib/Profile.cs +++ b/AM2RLauncher/AM2RLauncherLib/Profile.cs @@ -490,7 +490,7 @@ public static class Profile UseShellExecute = false, WorkingDirectory = tempPath, FileName = "patchelf", - Arguments = $"\"{tempPath}/{exe}\" --replace-needed \"libcrypto.so.1.0.0\" \"libcurl.so\" --replace-needed \"libssl.so.1.0.0\" \"libcurl.so\"" + Arguments = $"\"{tempPath}/{exe}\" --replace-needed \"libcrypto.so.1.0.0\" \"libcurl.so\" --replace-needed \"libssl.so.1.0.0\" \"libcurl.so\" --clear-symbol-version X509_free" }; patchLibcryptoProcess.StartInfo = patchLibcryptoStartInfo; From 804102d05267a35fb9d249d293915fee0e8243f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:34:58 +0200 Subject: [PATCH 15/16] Bump actions/upload-artifact from 4.3.1 to 4.3.2 (#75) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.1...v4.3.2) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 0bb2519..f34bfc7 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.3.2 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip From 7857e176058302a39e689c7694c24d5f67672a82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 03:08:14 +0200 Subject: [PATCH 16/16] Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#76) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.2...v4.3.3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index f34bfc7..5f920cd 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Zip to Archive run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }} - name: Upload Artifacts - uses: actions/upload-artifact@v4.3.2 + uses: actions/upload-artifact@v4.3.3 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip