diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml index b94cfc3..c8e2b27 100644 --- a/.github/workflows/create-draft-release.yml +++ b/.github/workflows/create-draft-release.yml @@ -26,9 +26,19 @@ jobs: - name: Checkout Repo uses: actions/checkout@v6 with: - repository: SRMM-Studio/YakuzaParless + repository: TheTrueColonel/YakuzaParless # Migrate to "SRMM-Studio/YakuzaParless" later path: external/parless submodules: recursive + + - name: Verify Submodules + working-directory: external/parless + run: git submodule status --recursive + + - name: Verify Submodule Contents + working-directory: external/parless + run: | + dir source\Utils + dir source\minhook - name: Install Premake 5 uses: abel0b/setup-premake@b80dc6f70e8ab159fb854bdadbeb1a53cfc28723 # v2.4 @@ -36,7 +46,9 @@ jobs: version: "5.0.0-beta2" - name: Setup MSVC - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + uses: TheMrMilchmann/setup-msvc-dev@79dac248aac9d0059f86eae9d8b5bfab4e95e97c # v4.0.0 + with: + arch: x64 - name: Generate VS Project working-directory: external/parless @@ -80,7 +92,7 @@ jobs: with: path: '${{ runner.temp }}/external' - - name: Download dinput and winmm + - name: Download version.dll run: | curl -L https://github.com/SRMM-Studio/srmm-distrib/raw/refs/heads/main/Native/version.dll -o $RUNNER_TEMP/external/version.dll @@ -97,7 +109,7 @@ jobs: - name: Create Draft Release id: create_release - uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20 + uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1.21 with: tag: "v${{ env.PR_TAG }}" name: ${{ env.PR_NAME }} diff --git a/README.md b/README.md index bcdaf0c..ecb42f0 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ Here will be listed the known differences and issues that the port brings. - Opening the CLI version with `Left-CTRL` doesn't work as there's no good way to detect this on all supported platforms. - Console output doesn't currently work on Windows. - MessageBoxes are different. This is strictly because Avalonia [doesn't have native support](https://docs.avaloniaui.net/docs/basics/user-interface/messagebox) yet, but it does look to be planned for the next major release. -- On Linux you must run in CLI mode, or press the "Save mod list" button for the `.mlo` to generate. This is because Parless only searches for the Windows `.exe`. # Credits Original project by [SutandoTsukai181](https://github.com/SutandoTsukai181). diff --git a/ShinRyuModManager-CE/Program.cs b/ShinRyuModManager-CE/Program.cs index a6d5035..6cd194a 100644 --- a/ShinRyuModManager-CE/Program.cs +++ b/ShinRyuModManager-CE/Program.cs @@ -71,10 +71,12 @@ private static void Main(string[] args) { .WriteTo.Async(a => a.File(new JsonFormatter(renderMessage: true), errorLogsPath, rollingInterval: RollingInterval.Day))) .CreateLogger(); - if (!OperatingSystem.IsWindows()) { - IsRebuildMloSupported = false; - } - +#if LINUX_SLIM + // Slim versions of Linux need to have .NET 10 installed to run and Proton/Wine makes that + // annoying to find to get this working. Temporarily disabled. + RebuildMlo = false; +#endif + HandleLoader(); // Check if there are any args, if so, run in CLI mode diff --git a/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj b/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj index 35165b8..81899c4 100644 --- a/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj +++ b/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj @@ -14,7 +14,7 @@ true - 1.4.12 + 1.5.0 $(AssemblyVersion) ShinRyuModManager-CE SRMM Studio @@ -33,6 +33,10 @@ embedded + + $(DefineConstants);LINUX_SLIM + + diff --git a/ShinRyuModManager-CE/UserInterface/Assets/changelog.md b/ShinRyuModManager-CE/UserInterface/Assets/changelog.md index f445c31..040c0f5 100644 --- a/ShinRyuModManager-CE/UserInterface/Assets/changelog.md +++ b/ShinRyuModManager-CE/UserInterface/Assets/changelog.md @@ -1,4 +1,10 @@ -> ### **%{color:gold} Version 1.4.12 %** ### +> ### **%{color:gold} Version 1.5.0 %** ### +* Partial RebuildMLO support for Linux users + * `linux` "non-slim" users only, until a workaround is found for `linux-slim` users + +--- + +> ### **%{color:orange} Version 1.4.12 %** ### * Fixed bug in Y0 mod upgrader method ---