AM2R-Community-Developers
/
AM2RLauncher
mirror of https://github.com/AM2R-Community-Developers/AM2RLauncher
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'AM2R-Community-Developers:main' into main

Browse Source
pull/78/head
atemporalDarkness 2 years ago committed by GitHub
parent 39a2dc4482 7857e17605
commit a74c52c490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File

20
.github/dependabot.yaml vendored
Unescape View File

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

19
.github/workflows/build-and-publish.yml vendored
Unescape View File

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

17
.github/workflows/build.yml vendored
Unescape View File

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

4
AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
Unescape View File

@ -2,9 +2,9 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-macos</TargetFramework>
<TargetFramework>net8.0-macos</TargetFramework>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
<RollForward>LatestMajor</RollForward>
<Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU</Platforms>

2
AM2RLauncher/AM2RLauncher.Mac/Info.plist
Unescape View File

@ -9,7 +9,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<string>10.15</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>NSHumanReadableCopyright</key>

2
AM2RLauncher/AM2RLauncherLib/Profile.cs
Unescape View File

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

15
README.md
Unescape View File

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

Write Preview
Loading…
Cancel
Save