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" diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 6e1b9c0..5f920cd 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -8,17 +8,17 @@ 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 + 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\ @@ -28,17 +28,20 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + 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: 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 }}" @@ -50,7 +53,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.3.3 with: name: ${{ matrix.os }} path: ${{ matrix.os }}.zip diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16671cc..4e474f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,25 +6,23 @@ on: branches: [ main ] paths-ignore: - 'README.md' - - '.github/**' pull_request: branches: [ main ] paths-ignore: - 'README.md' - - '.github/**' jobs: build: 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 @@ -34,14 +32,17 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + 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 + 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; 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.