Comment AppImage builds

It randomly started erroring in GitHub actions with exit code 8 but only sometimes, and I don't have the patience to debug it. I don't even use linux lol

.github/workflows/canary.yml

@@ -106,45 +106,47 @@ jobs:
           gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
         shell: bash
         
-      - name: Build AppImage (Linux)
+        # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
       
-          sudo apt install -y zsync desktop-file-utils appstream
+#      - name: Build AppImage (Linux)
-
+#        if: matrix.platform.os == 'ubuntu-latest'
-          mkdir -p tools
+#        run: |
-          export PATH="$PATH:$(readlink -f tools)"
+#          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-
+#          PLATFORM_NAME="${{ matrix.platform.name }}"
-          # Setup appimagetool
+#
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+#          sudo apt install -y zsync desktop-file-utils appstream
-          chmod +x tools/appimagetool
+#
-          chmod +x distribution/linux/appimage/build-appimage.sh
+#          mkdir -p tools
-
+#          export PATH="$PATH:$(readlink -f tools)"
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+#
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+#          # Setup appimagetool
-            ARCH_NAME=x64
+#          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-            export ARCH=x86_64
+#          chmod +x tools/appimagetool
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+#          chmod +x distribution/linux/appimage/build-appimage.sh
-            ARCH_NAME=arm64
+#
-            export ARCH=aarch64
+#          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          else
+#          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+#            ARCH_NAME=x64
-            exit 1
+#            export ARCH=x86_64
-          fi
+#          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-
+#            ARCH_NAME=arm64
-          export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
+#            export ARCH=aarch64
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#          else
-
+#            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-          pushd publish_appimage
+#            exit 1
-          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          fi
-          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#
-          popd
+#          export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
-          
+#          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#          pushd publish_appimage
-        shell: bash
+#          mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#          popd
+#          
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#        shell: bash
 
   macos_release:
     name: Release MacOS universal

.github/workflows/release.yml

@@ -97,45 +97,47 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           
-      - name: Build AppImage (Linux)
+      # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
-        if: matrix.platform.os == 'ubuntu-latest'
-        run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          PLATFORM_NAME="${{ matrix.platform.name }}"
           
-          sudo apt install -y zsync desktop-file-utils appstream
+#      - name: Build AppImage (Linux)
-
+#        if: matrix.platform.os == 'ubuntu-latest'
-          mkdir -p tools
+#        run: |
-          export PATH="$PATH:$(readlink -f tools)"
+#          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-
+#          PLATFORM_NAME="${{ matrix.platform.name }}"
-          # Setup appimagetool
+#
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+#          sudo apt install -y zsync desktop-file-utils appstream
-          chmod +x tools/appimagetool
+#
-          chmod +x distribution/linux/appimage/build-appimage.sh
+#          mkdir -p tools
-
+#          export PATH="$PATH:$(readlink -f tools)"
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+#
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+#          # Setup appimagetool
-            ARCH_NAME=x64
+#          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-            export ARCH=x86_64
+#          chmod +x tools/appimagetool
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+#          chmod +x distribution/linux/appimage/build-appimage.sh
-            ARCH_NAME=arm64
+#
-            export ARCH=aarch64
+#          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          else
+#          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+#            ARCH_NAME=x64
-            exit 1
+#            export ARCH=x86_64
-          fi
+#          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-
+#            ARCH_NAME=arm64
-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
+#            export ARCH=aarch64
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
+#          else
-
+#            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-          pushd publish_appimage
+#            exit 1
-          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          fi
-          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#
-          popd
+#          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
-          
+#          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#
-          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#          pushd publish_appimage
-        shell: bash
+#          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+#          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
+#          popd
+#          
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
+#          gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
+#        shell: bash
 
   macos_release:
     name: Release MacOS universal

Directory.Packages.props

@@ -40,7 +40,7 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.116" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />

docs/compatibility.csv

