diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ffe8df..0cd6613 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: include: - os: ubuntu-latest 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/ + ARTIFACT: AM2RLauncher/AM2RLauncher.Gtk/bin/Release/net8.0/linux-x64/publish/ - os: macos-latest COMMAND: AM2RLauncher.Mac -o builds/macOS-latest ARTIFACT: AM2RLauncher/builds/macOS-latest diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj index d542180..84b2428 100644 --- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj @@ -19,7 +19,7 @@ - + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj index a6dae95..6de3789 100644 --- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj @@ -18,7 +18,7 @@ - + diff --git a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj index 0dd7893..ba140e4 100644 --- a/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj +++ b/AM2RLauncher/AM2RLauncher.Wpf/AM2RLauncher.Wpf.csproj @@ -36,7 +36,7 @@ - + diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj index a8babb4..2b2971a 100644 --- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj +++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj @@ -30,7 +30,7 @@ - + diff --git a/AM2RLauncher/buildAll.bat b/AM2RLauncher/buildAll.bat index eef7718..689bd07 100644 --- a/AM2RLauncher/buildAll.bat +++ b/AM2RLauncher/buildAll.bat @@ -4,6 +4,5 @@ dotnet publish AM2RLauncher.Wpf -c release -r win-x86 -o "builds\win86" ROBOCOPY "builds\win86" "builds\win86\lib\ " /XF *.exe *.config *.manifest /XD lib logs data /E /IS /MOVE move .\builds\win86\AM2RLauncher.Wpf.exe .\builds\win86\AM2RLauncher.exe move .\builds\win86\AM2RLauncher.Wpf.exe.config .\builds\win86\AM2RLauncher.exe.config -dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r ubuntu.18.04-x64 --no-self-contained -o "builds\linux64" -dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r ubuntu.18.04-x64 --self-contained -o "builds\linux64-selfContained" - +dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r linux-x64 --no-self-contained -o "builds\linux64" +dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r linux-x64 --self-contained -o "builds\linux64-selfContained" diff --git a/README.md b/README.md index 2fb37c9..95a87ee 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,7 @@ Open the solution with Visual Studio 2019. 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. +In order to build for linux, use `dotnet publish AM2RLauncher.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -c release -r linux-x64 --no-self-contained`, MonoDevelop sadly doesn't work. ### Arch Linux An `am2rlauncher-git` [AUR Package](https://aur.archlinux.org/packages/am2rlauncher-git/) also exists.