@@ -2257,6 +2257,7 @@
 010086F0064CE000,"Poi: Explorer Edition",nvdec,playable,2021-01-21 19:32:00
 0100EB6012FD2000,"Poison Control",,playable,2021-05-16 14:01:54
 010072400E04A000,"Pokémon Café ReMix",,playable,2021-08-17 20:00:04
+010008c01e742000,"Pokémon Friends",crash;services,menus,2025-07-24 13:32:00
 01003D200BAA2000,"Pokémon Mystery Dungeon™: Rescue Team DX",mac-bug,playable,2024-01-21 00:16:32
 01008DB008C2C000,"Pokémon Shield + Pokémon Shield Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-12 07:20:22
 0100ABF008968000,"Pokémon Sword + Pokémon Sword Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-26 15:40:37

nuget.config

@@ -5,7 +5,7 @@
         <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
         <!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
-        <!--<add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />-->
+        <add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />
         <add key="Ryujinx.UpdateClient" value="https://git.ryujinx.app/api/v4/projects/71/packages/nuget/index.json" />
     </packageSources>
     <packageSourceMapping>
@@ -18,8 +18,8 @@
             <package pattern="Ryujinx.UpdateClient" />
             <package pattern="Ryujinx.Systems.Update.Common" />
         </packageSource>
-        <!--<packageSource key="LibHacAlpha">
+        <packageSource key="LibHacAlpha">
             <package pattern="Ryujinx.LibHac" />
-        </packageSource>-->
+        </packageSource>
     </packageSourceMapping>
 </configuration>

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -33,7 +33,7 @@ namespace Ryujinx.BuildValidationTasks
             LocalesJson json;
 
             if (isGitRunner && data.Contains("\r\n"))
-                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, build locally to fix...");
+                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, rebuild locally to fix...");
 
             try
             {
@@ -86,7 +86,7 @@ namespace Ryujinx.BuildValidationTasks
             }
 
             if (isGitRunner && encounteredIssue)
-                throw new JsonException("1 or more locales are invalid!");
+                throw new JsonException("1 or more locales are invalid! Rebuild locally to fix...");
 
             string jsonString = JsonSerializer.Serialize(json, _jsonOptions);
 
@@ -102,6 +102,7 @@ namespace Ryujinx.BuildValidationTasks
 
         struct LocalesJson
         {
+            public Dictionary<string, string> Info { get; set; }
             public List<string> Languages { get; set; }
             public List<LocalesEntry> Locales { get; set; }
         }

src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj

@@ -11,7 +11,17 @@
       Command="dotnet Ryujinx.BuildValidationTasks.dll "$(ProjectDir)..\..\\"" 
       ConsoleToMsBuild="true"
       Condition="'$(RuntimeIdentifier)' == ''" 
-      />
+      IgnoreExitCode="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+      <Output TaskParameter="ExitCode" PropertyName="BuildExitCode"/>
+    </Exec>
+
+    <PropertyGroup Condition=" '$(OutputOfExec.IndexOf(Unhandled exception))' != '-1'">
+      <ErrorOutput>$(OutputOfExec.Substring($(OutputOfExec.IndexOf("Unhandled exception"))))</ErrorOutput>
+      <ErrorOutput>$(ErrorOutput.Substring(0, $(ErrorOutput.IndexOf(';'))))</ErrorOutput>
+    </PropertyGroup>
+
+    <Error Text="$(ErrorOutput)" Condition=" '$(BuildExitCode)' != '0'"/>
   </Target>
 
 </Project>

src/Ryujinx.Common/TitleIDs.cs

@@ -93,6 +93,7 @@ namespace Ryujinx.Common
                           //The Pokémon Franchise
             "0100f4300bf2c000", // New Pokémon Snap
             "0100000011d90000", // Pokémon Brilliant Diamond
+            "010008c01e742000", // Pokémon Friends
             "01001f5010dfa000", // Pokémon Legends: Arceus
             "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
             "0100a3d008c5c000", // Pokémon Scarlet