Merge branch 'master' into 20-empty-nca-lockup

- fixed a typo i found
- awaiting dialog on invalid unpacked error
-

.forgejo/issue_template/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Ryubing Issue Tracker
-    url: https://github.com/Ryubing/Issues/issues/
-    about: "Please use this GitHub repository instead of creating issues on this Forgejo repository. Blank issues should only be used by maintainers and authorized bots. Issues made on this repository can and will be deleted."

.forgejo/renovate.json

@@ -1,35 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "renovate/config"
-  ],
-  "enabledManagers": ["nuget", "github-actions"],
-  "packageRules": [
-    {
-      // require approval for *all* NuGet package updates, not just major versions.
-      "matchDepTypes": "nuget",
-      "dependencyDashboardApproval": true
-    },
-    {
-      // Ignore Gommon for automatic updates. I make breaking changes on minor updates not infrequently.
-      "matchDepNames": "Gommon",
-      "matchDepTypes": "nuget",
-      "enabled": false
-    },
-    {
-      "description": "group Silk.NET packages",
-      "extends": ["renovate/config//groups/silkdotnet.json"],
-      "groupName": "Silk.NET"
-    },
-    {
-      "description": "group OpenTK packages",
-      "extends": ["renovate/config//groups/opentk.json"],
-      "groupName": "OpenTK"
-    },
-    {
-      "description": "group Svg.Controls packages",
-      "extends": ["renovate/config//groups/svgcontrols.json"],
-      "groupName": "Svg.Controls"
-    }
-  ]
-}

.forgejo/workflows/build.yml

@@ -1,176 +0,0 @@
-name: Build PR
-
-on:
-  pull_request:
-    branches: [ master ]
-    paths:
-      - '**'
-      - '!.forgejo/**'
-      - '!*.yml'
-      - '!*.config'
-      - '!*.md'
-      - '.forgejo/workflows/*.yml'
-
-env:
-  POWERSHELL_TELEMETRY_OPTOUT: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RELEASE: 0
-
-jobs:
-  build:
-    name: ${{ matrix.platform.name }} (${{ matrix.configuration }})
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
-    timeout-minutes: 45
-    strategy:
-      matrix:
-        configuration: [Release]
-        platform:
-          - { name: win-x64,     zip_os_name: win_x64     }
-          #- { name: win-arm64,   zip_os_name: win_arm64   }
-          - { name: linux-x64,   zip_os_name: linux_x64   }
-          - { name: linux-arm64, zip_os_name: linux_arm64 }
-          #- { name: osx-x64,     zip_os_name: osx_x64     }
-
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Overwrite csc problem matcher
-        run: echo "::add-matcher::.forgejo/csc.json"
-
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "result=$(gli get-next-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
-        shell: bash
-
-      - name: Change config filename
-        run: sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/PRConfig\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-        shell: bash
-        if: forgejo.event_name == 'pull_request'
-
-      - name: 'Cache: ~/.nuget/packages'
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.nuget/packages
-          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
-
-      - name: Build
-        run: dotnet build -c "${{ matrix.configuration }}" -p:Version="${{ steps.version_info.outputs.result }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:ExtraDefineConstants=DISABLE_UPDATER
-
-      - name: Test
-        uses: actions/unstable-commands@v1
-        with:
-          commands: dotnet test --no-build -c "${{ matrix.configuration }}"
-          timeout-minutes: 10
-          retry-codes: 139
-        if: matrix.platform.name != 'linux-arm64'
-
-      - name: Publish Ryujinx
-        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.result }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
-        if: forgejo.event_name == 'pull_request'
-
-      - name: Packing Windows builds
-        if: contains(matrix.platform.name, 'win')
-        run: |
-          7z a artifact/ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}.7z publish
-        shell: bash
-
-      - name: Upload Ryujinx Windows artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}
-          path: artifact
-        if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'win')
-
-      - name: Build AppImage
-        if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'linux')
-        run: |
-          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
-
-          PLATFORM_NAME="${{ matrix.platform.name }}"
-
-          chmod +x distribution/linux/appimage/build-appimage.sh
-
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
-          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            ARCH_NAME=x64
-            export ARCH=x86_64
-          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-            ARCH_NAME=arm64
-            export ARCH=aarch64
-          else
-            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
-            exit 1
-          fi
-
-          BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
-        shell: bash
-
-      - name: Upload Ryujinx AppImage artifact
-        uses: actions/upload-artifact@v5
-        if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'linux')
-        with:
-          name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}-AppImage
-          path: publish_appimage
-
-  build_macos:
-    name: macOS Universal (${{ matrix.configuration }})
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
-    timeout-minutes: 45
-    strategy:
-      matrix:
-        configuration: [ Release ]
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Setup LLVM 17
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 17
-
-      - name: Install rcodesign
-        run: |
-          gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz
-          tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
-          rm apple-codesign.tar.gz
-          sudo mv rcodesign /usr/bin/rcodesign
-
-      - name: Get version info
-        id: version_info
-        run: |
-          echo "result=$(gli get-next-version -c Stable -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
-        shell: bash
-
-      - name: Change config filename
-        run: sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/PRConfig\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-        shell: bash
-        if: forgejo.event_name == 'pull_request'
-
-      - name: 'Cache: ~/.nuget/packages'
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.nuget/packages
-          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
-
-      - name: Publish macOS Ryujinx
-        run: |
-          bash distribution/macos/create_macos_pr_build_ava.sh . publish_tmp publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.result }}" "${{ steps.version_info.outputs.git_short_hash }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"
-        shell: bash
-
-      - name: Upload Ryujinx artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-macos_universal
-          path: "publish/*.tar.gz"
-        if: forgejo.event_name == 'pull_request'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,86 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]"
+labels: bug
+body:
+  - type: textarea
+    id: issue
+    attributes:
+      label: Description of the issue
+      description: What's the issue you encountered?
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction steps
+      description: How can the issue be reproduced?
+      placeholder: Describe each step as precisely as possible
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Log file
+      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
+      placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: OS
+      placeholder: "e.g. Windows 10"
+    validations:
+      required: true
+  - type: input
+    id: ryujinx-version
+    attributes:
+      label: Ryujinx version
+      placeholder: "e.g. 1.0.470"
+    validations:
+      required: true
+  - type: input
+    id: game-version
+    attributes:
+      label: Game version
+      placeholder: "e.g. 1.1.1"
+    validations:
+      required: false
+  - type: input
+    id: cpu
+    attributes:
+      label: CPU
+      placeholder: "e.g. i7-6700"
+    validations:
+      required: false
+  - type: input
+    id: gpu
+    attributes:
+      label: GPU
+      placeholder: "e.g. NVIDIA RTX 2070"
+    validations:
+      required: false
+  - type: input
+    id: ram
+    attributes:
+      label: RAM
+      placeholder: "e.g. 16GB"
+    validations:
+      required: false
+  - type: textarea
+    id: mods
+    attributes:
+      label: List of applied mods
+      placeholder: You can list applied mods here.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context?
+      description: |
+        - Additional info about your environment:
+        - Any other information relevant to your issue.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ryujinx Discord
+    url: https://discord.gg/N2FmfVc
+    about: This is for development related issues. For support and technical issues, please come to our Discord server.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,31 @@
+name: Feature Request
+description: Suggest a new feature for Ryujinx.
+title: "[Feature Request]"
+labels: enhancement
+body:
+  - type: textarea
+    id: overview
+    attributes:
+      label: Overview
+      description: Include the basic, high-level concepts for this feature here.
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Smaller details
+      description: These may include specific methods of implementation etc.
+    validations:
+      required: true
+  - type: textarea
+    id: request
+    attributes:
+      label: Nature of request
+    validations:
+      required: true
+  - type: textarea
+    id: feature
+    attributes:
+      label: Why would this feature be useful?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/missing_cpu_instruction.yml

@@ -0,0 +1,26 @@
+name: Missing CPU Instruction
+description: CPU Instruction is missing in Ryujinx.
+title: "[CPU]"
+labels: [cpu, not-implemented]
+body:
+  - type: textarea
+    id: instruction
+    attributes:
+      label: CPU instruction
+      description: What CPU instruction is missing?
+    validations:
+      required: true
+  - type: textarea
+    id: name
+    attributes:
+      label: Instruction name
+      description: Include the name from [armconverter.com](https://armconverter.com/?disasm) or [shell-storm.org](http://shell-storm.org/online/Online-Assembler-and-Disassembler/?arch=arm64&endianness=big&dis_with_raw=True&dis_with_ins=True) in the above code block
+    validations:
+      required: true
+  - type: textarea
+    id: required
+    attributes:
+      label: Required by
+      description: Add links to the [compatibility list page(s)](https://github.com/Ryujinx/Ryujinx-Games-List/issues) of the game(s) that require this instruction.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/missing_service_call.yml

@@ -0,0 +1,25 @@
+name: Missing Service Call
+description: Service call is missing in Ryujinx.
+labels: not-implemented
+body:
+  - type: textarea
+    id: instruction
+    attributes:
+      label: Service call
+      description: What service call is missing?
+    validations:
+      required: true
+  - type: textarea
+    id: name
+    attributes:
+      label: Service description
+      description: Include the description/explanation from [Switchbrew](https://switchbrew.org/w/index.php?title=Services_API) and/or [SwIPC](https://reswitched.github.io/SwIPC/) in the above code block
+    validations:
+      required: true
+  - type: textarea
+    id: required
+    attributes:
+      label: Required by
+      description:  Add links to the [compatibility list page(s)](https://github.com/Ryujinx/Ryujinx-Games-List/issues) of the game(s) that require this service.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/missing_shader_instruction.yml

@@ -0,0 +1,19 @@
+name: Missing Shader Instruction
+description: Shader Instruction is missing in Ryujinx.
+title: "[GPU]"
+labels: [gpu, not-implemented]
+body:
+  - type: textarea
+    id: instruction
+    attributes:
+      label: Shader instruction
+      description: What shader instruction is missing?
+    validations:
+      required: true
+  - type: textarea
+    id: required
+    attributes:
+      label: Required by
+      description: Add links to the [compatibility list page(s)](https://github.com/Ryujinx/Ryujinx-Games-List/issues) of the game(s) that require this instruction.
+    validations:
+      required: true

.github/labeler.yml

@@ -10,10 +10,6 @@ gpu:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.*/**', 'src/Spv.Generator/**', 'src/Ryujinx.ShaderTools/**']
 
-input:
-- changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx.Input*/**', 'src/Ryujinx/UI/Views/Input/**']
-
 'graphics-backend:opengl':
 - changed-files:
   - any-glob-to-any-file: 'src/Ryujinx.Graphics.OpenGL/**'
@@ -22,17 +18,17 @@ input:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']
 
+'graphics-backend:metal':
+  - changed-files:
+      - any-glob-to-any-file: ['src/Ryujinx.Graphics.Metal/**', 'src/Ryujinx.Graphics.Metal.SharpMetalExtensions/**']
+
 gui:
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.LocaleGenerator/**']
+  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']
 
-'horizon/hle':
+horizon:
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx.HLE/**', 'src/Ryujinx.HLE.Generators/**', 'src/Ryujinx.Horizon/**']
-
-i18n:
-- changed-files:
-  - any-glob-to-any-file: ['assets/**/*.json', 'src/Ryujinx.UI.LocaleGenerator/**']
+  - any-glob-to-any-file: ['src/Ryujinx.HLE/**', 'src/Ryujinx.Horizon/**']
 
 kernel:
 - changed-files:
@@ -40,7 +36,7 @@ kernel:
 
 infra:
 - changed-files:
-  - any-glob-to-any-file: ['.forgejo/**', 'distribution/**', 'Directory.Packages.props', 'src/Ryujinx.BuildValidationTasks/**']
+  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props', 'src/Ryujinx.BuildValidationTasks/**']
 
 documentation:
 - changed-files:
@@ -48,4 +44,4 @@ documentation:
 
 ldn:
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx.HLE/HOS/Services/Ldn/**', 'src/Ryujinx/UI/Windows/LdnGamesListWindow.*', 'src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs']
+  - any-glob-to-any-file: 'src/Ryujinx.HLE/HOS/Services/Ldn/**'

.github/workflows/build.yml

@@ -0,0 +1,168 @@
+name: Build job
+
+on:
+  workflow_call:
+
+env:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  RYUJINX_BASE_VERSION: "1.2.0"
+  RELEASE: 0
+
+jobs:
+  build:
+    name: ${{ matrix.platform.name }} (${{ matrix.configuration }})
+    runs-on: ${{ matrix.platform.os }}
+    timeout-minutes: 45
+    strategy:
+      matrix:
+        configuration: [Debug, Release]
+        platform:
+          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
+          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
+          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
+          - { name: osx-x64,     os: macos-13,       zip_os_name: osx_x64     }
+
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Overwrite csc problem matcher
+        run: echo "::add-matcher::.github/csc.json"
+
+      - name: Get git short hash
+        id: git_short_hash
+        run: echo "result=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Change config filename
+        run: sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/PRConfig\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+        shell: bash
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
+      - name: Change config filename for macOS
+        run: sed -r -i '' 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/PRConfig\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+        shell: bash
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'macos-13'
+
+      - name: Build
+        run: dotnet build -c "${{ matrix.configuration }}" -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER
+
+      - name: Test
+        uses: TSRBerry/unstable-commands@v1
+        with:
+          commands: dotnet test --no-build -c "${{ matrix.configuration }}"
+          timeout-minutes: 10
+          retry-codes: 139
+        if: matrix.platform.name != 'linux-arm64'
+
+      - name: Publish Ryujinx
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
+      - name: Set executable bit
+        run: |
+          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+
+      - name: Build AppImage
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        run: |
+          PLATFORM_NAME="${{ matrix.platform.name }}"
+
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"
+
+          # Setup appimagetool
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
+          chmod +x distribution/linux/appimage/build-appimage.sh
+
+          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
+            export ARCH=x86_64
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
+            export ARCH=aarch64
+          else
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
+            exit 1
+          fi
+
+          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
+        shell: bash
+
+      - name: Upload Ryujinx artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
+          path: publish
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
+      - name: Upload Ryujinx (AppImage) artifact
+        uses: actions/upload-artifact@v4
+        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
+          path: publish_appimage
+
+  build_macos:
+    name: macOS Universal (${{ matrix.configuration }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    strategy:
+      matrix:
+        configuration: [ Debug, Release ]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Setup LLVM 17
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 17
+
+      - name: Install rcodesign
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
+          tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
+          rm apple-codesign.tar.gz
+          mv rcodesign $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get git short hash
+        id: git_short_hash
+        run: echo "result=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+
+      - name: Change config filename
+        run: sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/PRConfig\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
+        shell: bash
+        if: github.event_name == 'pull_request'
+
+      - name: Publish macOS Ryujinx
+        run: |
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp publish ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"
+
+      - name: Upload Ryujinx artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          path: "publish/*.tar.gz"
+        if: github.event_name == 'pull_request'

.github/workflows/canary.yml

@@ -6,7 +6,7 @@ on:
   push:
     branches: [ master ]
     paths-ignore:
-      - '.forgejo/**'
+      - '.github/**'
       - 'docs/**'
       - 'assets/**'
       - '*.yml'
@@ -25,28 +25,44 @@ env:
 jobs:
   release:
     name: Release for ${{ matrix.platform.name }}
-    runs-on: docker
-    container:
-      image: ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_x64      }
-          #- { name: win-arm64,   os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_arm64    }
-          - { name: linux-x64,   os: ghcr.io/gruke-build/ubuntu:dotnet-latest,  zip_os_name: linux_x64   }
-          - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest,  zip_os_name: linux_arm64 }
+          - { name: win-x64,     os: ubuntu-latest, zip_os_name: win_x64     }
+          #- { name: win-arm64,   os: ubuntu-latest, zip_os_name: win_arm64   }
+          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
+          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
 
       - name: Overwrite csc problem matcher
-        run: echo "::add-matcher::.forgejo/csc.json"
+        run: echo "::add-matcher::.github/csc.json"
+
+      - name: Install 7zip
+        run: |
+          sudo apt install -y 7zip
+
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=$(gli get-next-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Configure for release
@@ -71,9 +87,12 @@ jobs:
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
-          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.7z ../publish
           popd
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Packing Linux builds
         if: contains(matrix.platform.name, 'linux')
@@ -82,8 +101,9 @@ jobs:
           rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
-          tar -cJvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.xz ../publish
           popd
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
         shell: bash
 
       - name: Build AppImage (Linux)
@@ -92,6 +112,14 @@ jobs:
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"
+
+          # Setup appimagetool
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
           chmod +x distribution/linux/appimage/build-appimage.sh
 
           # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
@@ -111,46 +139,53 @@ jobs:
           pushd publish_appimage
           mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
           popd
+          
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
         shell: bash
 
-      - name: Create release
-        uses: actions/create-release@v1
-        with:
-          name: "Canary ${{ steps.version_info.outputs.build_version }}"
-          body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})"
-          repository: "Ryubing/Canary"
-          token: ${{ secrets.RELEASER_TOKEN  }}
-          tag_name: ${{ steps.version_info.outputs.build_version }}
-          files: |-
-            release_output/**
-
   macos_release:
     name: Release MacOS universal
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
 
       - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 17
+          
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install rcodesign
         run: |
-          gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz
+          mkdir -p $HOME/.bin
+          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
           tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
           rm apple-codesign.tar.gz
-          mv rcodesign /usr/bin/rcodesign
+          mv rcodesign $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=$(gli get-next-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Configure for release
@@ -166,46 +201,46 @@ jobs:
       - name: Publish macOS Ryujinx
         run: |
           ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r 5 -p publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
 
-      - name: Create release
-        uses: actions/create-release@v1
-        with:
-          name: "Canary ${{ steps.version_info.outputs.build_version }}"
-          body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})"
-          repository: "Ryubing/Canary"
-          token: ${{ secrets.RELEASER_TOKEN  }}
-          tag_name: ${{ steps.version_info.outputs.build_version }}
-          files: |-
-            publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
-
-  post_ci:
-    name: Post CI Steps
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:act-latest
+  create_gitlab_release:
+    name: Create GitLab Release
+    runs-on: ubuntu-24.04
     needs: 
       - macos_release
       - release
     steps:
+      - uses: actions/checkout@v4
+        
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
       - name: Get version info
         id: version_info
         run: |
-          echo "build_version=$(gli get-next-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "build_version=$(gli get-next-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Canary -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
           
       - name: Create tag
         run: |
-          gli create-tag -T ${{ secrets.RELEASER_TOKEN }} -P projects/Ryubing -n Canary-${{ steps.version_info.outputs.build_version }} -r ${{ steps.version_info.outputs.git_short_hash }}
-
-      - name: Link to actual source archives for Canary
-        run: |
-          gli canary-release -T ${{ secrets.RELEASER_TOKEN }} -P Ryubing/Canary -r ${{ steps.version_info.outputs.build_version }}
+          gli create-tag -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Canary-${{ steps.version_info.outputs.build_version }} -r ${{ steps.version_info.outputs.git_short_hash }}
           
+      - name: Create release
+        run: |
+          gli create-release-from-generic-package-files -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -r main -t "Canary ${{ steps.version_info.outputs.build_version }}" -b "**Full Changelog:** [${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})"
+
       - name: Send notification webhook
         run: |
-          gli send-update-message -T ${{ secrets.RELEASER_TOKEN }} -P Ryubing/Canary -t ${{ steps.version_info.outputs.build_version }} -c FF4500 -w ${{ secrets.CANARY_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
+          gli send-update-message -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -t ${{ steps.version_info.outputs.build_version }} -c FF4500 -w ${{ secrets.CANARY_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
 
       - name: Notify update server of new builds
         run: |

.github/workflows/checks.yml

@@ -0,0 +1,25 @@
+name: Build PR
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:
+      - '**'
+      - '!.github/**'
+      - '!*.yml'
+      - '!*.config'
+      - '!*.md'
+      - '.github/workflows/*.yml'
+
+permissions:
+  pull-requests: write
+  checks: write
+
+concurrency:
+  group: pr-checks-${{ github.event.number }}
+  cancel-in-progress: true
+
+jobs:
+  pr_build:
+    uses: ./.github/workflows/build.yml
+    secrets: inherit

.github/workflows/nightly_pr_comment.yml

@@ -0,0 +1,61 @@
+name: Comment PR artifacts links
+
+on:
+  workflow_run:
+    workflows: ['Build PR']
+    types: [completed]
+
+jobs:
+  pr_comment:
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            const {owner, repo} = context.repo;
+            const run_id = ${{github.event.workflow_run.id}};
+            const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
+
+            const issue_number = await (async () => {
+              const pulls = await github.rest.pulls.list({owner, repo});
+              for await (const {data} of github.paginate.iterator(pulls)) {
+                for (const pull of data) {
+                  if (pull.head.sha === pull_head_sha) {
+                    return pull.number;
+                  }
+                }
+              }
+            })();
+            if (issue_number) {
+              core.info(`Using pull request ${issue_number}`);
+            } else {
+              return core.error(`No matching pull request found`);
+            }
+
+            const {data: {artifacts}} = await github.rest.actions.listWorkflowRunArtifacts({owner, repo, run_id});
+            if (!artifacts.length) {
+              return core.error(`No artifacts found`);
+            }
+            let body = `Download the artifacts for this pull request:\n`;
+            let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
+            for (const art of artifacts) {
+              const url = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
+              if (art.name.includes('Debug')) {
+                hidden_debug_artifacts += `\n* [${art.name}](${url})`;
+              } else {
+                body += `\n* [${art.name}](${url})`;
+              }
+            }
+            hidden_debug_artifacts += `\n</details>`;
+            body += hidden_debug_artifacts;
+
+            const {data: comments} = await github.rest.issues.listComments({repo, owner, issue_number});
+            const existing_comment = comments.find((c) => c.user.login === 'github-actions[bot]');
+            if (existing_comment) {
+              core.info(`Updating comment ${existing_comment.id}`);
+              await github.rest.issues.updateComment({repo, owner, comment_id: existing_comment.id, body});
+            } else {
+              core.info(`Creating a comment`);
+              await github.rest.issues.createComment({repo, owner, issue_number, body});
+            }

.github/workflows/pr_triage.yml

@@ -5,22 +5,24 @@ on:
 
 jobs:
   triage:
+    permissions:
+      contents: read
+      pull-requests: write
+
     runs-on: ubuntu-latest
 
     steps:
       # Grab sources to get latest labeler.yml
       - name: Fetch sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
            # Ensure we pin the source origin as pull_request_target run under forks.
            fetch-depth: 0
-           repository: projects/Ryubing
+           repository: GreemDev/Ryujinx
            ref: master
 
       - name: Update labels based on changes
-        uses: actions/labeler@v6
+        uses: actions/labeler@v5
         with:
-          repo-token: ${{ secrets.LABELER_TOKEN }}
-          configuration-path: .forgejo/labeler.yml
           sync-labels: true
           dot: true

.github/workflows/release.yml

@@ -19,32 +19,48 @@ env:
 jobs:
   release:
     name: Release for ${{ matrix.platform.name }}
-    runs-on: docker
-    container:
-      image: ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_x64      }
-          #- { name: win-arm64,   os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_arm64    }
-          - { name: linux-x64,   os: ghcr.io/gruke-build/ubuntu:act-latest,  zip_os_name: linux_x64   }
-          - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:act-latest,  zip_os_name: linux_arm64 }
+          - { name: win-x64,     os: ubuntu-latest, zip_os_name: win_x64     }
+          #- { name: win-arm64,   os: ubuntu-latest, zip_os_name: win_arm64   }
+          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
+          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
 
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.github/csc.json"
+        
+      - name: Install 7zip
+        run: |
+          sudo apt install -y 7zip
+          
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get version info
         id: version_info
         run: |
           if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
-            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
           else
-            echo "build_version=$(gli get-next-version -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
           fi
-          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Configure for release
@@ -68,9 +84,12 @@ jobs:
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.7z ../publish
           popd
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Packing Linux builds
         if: contains(matrix.platform.name, 'linux')
@@ -79,9 +98,12 @@ jobs:
           rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
-          tar -cJvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.xz ../publish
           popd
+
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build AppImage (Linux)
         if: contains(matrix.platform.name, 'linux')
@@ -89,6 +111,14 @@ jobs:
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
+          sudo apt install -y zsync desktop-file-utils appstream
+
+          mkdir -p tools
+          export PATH="$PATH:$(readlink -f tools)"
+
+          # Setup appimagetool
+          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x tools/appimagetool
           chmod +x distribution/linux/appimage/build-appimage.sh
 
           # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
@@ -108,27 +138,17 @@ jobs:
           pushd publish_appimage
           mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
           popd
-        shell: bash
 
-      - name: Create release
-        uses: actions/create-release@v1
-        with:
-          name: "${{ steps.version_info.outputs.build_version }}"
-          repository: "projects/Ryubing"
-          token: ${{ secrets.RELEASER_TOKEN  }}
-          tag_name: ${{ steps.version_info.outputs.build_version }}
-          files: |-
-            release_output/**
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+        shell: bash
 
   macos_release:
     name: Release MacOS universal
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-dotnet@v5
+      - uses: actions/setup-dotnet@v4
         with:
           global-json-file: global.json
 
@@ -137,24 +157,38 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 17
+          
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install rcodesign
         run: |
-          gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz
+          mkdir -p $HOME/.bin
+          gh release download -R indygreg/apple-platform-rs -O apple-codesign.tar.gz -p 'apple-codesign-*-x86_64-unknown-linux-musl.tar.gz'
           tar -xzvf apple-codesign.tar.gz --wildcards '*/rcodesign' --strip-components=1
           rm apple-codesign.tar.gz
-          mv rcodesign /usr/bin/rcodesign
+          mv rcodesign $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get version info
         id: version_info
         run: |
           if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
-            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
           else
-            echo "build_version=$(gli get-next-version -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
           fi
-          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Configure for release
@@ -167,42 +201,49 @@ jobs:
 
       - name: Publish macOS Ryujinx
         run: |
-          bash distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
-
-      - name: Create release
-        uses: actions/create-release@v1
-        with:
-          name: "${{ steps.version_info.outputs.build_version }}"
-          repository: "projects/Ryubing"
-          token: ${{ secrets.RELEASER_TOKEN  }}
-          tag_name: ${{ steps.version_info.outputs.build_version }}
-          files: |-
-            publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
-
-  post_ci:
-    name: Post-CI Steps
-    runs-on: docker
-    container:
-      image: ghcr.io/gruke-build/ubuntu:act-latest
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
+          
+          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r 5 -p publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
+          
+  create_gitlab_release:
+    name: Create GitLab Release
+    runs-on: ubuntu-24.04
     needs:
       - macos_release
       - release
     steps:
+      - uses: actions/checkout@v4
+        
+      - name: Install gli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get version info
         id: version_info
         run: |
           if [ '${{ inputs.is_bugfix_release }}' == 'false' ]; then
-            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -m -c Stable -R)" >> $GITHUB_OUTPUT
           else
-            echo "build_version=$(gli get-next-version -c Stable -R)" >> $FORGEJO_OUTPUT
+            echo "build_version=$(gli get-next-version -c Stable -R)" >> $GITHUB_OUTPUT
           fi
-          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $FORGEJO_OUTPUT
-          echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
+          echo "prev_build_version=$(gli get-current-version -c Stable -R)" >> $GITHUB_OUTPUT
+          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
+          echo "commit_message=$(git log -1 --pretty=%B)" >> $GITHUB_OUTPUT
         shell: bash
 
+      - name: Create release
+        run: |
+          gli create-release-from-generic-package-files -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -r ${{ steps.version_info.outputs.git_short_hash }} -t "${{ steps.version_info.outputs.build_version }}" -b "msd:${{ steps.version_info.outputs.build_version }}"
+
       - name: Send notification webhook
         run: |
-          gli send-update-message -T ${{ secrets.RELEASER_TOKEN }} -P projects/Ryubing -t ${{ steps.version_info.outputs.build_version }} -c 32cd32 -w ${{ secrets.STABLE_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
+          gli send-update-message -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -t ${{ steps.version_info.outputs.build_version }} -c 32cd32 -w ${{ secrets.STABLE_DISCORD_WEBHOOK }} -i https://avatars.githubusercontent.com/u/192939710?s=200&v=4
 
       - name: Notify update server of new builds
         run: |

Directory.Packages.props

@@ -3,65 +3,60 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.15" />
-    <PackageVersion Include="SharpCompress" Version="0.48.0" />
-    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.5" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
+    <PackageVersion Include="Avalonia" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.50" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
-    <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.501.0" />
+    <PackageVersion Include="ppy.SDL3-CS" Version="2025.920.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
-    <PackageVersion Include="DynamicData" Version="9.4.31" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.1" />
+    <PackageVersion Include="DynamicData" Version="9.4.1" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.18.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
     <PackageVersion Include="NetCoreServer" Version="8.0.7" />
-    <PackageVersion Include="NUnit" Version="3.14.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="OpenTK.Core" Version="4.9.4" />
-    <PackageVersion Include="OpenTK.Graphics" Version="4.9.4" />
-    <!-- OpenTk.Audio.OpenAL has moved to OpenTk.Audio -->
-    <!--<PackageVersion Include="OpenTK.Audio" Version="5.0.0-pre.15" />-->
-    <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
-    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.9.4" />
+    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageVersion Include="OpenTK.Core" Version="4.8.2" />
+    <PackageVersion Include="OpenTK.Graphics" Version="4.8.2" />
+    <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.8.2" />
+    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
-    <!-- Ryujinx.Audio.OpenAL.Dependencies is from the original project, last updated 12/30/20 -->
-    <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
-    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
+    <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.21.0-alpha.133" />
-    <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
-    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
-    <PackageVersion Include="Gommon" Version="2.8.1.2" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.126" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
+    <PackageVersion Include="Gommon" Version="2.8.0.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="Sep" Version="0.13.0" />
+    <PackageVersion Include="Sep" Version="0.11.1" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
-    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.3" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
+    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
 </Project>

README.md

@@ -5,10 +5,10 @@
         </td>
         <td align="center" width="75%">
           
-<h1 class="ryu-gradient-text">Ryujinx</h1>
+# Ryujinx
 
-[![Latest release](https://git.ryujinx.app/projects/Ryubing/badges/release.svg?label=stable&color=32cd32)](https://update.ryujinx.app/latest/stable)
-[![Latest canary release](https://git.ryujinx.app/Ryubing/Canary/badges/release.svg?label=canary&color=FF4500)](https://update.ryujinx.app/latest/canary)
+[![Latest release](https://img.shields.io/gitlab/v/release/ryubing%2Fryujinx?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=stable&color=32cd32)](https://update.ryujinx.app/latest/stable)
+[![Latest canary release](https://img.shields.io/gitlab/v/release/ryubing%2Fcanary?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=canary&color=FF4500)](https://update.ryujinx.app/latest/canary)
 <br>
 <a href="https://discord.gg/PEuzjrFXUA">
 <img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryubing&logo=discord&logoColor=white" alt="Discord">
@@ -21,7 +21,7 @@
   Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
   This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
   It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on a self-managed <a class="forgejo-gradient-text" href="https://github.com/Ryubing/forgejo" target="_blank">modified Forgejo</a> instance under the <a href="https://git.ryujinx.app/projects/Ryubing/src/branch/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on a self-managed GitLab instance under the <a href="https://git.ryujinx.app/ryubing/ryujinx/-/blob/master/LICENSE.txt?ref_type=heads" target="_blank">MIT license</a>.
   <br />
 </p>
 <p align="center">
@@ -31,11 +31,11 @@
   <br>
   This is not a Ryujinx revival project. This is not a Phoenix project.
   <br>
-  Guides and documentation can be found on the <a href="https://git.ryujinx.app/projects/Ryubing/wiki/Home">Wiki tab</a>.
+  Guides and documentation can be found on the <a href="https://git.ryujinx.app/groups/ryubing/-/wikis/home">Wiki tab</a>.
 </p>
 
 <p align="center">
-    <img src="https://git.ryujinx.app/projects/Ryubing/raw/branch/master/docs/shell.png" alt="Ryujinx example">
+    <img src="https://git.ryujinx.app/ryubing/ryujinx/-/raw/master/docs/shell.png?ref_type=heads&inline=false" alt="Ryujinx example">
 </p>
 
 ## Usage
@@ -49,17 +49,17 @@ Stable builds are made every so often, based on the `master` branch, that then g
 These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
 They are released every month or so, to ensure consistent updates, while not being an annoying amount of individual updates to download over the course of that month.
 
-You can find the stable releases [here](https://git.ryujinx.app/projects/Ryubing/releases).
+You can find the stable releases [here](https://git.ryujinx.app/ryubing/ryujinx/-/releases).
 
 Canary builds are compiled automatically for each commit on the `master` branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
 These canary builds are only recommended for experienced users.
 
-You can find the canary releases [here](https://git.ryujinx.app/Ryubing/Canary/releases).
+You can find the canary releases [here](https://git.ryujinx.app/ryubing/canary/-/releases).
 
 ## Documentation
 
-If you are planning to contribute or just want to learn more about this project please read through our [documentation](https://git.ryujinx.app/projects/Ryubing/src/branch/master/docs/README.md).
+If you are planning to contribute or just want to learn more about this project please read through our [documentation](docs/README.md).
 
 ## Features
 
@@ -105,13 +105,13 @@ If you are planning to contribute or just want to learn more about this project
 
 ## License
 
-This software is licensed under the terms of the [MIT license](https://git.ryujinx.app/projects/Ryubing/src/branch/master/LICENSE.txt).
+This software is licensed under the terms of the [MIT license](LICENSE.txt).
 This project makes use of code authored by the libvpx project, licensed under BSD and the ffmpeg project, licensed under LGPLv3.
-See [LICENSE.txt](https://git.ryujinx.app/projects/Ryubing/src/branch/master/LICENSE.txt) and [THIRDPARTY.md](https://git.ryujinx.app/projects/Ryubing/src/branch/master/distribution/legal/THIRDPARTY.md) for more details.
+See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](distribution/legal/THIRDPARTY.md) for more details.
 
 ## Credits
 
-- [LibHac](https://git.ryujinx.app/projects/LibHac) is used for our file-system.
+- [LibHac](https://git.ryujinx.app/ryubing/libhac) is used for our file-system.
 - [AmiiboAPI](https://www.amiiboapi.com) is used in our Amiibo emulation.
 - [ldn_mitm](https://github.com/spacemeowx2/ldn_mitm) is used for one of our available multiplayer modes.
-- [ShellLink](https://github.com/securifybv/ShellLink) is used for Windows shortcut generation.
+- [ShellLink](https://github.com/securifybv/ShellLink) is used for Windows shortcut generation.

Ryujinx.sln

@@ -86,11 +86,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		.forgejo\workflows\build.yml = .forgejo\workflows\build.yml
-		.forgejo\workflows\canary.yml = .forgejo\workflows\canary.yml
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\canary.yml = .github\workflows\canary.yml
 		Directory.Packages.props = Directory.Packages.props
 		Directory.Build.props = Directory.Build.props
-		.forgejo\workflows\release.yml = .forgejo\workflows\release.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject
@@ -573,16 +573,6 @@ Global
 		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.Build.0 = Release|Any CPU
 		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x64.ActiveCfg = Debug|Any CPU
-        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x64.Build.0 = Debug|Any CPU
-        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x86.ActiveCfg = Debug|Any CPU
-        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x64.Build.0 = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

assets/Locales/RenderDoc.json

@@ -4,7 +4,7 @@
       "ID": "MenuBarActions_StartCapture",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "RenderDoc Frame-Aufnahme starten",
+        "de_DE": "",
         "el_GR": "",
         "en_US": "Start RenderDoc Frame Capture",
         "es_ES": "Iniciar una captura de fotograma de RenderDoc",
@@ -21,15 +21,15 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "启动 RenderDoc 帧捕获",
-        "zh_TW": "啟動 RenderDoc 畫格擷取"
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
       "ID": "MenuBarActions_EndCapture",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "RenderDoc Frame-Aufnahme beenden",
+        "de_DE": "",
         "el_GR": "",
         "en_US": "End RenderDoc Frame Capture",
         "es_ES": "Detener la captura de fotograma de RenderDoc",
@@ -46,15 +46,15 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "结束 RenderDoc 帧捕获",
-        "zh_TW": "停止 RenderDoc 畫格擷取"
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
       "ID": "MenuBarActions_DiscardCapture",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "RenderDoc Frame-Aufnahme verwerfen",
+        "de_DE": "",
         "el_GR": "",
         "en_US": "Discard RenderDoc Frame Capture",
         "es_ES": "Descartar la captura de fotograma de RenderDoc",
@@ -71,15 +71,15 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "丢弃 RenderDoc 帧捕获",
-        "zh_TW": "捨棄 RenderDoc 畫格擷取"
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
       "ID": "MenuBarActions_DiscardCapture_ToolTip",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "Beendet die jetzige RenderDoc Frame-Aufnahme, verwirft sofort das Ergebnis.",
+        "de_DE": "",
         "el_GR": "",
         "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.",
         "es_ES": "Finaliza la captura de fotograma de RenderDoc actualmente activa y descarta inmediatamente su resultado.",
@@ -96,8 +96,8 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "结束当前正在进行的 RenderDoc 帧捕获，并立即丢弃其结果。",
-        "zh_TW": "停止正在執行的 RenderDoc 畫格擷取，且立即捨棄其結果。"
+        "zh_CN": "",
+        "zh_TW": ""
       }
     }
   ]

distribution/linux/appimage/build-appimage.sh

@@ -22,5 +22,5 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
 
 mkdir -p "$OUTDIR"
 
-appimagetool --appimage-extract-and-run -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
-    AppDir "$OUTDIR"/Ryujinx.AppImage
+appimagetool -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
+    AppDir "$OUTDIR"/Ryujinx.AppImage

distribution/macos/create_macos_pr_build_ava.sh

@@ -1,120 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$#" -lt 8 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION>"
-    exit 1
-fi
-
-mkdir -p "$1"
-mkdir -p "$2"
-mkdir -p "$3"
-
-BASE_DIR=$(readlink -f "$1")
-TEMP_DIRECTORY=$(readlink -f "$2")
-OUTPUT_DIRECTORY=$(readlink -f "$3")
-ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
-VERSION=$5
-SOURCE_REVISION_ID=$6
-CONFIGURATION=$7
-
-if [[ "$(uname)" == "Darwin" ]]; then
-    echo "Clearing xattr on all dot undercsore files"
-    find "$BASE_DIR" -type f -name "._*" -exec sh -c '
-    for f; do
-        dir=$(dirname "$f")
-        base=$(basename "$f")
-        orig="$dir/${base#._}"
-        [ -f "$orig" ] && xattr -c "$orig" || true
-    done
-    ' sh {} +
-fi
-
-RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
-
-ARM64_APP_BUNDLE="$TEMP_DIRECTORY/output_arm64/Ryujinx.app"
-X64_APP_BUNDLE="$TEMP_DIRECTORY/output_x64/Ryujinx.app"
-UNIVERSAL_APP_BUNDLE="$OUTPUT_DIRECTORY/Ryujinx.app"
-EXECUTABLE_SUB_PATH=Contents/MacOS/Ryujinx
-
-rm -rf "$TEMP_DIRECTORY"
-mkdir -p "$TEMP_DIRECTORY"
-
-DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
-
-dotnet restore
-dotnet build -c "$CONFIGURATION" src/Ryujinx
-dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx
-dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx
-
-# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
-rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
-
-# Get rid of libsoundio from arm64 builds as we don't have a arm64 variant
-# TODO: remove this once done
-rm -rf "$TEMP_DIRECTORY/publish_arm64/libsoundio.dylib"
-
-pushd "$BASE_DIR/distribution/macos"
-./create_app_bundle.sh "$TEMP_DIRECTORY/publish_x64" "$TEMP_DIRECTORY/output_x64" "$ENTITLEMENTS_FILE_PATH"
-./create_app_bundle.sh "$TEMP_DIRECTORY/publish_arm64" "$TEMP_DIRECTORY/output_arm64" "$ENTITLEMENTS_FILE_PATH"
-popd
-
-rm -rf "$UNIVERSAL_APP_BUNDLE"
-mkdir -p "$OUTPUT_DIRECTORY"
-
-# Let's copy one of the two different app bundle and remove the executable
-cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
-rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
-
-# Make its libraries universal
-python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
-
-if ! [ -x "$(command -v lipo)" ];
-then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
-    then
-        LIPO=llvm-lipo
-    else
-        LIPO=llvm-lipo-17
-    fi
-else
-    LIPO=lipo
-fi
-
-# Make the executable universal
-$LIPO "$ARM64_APP_BUNDLE/$EXECUTABLE_SUB_PATH" "$X64_APP_BUNDLE/$EXECUTABLE_SUB_PATH" -output "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH" -create
-
-# Patch up the Info.plist to have appropriate version
-sed -r -i.bck "s/\%\%RYUJINX_BUILD_VERSION\%\%/$VERSION/g;" "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist"
-sed -r -i.bck "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$SOURCE_REVISION_ID/g;" "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist"
-rm "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist.bck"
-
-# Now sign it
-if ! [ -x "$(command -v codesign)" ];
-then
-    if ! [ -x "$(command -v rcodesign)" ];
-    then
-        echo "Cannot find rcodesign on your system, please install rcodesign."
-        exit 1
-    fi
-
-    # NOTE: Currently require https://github.com/indygreg/apple-platform-rs/pull/44 to work on other OSes.
-    # cargo install --git "https://github.com/marysaka/apple-platform-rs" --branch "fix/adhoc-app-bundle" apple-codesign --bin "rcodesign"
-    echo "Using rcodesign for ad-hoc signing"
-    rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$UNIVERSAL_APP_BUNDLE"
-else
-    echo "Using codesign for ad-hoc signing"
-    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$UNIVERSAL_APP_BUNDLE"
-fi
-
-echo "Creating archive"
-pushd "$OUTPUT_DIRECTORY"
-tar --exclude "Ryujinx.app/Contents/MacOS/Ryujinx" -cvf "$RELEASE_TAR_FILE_NAME" Ryujinx.app 1> /dev/null
-python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "Ryujinx.app/Contents/MacOS/Ryujinx" "Ryujinx.app/Contents/MacOS/Ryujinx"
-gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
-rm "$RELEASE_TAR_FILE_NAME"
-
-popd
-
-echo "Done"

docs/compatibility.csv

@@ -2050,9 +2050,7 @@
 010003C00B868000,"Ninjin: Clash of Carrots",online-broken,playable,2024-07-10 05:12:26
 0100746010E4C000,"NinNinDays",,playable,2022-11-20 15:17:29
 0100C9A00ECE6000,"Nintendo 64™ – Nintendo Switch Online",gpu;vulkan,ingame,2024-04-23 20:21:07
-010057D00ECE4000,"Nintendo 64™ – Nintendo Switch Online",gpu;vulkan,ingame,2024-04-23 20:21:07
 0100e0601c632000,"Nintendo 64™ – Nintendo Switch Online: MATURE 17+",,ingame,2025-02-03 22:27:00
-010037A0170D2000,"NINTENDO 64™ – Nintendo Switch Online 18+",,ingame,2025-02-03 22:27:00
 0100D870045B6000,"Nintendo Entertainment System™ - Nintendo Switch Online",online,playable,2022-07-01 15:45:06
 0100C4B0034B2000,"Nintendo Labo Toy-Con 01 Variety Kit",gpu,ingame,2022-08-07 12:56:07
 01001E9003502000,"Nintendo Labo Toy-Con 03 Vehicle Kit",services;crash,menus,2022-08-03 17:20:11
@@ -2640,7 +2638,6 @@
 0100B16009C10000,"SINNER: Sacrifice for Redemption",nvdec;UE4;vulkan-backend-bug,playable,2022-08-12 20:37:33
 0100E9201410E000,"Sir Lovelot",,playable,2021-04-05 16:21:46
 0100134011E32000,"Skate City",,playable,2022-11-04 11:37:39
-0100a8501b66e000,"Skateboard Drifting with Maxwell Cat: The Game Simulator",,playable,2026-02-17 19:05:00
 0100B2F008BD8000,"Skee-Ball",,playable,2020-11-16 04:44:07
 01001A900F862000,"Skelattack",,playable,2021-06-09 15:26:26
 01008E700F952000,"Skelittle: A Giant Party!",,playable,2021-06-09 19:08:34
@@ -3310,7 +3307,6 @@
 0100AFA011068000,"Voxel Pirates",,playable,2022-09-28 22:55:02
 0100BFB00D1F4000,"Voxel Sword",,playable,2022-08-30 14:57:27
 01004E90028A2000,"Vroom in the night sky",Needs Update;vulkan-backend-bug,playable,2023-02-20 02:32:29
-0100BFC01D976000,"Virtual Boy – Nintendo Classics",services,nothing,2026-02-17 11:26:59
 0100C7C00AE6C000,"VSR: Void Space Racing",,playable,2021-01-27 14:08:59
 0100B130119D0000,"Waifu Uncovered",crash,ingame,2023-02-27 01:17:46
 0100E29010A4A000,"Wanba Warriors",,playable,2020-10-04 17:56:22

nuget.config

@@ -5,7 +5,8 @@
         <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/packages/projects/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>
         <!-- key value for <packageSource> should match key values from <packageSources> element -->
@@ -13,6 +14,10 @@
         <packageSource key="nuget.org">
             <package pattern="*" />
         </packageSource>
+        <packageSource key="Ryujinx.UpdateClient">
+            <package pattern="Ryujinx.UpdateClient" />
+            <package pattern="Ryujinx.Systems.Update.Common" />
+        </packageSource>
         <packageSource key="LibHacAlpha">
             <package pattern="Ryujinx.LibHac" />
         </packageSource>

src/Ryujinx.Audio.Backends.Apple/AppleHardwareDeviceDriver.cs

@@ -83,7 +83,39 @@ namespace Ryujinx.Audio.Backends.Apple
             }
         }
 
-        public static bool IsSupported => OperatingSystem.IsMacOSVersionAtLeast(10, 5);
+        public static bool IsSupported => IsSupportedInternal();
+
+        private static bool IsSupportedInternal()
+        {
+            if (!OperatingSystem.IsMacOS()) return false;
+
+            try
+            {
+                AudioStreamBasicDescription format =
+                    GetAudioFormat(SampleFormat.PcmInt16, Constants.TargetSampleRate, 2);
+                int result = AudioQueueNewOutput(
+                    ref format,
+                    nint.Zero,
+                    nint.Zero,
+                    nint.Zero,
+                    nint.Zero,
+                    0,
+                    out nint testQueue);
+
+                if (result == 0)
+                {
+                    AudioQueueDispose(testQueue, true);
+                    return true;
+                }
+
+                return false;
+            }
+            catch (Exception e)
+            {
+                Logger.Error?.Print(LogClass.Audio, $"Failed to check if AudioToolbox is supported: {e.Message}\n{e.StackTrace}");
+                return false;
+            }
+        }
 
         public ManualResetEvent GetUpdateRequiredEvent()
             => _updateRequiredEvent;

src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Renderer.Common
         public uint MixesSize;
         public uint SinksSize;
         public uint PerformanceBufferSize;
-        public uint SplitterSize;
+        public uint Unknown24;
         public uint RenderInfoSize;
 
 #pragma warning disable IDE0051, CS0169 // Remove unused field

src/Ryujinx.Audio/Renderer/Server/StateUpdater.cs

@@ -433,12 +433,8 @@ namespace Ryujinx.Audio.Renderer.Server
 
         public ResultCode UpdateSplitter(SplitterContext context)
         {
-            long initialInputConsumed = _inputReader.Consumed;
-
             if (context.Update(ref _inputReader))
             {
-                _inputReader.SetConsumed(initialInputConsumed + _inputHeader.SplitterSize);
-
                 return ResultCode.Success;
             }
 

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -107,12 +107,12 @@ namespace Ryujinx.BuildValidationTasks
                         {
                             locale.Translations[langCode] = string.Empty;
                             Console.WriteLine(
-                                $"Language '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
                         }
                         else
                         {
                             Console.WriteLine(
-                                $"Language '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
+                                $"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
                         }
                     }
 

src/Ryujinx.Common/Helpers/ConsoleHelper.cs

@@ -12,12 +12,20 @@ namespace Ryujinx.Common.Helper
         private static partial nint GetConsoleWindow();
 
         [SupportedOSPlatform("windows")]
-        [LibraryImport("kernel32", SetLastError = true)]
+        [LibraryImport("user32")]
         [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool FreeConsole();
+        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        private static partial nint GetForegroundWindow();
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetForegroundWindow(nint hWnd);
 
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
-        public static bool HasConsoleWindow => OperatingSystem.IsWindows() && GetConsoleWindow() != nint.Zero;
 
         public static void SetConsoleWindowState(bool show)
         {
@@ -34,31 +42,22 @@ namespace Ryujinx.Common.Helper
         [SupportedOSPlatform("windows")]
         private static void SetConsoleWindowStateWindows(bool show)
         {
-            if (show)
+            const int SW_HIDE = 0;
+            const int SW_SHOW = 5;
+
+            nint hWnd = GetConsoleWindow();
+
+            if (hWnd == nint.Zero)
             {
-                if (GetConsoleWindow() != nint.Zero)
-                {
-                    Logger.SetConsoleTargetEnabled(true);
-                }
+                Logger.Warning?.Print(LogClass.Application, "Attempted to show/hide console window but console window does not exist");
                 return;
             }
 
-            Logger.SetConsoleTargetEnabled(false);
-            DetachConsole();
-        }
+            SetForegroundWindow(hWnd);
 
-        [SupportedOSPlatform("windows")]
-        private static void DetachConsole()
-        {
-            if (GetConsoleWindow() == nint.Zero)
-            {
-                return;
-            }
+            hWnd = GetForegroundWindow();
 
-            if (!FreeConsole())
-            {
-                Logger.Warning?.Print(LogClass.Application, "Attempted to detach console window but the operation failed");
-            }
+            ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
         }
     }
 }

src/Ryujinx.Common/Logging/LogClass.cs

@@ -51,7 +51,6 @@ namespace Ryujinx.Common.Logging
         ServiceNgct,
         ServiceNifm,
         ServiceNim,
-        ServiceNotification,
         ServiceNs,
         ServiceNsd,
         ServiceNtc,

src/Ryujinx.Common/Logging/LogLevel.cs

@@ -12,7 +12,6 @@ namespace Ryujinx.Common.Logging
         Error,
         Guest,
         AccessLog,
-        NetLog,
         Notice,
         Trace,
     }

src/Ryujinx.Common/Logging/Logger.cs

@@ -119,7 +119,6 @@ namespace Ryujinx.Common.Logging
         public static Log? Error { get; private set; }
         public static Log? Guest { get; private set; }
         public static Log? AccessLog { get; private set; }
-        public static Log? NetLog { get; private set; }
         public static Log? Stub { get; private set; }
         public static Log? Trace { get; private set; }
         public static Log Notice { get; } // Always enabled
@@ -137,7 +136,11 @@ namespace Ryujinx.Common.Logging
 
             _time = Stopwatch.StartNew();
 
-            SetConsoleTargetEnabled(true);
+            // Logger should log to console by default
+            AddTarget(new AsyncLogTargetWrapper(
+                new ConsoleLogTarget("console"),
+                1000,
+                AsyncLogTargetOverflowAction.Discard));
 
             Notice = new Log(LogLevel.Notice);
 
@@ -170,21 +173,6 @@ namespace Ryujinx.Common.Logging
             Updated += target.Log;
         }
 
-        public static void SetConsoleTargetEnabled(bool enabled)
-        {
-            if (enabled)
-            {
-                AddTarget(new AsyncLogTargetWrapper(
-                    new ConsoleLogTarget("console"),
-                    1000,
-                    AsyncLogTargetOverflowAction.Discard));
-            }
-            else
-            {
-                RemoveTarget("console");
-            }
-        }
-
         public static void RemoveTarget(string target)
         {
             ILogTarget logTarget = GetTarget(target);
@@ -248,7 +236,6 @@ namespace Ryujinx.Common.Logging
                 case LogLevel.Error     : Error     = enabled ? new Log(LogLevel.Error)     : null; break;
                 case LogLevel.Guest     : Guest     = enabled ? new Log(LogLevel.Guest)     : null; break;
                 case LogLevel.AccessLog : AccessLog = enabled ? new Log(LogLevel.AccessLog) : null; break;
-                case LogLevel.NetLog    : NetLog    = enabled ? new Log(LogLevel.NetLog)    : null; break;
                 case LogLevel.Stub      : Stub      = enabled ? new Log(LogLevel.Stub)      : null; break;
                 case LogLevel.Trace     : Trace     = enabled ? new Log(LogLevel.Trace)     : null; break;
                 case LogLevel.Notice    : break;

src/Ryujinx.Common/ReleaseInformation.cs

@@ -29,8 +29,8 @@ namespace Ryujinx.Common
 
         public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
             IsCanaryBuild
-                ? $"https://git.ryujinx.app/projects/Ryubing/compare/Canary-{currentVersion}...Canary-{newVersion}"
-                : $"https://git.ryujinx.app/projects/Ryubing/releases/tag/{newVersion}";
+                ? $"https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-{currentVersion}...Canary-{newVersion}"
+                : $"https://git.ryujinx.app/ryubing/ryujinx/-/releases/{newVersion}";
     }
 
 

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
     <PackageReference Include="MsgPack.Cli" />
+    <PackageReference Include="System.Management" />
     <PackageReference Include="Humanizer" />
     <PackageReference Include="Gommon" />
   </ItemGroup>

src/Ryujinx.Common/SharedConstants.cs

@@ -8,12 +8,12 @@ namespace Ryujinx.Common
 
         public const string AmiiboTagsUrl = "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json";
 
-        public const string FaqWikiUrl = "https://git.ryujinx.app/projects/Ryubing/wiki/FAQ-%26-Troubleshooting";
+        public const string FaqWikiUrl = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&-Troubleshooting";
 
         public const string SetupGuideWikiUrl =
-            "https://git.ryujinx.app/projects/Ryubing/wiki/Setup-%26-Configuration-Guide";
+            "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&-Configuration-Guide";
 
         public const string MultiplayerWikiUrl =
-            "https://git.ryujinx.app/projects/Ryubing/wiki/Multiplayer-(LDN-Local-Wireless)-Guide";
+            "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide";
     }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -184,7 +184,6 @@ namespace Ryujinx.Common
             "01001b300b9be000", // Diablo III: Eternal Collection
             "010027400cdc6000", // Divinity Original 2 - Definitive Edition
             "01008c8012920000", // Dying Light Platinum Edition
-            "0100d11013e6a000", // Eschatos
             "01001cc01b2d4000", // Goat Simulator 3
             "01003620068ea000", // Hand of Fate 2
             "0100f7e00c70e000", // Hogwarts Legacy
@@ -194,15 +193,9 @@ namespace Ryujinx.Common
             "0100d71004694000", // Minecraft
             "01007430037f6000", // Monopoly
             "0100853015e86000", // No Man's Sky
-            "0100f85014ed0000", // No More Heroes
-            "0100463014ed4000", // No More Heroes 2
-            "0100e570094e8000", // Owlboy
             "01007bb017812000", // Portal
             "0100abd01785c000", // Portal 2
-            "01009f100bc52000", // Psikyo Collection 1
-            "01009d400c4a8000", // Psikyo Collection 2
             "01008e200c5c2000", // Muse Dash
-            "01005ff002e2a000", // Rayman Legends
             "01007820196a6000", // Red Dead Redemption
             "0100e8300a67a000", // Risk
             "01002f7013224000", // Rune Factory 5

src/Ryujinx.Common/Utilities/OsUtils.cs

@@ -22,11 +22,10 @@ namespace Ryujinx.Common.Utilities
         }
 
         // "dumpable" attribute of the calling process
-        private const int PR_GET_DUMPABLE = 3;
         private const int PR_SET_DUMPABLE = 4;
 
-        [LibraryImport("libc", SetLastError = true)]
-        private static partial int prctl(int option, int arg2);
+        [DllImport("libc", SetLastError = true)]
+        private static extern int prctl(int option, int arg2);
 
         public static void SetCoreDumpable(bool dumpable)
         {
@@ -37,13 +36,5 @@ namespace Ryujinx.Common.Utilities
                 Debug.Assert(result == 0);
             }
         }
-
-        // Use the below line to display dumpable status in the console:
-        // Console.WriteLine($"{OsUtils.IsCoreDumpable()}");
-        public static bool IsCoreDumpable()
-        {
-            int result = prctl(PR_GET_DUMPABLE, 0);
-            return result == 1;
-        }
     }
 }

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -17,8 +17,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        // TODO: JIT Cache size should be application dependent, not global.
-        private const int CacheSize = 1024 * (1024 * 1024); // Megabytes * Size of Megabytes (since its in bytes).
+        private const int CacheSize = 256 * 1024 * 1024;
 
         private static JitCacheInvalidation _jitCacheInvalidator;
 
@@ -34,14 +33,6 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
         public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
-        
-        [SupportedOSPlatform("macos")]
-        [LibraryImport("libSystem.dylib", EntryPoint = "sys_icache_invalidate")]
-        internal static partial void SysICacheInvalidate(nint start, nuint len);
-
-        [SupportedOSPlatform("linux")]
-        [LibraryImport("libgcc_s.so.1", EntryPoint = "__clear_cache")]
-        internal static partial void ClearCache(nint begin, nint end);
 
         public static void Initialize(IJitMemoryAllocator allocator)
         {

src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs

@@ -551,7 +551,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                             level,
                             x,
                             width,
-                            (InternalFormat) format.PixelFormat,
+                            format.PixelFormat,
                             mipSize,
                             data);
                     }
@@ -579,7 +579,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                             layer,
                             width,
                             1,
-                            (InternalFormat) format.PixelFormat,
+                            format.PixelFormat,
                             mipSize,
                             data);
                     }
@@ -609,7 +609,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                             y,
                             width,
                             height,
-                            (InternalFormat) format.PixelFormat,
+                            format.PixelFormat,
                             mipSize,
                             data);
                     }
@@ -643,7 +643,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                             width,
                             height,
                             1,
-                            (InternalFormat) format.PixelFormat,
+                            format.PixelFormat,
                             mipSize,
                             data);
                     }
@@ -675,7 +675,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                             y,
                             width,
                             height,
-                            (InternalFormat) format.PixelFormat,
+                            format.PixelFormat,
                             mipSize,
                             data);
                     }
@@ -744,7 +744,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                                 level,
                                 0,
                                 width,
-                                (InternalFormat) format.PixelFormat,
+                                format.PixelFormat,
                                 mipSize,
                                 data);
                         }
@@ -773,7 +773,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                                 0,
                                 width,
                                 height,
-                                (InternalFormat) format.PixelFormat,
+                                format.PixelFormat,
                                 mipSize,
                                 data);
                         }
@@ -807,7 +807,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                                 width,
                                 height,
                                 depth,
-                                (InternalFormat) format.PixelFormat,
+                                format.PixelFormat,
                                 mipSize,
                                 data);
                         }
@@ -843,7 +843,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                                     0,
                                     width,
                                     height,
-                                    (InternalFormat) format.PixelFormat,
+                                    format.PixelFormat,
                                     mipSize / 6,
                                     data + faceOffset);
                             }

src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.OpenGL
         public void Map(BufferHandle handle, int size)
         {
             GL.BindBuffer(BufferTarget.CopyWriteBuffer, handle);
-            nint ptr = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, nint.Zero, size, MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapPersistentBit);
+            nint ptr = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, nint.Zero, size, BufferAccessMask.MapReadBit | BufferAccessMask.MapPersistentBit);
 
             _maps[handle] = ptr;
         }
@@ -75,7 +75,7 @@ namespace Ryujinx.Graphics.OpenGL
                 GL.BindBuffer(BufferTarget.CopyWriteBuffer, _copyBufferHandle);
                 GL.BufferStorage(BufferTarget.CopyWriteBuffer, requiredSize, nint.Zero, BufferStorageFlags.MapReadBit | BufferStorageFlags.MapPersistentBit);
 
-                _bufferMap = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, nint.Zero, requiredSize, MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapPersistentBit);
+                _bufferMap = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, nint.Zero, requiredSize, BufferAccessMask.MapReadBit | BufferAccessMask.MapPersistentBit);
             }
         }
 

src/Ryujinx.Graphics.OpenGL/Pipeline.cs

@@ -924,8 +924,8 @@ namespace Ryujinx.Graphics.OpenGL
                 GL.Disable(EnableCap.CullFace);
                 return;
             }
-            
-            GL.CullFace((TriangleFace) face.Convert());
+
+            GL.CullFace(face.Convert());
 
             GL.Enable(EnableCap.CullFace);
         }
@@ -1085,12 +1085,12 @@ namespace Ryujinx.Graphics.OpenGL
         {
             if (frontMode == backMode)
             {
-                GL.PolygonMode((TriangleFace) MaterialFace.FrontAndBack, frontMode.Convert());
+                GL.PolygonMode(MaterialFace.FrontAndBack, frontMode.Convert());
             }
             else
             {
-                GL.PolygonMode((TriangleFace) MaterialFace.Front, frontMode.Convert());
-                GL.PolygonMode((TriangleFace) MaterialFace.Back, backMode.Convert());
+                GL.PolygonMode(MaterialFace.Front, frontMode.Convert());
+                GL.PolygonMode(MaterialFace.Back, backMode.Convert());
             }
         }
 

src/Ryujinx.Graphics.OpenGL/Program.cs

@@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.OpenGL
                         GL.CompileShader(shaderHandle);
                         break;
                     case TargetLanguage.Spirv:
-                        GL.ShaderBinary(1, ref shaderHandle, ShaderBinaryFormat.ShaderBinaryFormatSpirV, shader.BinaryCode, shader.BinaryCode.Length);
+                        GL.ShaderBinary(1, ref shaderHandle, (BinaryFormat)All.ShaderBinaryFormatSpirVArb, shader.BinaryCode, shader.BinaryCode.Length);
                         GL.SpecializeShader(shaderHandle, "main", 0, (int[])null, (int[])null);
                         break;
                 }

src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs

@@ -32,7 +32,7 @@ namespace Ryujinx.Graphics.OpenGL.Queries
                 GL.BufferStorage(BufferTarget.QueryBuffer, sizeof(long), (nint)(&defaultValue), BufferStorageFlags.MapReadBit | BufferStorageFlags.MapWriteBit | BufferStorageFlags.MapPersistentBit);
             }
 
-            _bufferMap = GL.MapBufferRange(BufferTarget.QueryBuffer, nint.Zero, sizeof(long), MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapWriteBit | MapBufferAccessMask.MapPersistentBit);
+            _bufferMap = GL.MapBufferRange(BufferTarget.QueryBuffer, nint.Zero, sizeof(long), BufferAccessMask.MapReadBit | BufferAccessMask.MapWriteBit | BufferAccessMask.MapPersistentBit);
         }
 
         public void Reset()

src/Ryujinx.Graphics.Vulkan/Auto.cs

@@ -176,7 +176,9 @@ namespace Ryujinx.Graphics.Vulkan
                     }
                 }
             }
-            
+
+            // This can somehow become -1.
+            // Logger.Info?.PrintMsg(LogClass.Gpu, $"_referenceCount: {_referenceCount}");
             Debug.Assert(_referenceCount >= 0);
         }
 

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -488,8 +488,6 @@ namespace Ryujinx.HLE.FileSystem
                 if (keyPaths.Length is 0)
                     throw new FileNotFoundException($"Directory '{keysSource}' contained no '.keys' files.");
 
-                List<string> failedFiles = new();
-
                 foreach (string filePath in keyPaths)
                 {
                     try
@@ -499,18 +497,15 @@ namespace Ryujinx.HLE.FileSystem
                     catch (Exception e)
                     {
                         Logger.Error?.Print(LogClass.Application, e.Message);
-                        failedFiles.Add(Path.GetFileName(filePath));
                         continue;
                     }
 
                     string destPath = Path.Combine(installDirectory, Path.GetFileName(filePath));
 
-                    File.Copy(filePath, destPath, true);
-                }
+                    if (File.Exists(destPath))
+                        File.Delete(destPath);
 
-                if (failedFiles.Count > 0)
-                {
-                    throw new InvalidOperationException($"Failed to install the following key files: {string.Join(", ", failedFiles)}");
+                    File.Copy(filePath, destPath, true);
                 }
 
                 return;
@@ -523,6 +518,8 @@ namespace Ryujinx.HLE.FileSystem
 
             FileInfo info = new(keysSource);
 
+            using FileStream file = File.OpenRead(keysSource);
+
             if (info.Extension is not ".keys")
                 throw new InvalidFirmwarePackageException("Input file extension is not .keys");
 
@@ -537,6 +534,10 @@ namespace Ryujinx.HLE.FileSystem
 
             string dest = Path.Combine(installDirectory, info.Name);
 
+            if (File.Exists(dest))
+                File.Delete(dest);
+
+            // overwrite: true seems to not work on its own? https://github.com/Ryubing/Issues/issues/189
             File.Copy(keysSource, dest, true);
         }
 

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -20,7 +20,6 @@ using Ryujinx.HLE.HOS.Services.Mii;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
 using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
-using Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager;
 using Ryujinx.HLE.HOS.Services.Nv;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
 using Ryujinx.HLE.HOS.Services.Pcv.Bpc;
@@ -67,8 +66,6 @@ namespace Ryujinx.HLE.HOS
 
         internal List<NfpDevice> NfpDevices { get; private set; }
 
-        internal List<NfcDevice> NfcDevices { get; private set; }
-
         internal SmRegistry SmRegistry { get; private set; }
 
         internal ServerBase SmServer { get; private set; }
@@ -135,7 +132,6 @@ namespace Ryujinx.HLE.HOS
             PerformanceState = new PerformanceState();
 
             NfpDevices = [];
-            NfcDevices = [];
 
             // Note: This is not really correct, but with HLE of services, the only memory
             // region used that is used is Application, so we can use the other ones for anything.
@@ -246,21 +242,21 @@ namespace Ryujinx.HLE.HOS
         public void InitializeServices()
         {
             SmRegistry = new SmRegistry();
-            SmServer = new ServerBase(KernelContext, "Sm", () => new IUserInterface(KernelContext, SmRegistry));
+            SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry));
 
             // Wait until SM server thread is done with initialization,
             // only then doing connections to SM is safe.
             SmServer.InitDone.WaitOne();
 
-            BsdServer = new ServerBase(KernelContext, "Bsd");
-            FsServer = new ServerBase(KernelContext, "Fs");
-            HidServer = new ServerBase(KernelContext, "Hid");
-            NvDrvServer = new ServerBase(KernelContext, "Nv");
-            TimeServer = new ServerBase(KernelContext, "Time");
-            ViServer = new ServerBase(KernelContext, "Vi:u");
-            ViServerM = new ServerBase(KernelContext, "Vi:m");
-            ViServerS = new ServerBase(KernelContext, "Vi:s");
-            LdnServer = new ServerBase(KernelContext, "Ldn");
+            BsdServer = new ServerBase(KernelContext, "BsdServer");
+            FsServer = new ServerBase(KernelContext, "FsServer");
+            HidServer = new ServerBase(KernelContext, "HidServer");
+            NvDrvServer = new ServerBase(KernelContext, "NvservicesServer");
+            TimeServer = new ServerBase(KernelContext, "TimeServer");
+            ViServer = new ServerBase(KernelContext, "ViServerU");
+            ViServerM = new ServerBase(KernelContext, "ViServerM");
+            ViServerS = new ServerBase(KernelContext, "ViServerS");
+            LdnServer = new ServerBase(KernelContext, "LdnServer");
 
             StartNewServices();
         }
@@ -286,7 +282,7 @@ namespace Ryujinx.HLE.HOS
                     ProcessCreationFlags.Is64Bit |
                     ProcessCreationFlags.PoolPartitionSystem;
 
-                ProcessCreationInfo creationInfo = new(service.Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
+                ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities =
                 [
@@ -376,15 +372,6 @@ namespace Ryujinx.HLE.HOS
             }
         }
 
-        public void ScanSkylander(int nfcDeviceId, byte[] data)
-        {
-            if (NfcDevices[nfcDeviceId].State == NfcDeviceState.SearchingForTag)
-            {
-                NfcDevices[nfcDeviceId].State = NfcDeviceState.TagFound;
-                NfcDevices[nfcDeviceId].Data = data;
-            }
-        }
-
         public bool SearchingForAmiibo(out int nfpDeviceId)
         {
             nfpDeviceId = default;
@@ -402,53 +389,6 @@ namespace Ryujinx.HLE.HOS
             return false;
         }
 
-        public bool SearchingForSkylander(out int nfcDeviceId)
-        {
-            nfcDeviceId = default;
-
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.SearchingForTag)
-                {
-                    nfcDeviceId = i;
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public bool HasSkylander(out int nfcDeviceId)
-        {
-            nfcDeviceId = default;
-
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.TagFound)
-                {
-                    nfcDeviceId = i;
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public void RemoveSkylander()
-        {
-            for (int i = 0; i < NfcDevices.Count; i++)
-            {
-                if (NfcDevices[i].State == NfcDeviceState.TagFound)
-                {
-                    NfcDevices[i].State = NfcDeviceState.Initialized;
-                    NfcDevices[i].SignalDeactivate();
-                    Thread.Sleep(100); // NOTE: Simulate skylander scanning delay.
-                }
-            }
-        }
-
         public void SignalDisplayResolutionChange()
         {
             DisplayResolutionChangeEvent.ReadableEvent.Signal();

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs

@@ -44,22 +44,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
 
             return ResultCode.Success;
         }
-        
-        [CommandCmif(1)]
-        // PushOutData(object<nn::am::service::IStorage>)
-        public ResultCode PushOutData(ServiceCtx context)
-        {
-            IStorage appletData = GetObject<IStorage>(context, 0);
-            
-            if (appletData == null || appletData.Data.Length == 0) // is this necessary?
-            {
-                return ResultCode.NullObject;
-            }
-    
-            _appletStandalone.InputData.Enqueue(appletData.Data);
-
-            return ResultCode.Success;
-        }
 
         [CommandCmif(11)]
         // GetLibraryAppletInfo() -> nn::am::service::LibraryAppletInfo

src/Ryujinx.HLE/HOS/Services/Caps/CaptureManager.cs

@@ -1,9 +1,7 @@
-using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.HLE.HOS.Services.Caps.Types;
 using SkiaSharp;
 using System;
-using System.Globalization;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -11,20 +9,16 @@ using System.Security.Cryptography;
 
 namespace Ryujinx.HLE.HOS.Services.Caps
 {
-    internal class CaptureManager
+    class CaptureManager
     {
-        public CaptureManager(Switch device)
-        {
-            _ = device;
-        }
-        private readonly string _sdCardPath = FileSystem.VirtualFileSystem.GetSdCardPath();
+        private readonly string _sdCardPath;
 
         private uint _shimLibraryVersion;
 
-        private const int ScreenshotWidth = 1280;
-        private const int ScreenshotHeight = 720;
-        private const int ScreenshotBytesPerPixel = 4;
-        private const int ScreenshotDataSize = ScreenshotWidth * ScreenshotHeight * ScreenshotBytesPerPixel; // 0x384000
+        public CaptureManager(Switch device)
+        {
+            _sdCardPath = FileSystem.VirtualFileSystem.GetSdCardPath();
+        }
 
         public ResultCode SetShimLibraryVersion(ServiceCtx context)
         {
@@ -59,94 +53,81 @@ namespace Ryujinx.HLE.HOS.Services.Caps
             return resultCode;
         }
 
-        public ResultCode SaveScreenShot(
-            byte[] screenshotData,
-            ulong appletResourceUserId,
-            ulong titleId,
-            out ApplicationAlbumEntry applicationAlbumEntry)
+        public ResultCode SaveScreenShot(byte[] screenshotData, ulong appletResourceUserId, ulong titleId, out ApplicationAlbumEntry applicationAlbumEntry)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceCaps, new
-            {
-                appletResourceUserId,
-                titleId,
-                screenshotDataLength = screenshotData?.Length ?? 0,
-            });
-
             applicationAlbumEntry = default;
 
-            if (screenshotData == null || screenshotData.Length == 0)
+            if (screenshotData.Length == 0)
             {
                 return ResultCode.NullInputBuffer;
             }
 
-            if (screenshotData.Length < ScreenshotDataSize)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid screenshot buffer size 0x{screenshotData.Length:X}; expected at least 0x{ScreenshotDataSize:X}.");
-
-                return ResultCode.NullInputBuffer;
-            }
-
-            DateTime currentDateTime = DateTime.Now;
-
-            applicationAlbumEntry = new ApplicationAlbumEntry()
-            {
-                Size = (ulong)Unsafe.SizeOf<ApplicationAlbumEntry>(),
-                TitleId = titleId,
-                AlbumFileDateTime = new AlbumFileDateTime()
-                {
-                    Year = (ushort)currentDateTime.Year,
-                    Month = (byte)currentDateTime.Month,
-                    Day = (byte)currentDateTime.Day,
-                    Hour = (byte)currentDateTime.Hour,
-                    Minute = (byte)currentDateTime.Minute,
-                    Second = (byte)currentDateTime.Second,
-                    UniqueId = 0,
-                },
-                AlbumStorage = AlbumStorage.Sd,
-                ContentType = ContentType.Screenshot,
-                Padding = new Array5<byte>(),
-                Unknown0x1f = 1,
-            };
-
-            // NOTE: The hex hash is a HMAC-SHA256 (first 32 bytes) using a hardcoded secret key over the titleId, we can simulate it by hashing the titleId instead.
-            string hash = Convert.ToHexString(SHA256.HashData(BitConverter.GetBytes(titleId)))[..0x20];
-
-            string folderPath = Path.Combine(
-                _sdCardPath,
-                "Nintendo",
-                "Album",
-                currentDateTime.Year.ToString("0000", CultureInfo.InvariantCulture),
-                currentDateTime.Month.ToString("00", CultureInfo.InvariantCulture),
-                currentDateTime.Day.ToString("00", CultureInfo.InvariantCulture));
-
-            string filePath = GenerateFilePath(folderPath, applicationAlbumEntry, currentDateTime, hash);
-
-            _ = Directory.CreateDirectory(folderPath);
-
-            while (File.Exists(filePath))
-            {
-                applicationAlbumEntry.AlbumFileDateTime.UniqueId++;
-                filePath = GenerateFilePath(folderPath, applicationAlbumEntry, currentDateTime, hash);
-            }
-
-            using SKBitmap bitmap = new(new SKImageInfo(ScreenshotWidth, ScreenshotHeight, SKColorType.Rgba8888));
-
-            IntPtr pixels = bitmap.GetPixels();
-
-            if (pixels == IntPtr.Zero)
+            /*
+            // NOTE: On our current implementation, appletResourceUserId starts at 0, disable it for now.
+            if (appletResourceUserId == 0)
             {
                 return ResultCode.InvalidArgument;
             }
+            */
 
-            Marshal.Copy(screenshotData, 0, pixels, ScreenshotDataSize);
+            /*
+            // Doesn't occur in our case.
+            if (applicationAlbumEntry == null)
+            {
+                return ResultCode.NullOutputBuffer;
+            }
+            */
 
-            using SKData data = bitmap.Encode(SKEncodedImageFormat.Jpeg, 80);
-            using FileStream file = File.OpenWrite(filePath);
-            data.SaveTo(file);
+            if (screenshotData.Length >= 0x384000)
+            {
+                DateTime currentDateTime = DateTime.Now;
 
-            return ResultCode.Success;
+                applicationAlbumEntry = new ApplicationAlbumEntry()
+                {
+                    Size = (ulong)Unsafe.SizeOf<ApplicationAlbumEntry>(),
+                    TitleId = titleId,
+                    AlbumFileDateTime = new AlbumFileDateTime()
+                    {
+                        Year = (ushort)currentDateTime.Year,
+                        Month = (byte)currentDateTime.Month,
+                        Day = (byte)currentDateTime.Day,
+                        Hour = (byte)currentDateTime.Hour,
+                        Minute = (byte)currentDateTime.Minute,
+                        Second = (byte)currentDateTime.Second,
+                        UniqueId = 0,
+                    },
+                    AlbumStorage = AlbumStorage.Sd,
+                    ContentType = ContentType.Screenshot,
+                    Padding = new Array5<byte>(),
+                    Unknown0x1f = 1,
+                };
+
+                // NOTE: The hex hash is a HMAC-SHA256 (first 32 bytes) using a hardcoded secret key over the titleId, we can simulate it by hashing the titleId instead.
+                string hash = Convert.ToHexString(SHA256.HashData(BitConverter.GetBytes(titleId)))[..0x20];
+                string folderPath = Path.Combine(_sdCardPath, "Nintendo", "Album", currentDateTime.Year.ToString("00"), currentDateTime.Month.ToString("00"), currentDateTime.Day.ToString("00"));
+                string filePath = GenerateFilePath(folderPath, applicationAlbumEntry, currentDateTime, hash);
+
+                // TODO: Handle that using the FS service implementation and return the right error code instead of throwing exceptions.
+                Directory.CreateDirectory(folderPath);
+
+                while (File.Exists(filePath))
+                {
+                    applicationAlbumEntry.AlbumFileDateTime.UniqueId++;
+
+                    filePath = GenerateFilePath(folderPath, applicationAlbumEntry, currentDateTime, hash);
+                }
+
+                // NOTE: The saved JPEG file doesn't have the limitation in the extra EXIF data.
+                using SKBitmap bitmap = new(new SKImageInfo(1280, 720, SKColorType.Rgba8888));
+                Marshal.Copy(screenshotData, 0, bitmap.GetPixels(), screenshotData.Length);
+                using SKData data = bitmap.Encode(SKEncodedImageFormat.Jpeg, 80);
+                using FileStream file = File.OpenWrite(filePath);
+                data.SaveTo(file);
+
+                return ResultCode.Success;
+            }
+
+            return ResultCode.NullInputBuffer;
         }
 
         private string GenerateFilePath(string folderPath, ApplicationAlbumEntry applicationAlbumEntry, DateTime currentDateTime, string hash)

src/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs

@@ -1,19 +1,13 @@
 using Ryujinx.Common;
-using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Caps.Types;
 
 namespace Ryujinx.HLE.HOS.Services.Caps
 {
     [Service("caps:su")] // 6.0.0+
-    internal class IScreenShotApplicationService : IpcService
+    class IScreenShotApplicationService : IpcService
     {
-        private const ulong ScreenshotDataSize = 0x384000;
-        private const ulong ApplicationDataSize = 0x404;
+        public IScreenShotApplicationService(ServiceCtx context) { }
 
-        public IScreenShotApplicationService(ServiceCtx context)
-        {
-            _ = context;
-        }
         [CommandCmif(32)] // 7.0.0+
         // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId)
         public ResultCode SetShimLibraryVersion(ServiceCtx context)
@@ -39,15 +33,6 @@ namespace Ryujinx.HLE.HOS.Services.Caps
             ulong screenshotDataPosition = context.Request.SendBuff[0].Position;
             ulong screenshotDataSize = context.Request.SendBuff[0].Size;
 
-            if (screenshotDataSize < ScreenshotDataSize)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid screenshot buffer size 0x{screenshotDataSize:X}; expected at least 0x{ScreenshotDataSize:X}.");
-
-                return ResultCode.NullInputBuffer;
-            }
-
             byte[] screenshotData = context.Memory.GetSpan(screenshotDataPosition, (int)screenshotDataSize, true).ToArray();
 
             ResultCode resultCode = context.Device.System.CaptureManager.SaveScreenShot(screenshotData, appletResourceUserId, context.Device.Processes.ActiveApplication.ProgramId, out ApplicationAlbumEntry applicationAlbumEntry);
@@ -75,24 +60,6 @@ namespace Ryujinx.HLE.HOS.Services.Caps
             ulong screenshotDataPosition = context.Request.SendBuff[1].Position;
             ulong screenshotDataSize = context.Request.SendBuff[1].Size;
 
-            if (applicationDataSize != ApplicationDataSize)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid ApplicationData size 0x{applicationDataSize:X}; expected 0x{ApplicationDataSize:X}.");
-
-                return ResultCode.InvalidArgument;
-            }
-
-            if (screenshotDataSize < ScreenshotDataSize)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid screenshot buffer size 0x{screenshotDataSize:X}; expected at least 0x{ScreenshotDataSize:X}.");
-
-                return ResultCode.NullInputBuffer;
-            }
-
             // TODO: Parse the application data: At 0x00 it's UserData (Size of 0x400), at 0x404 it's a uint UserDataSize (Always empty for now).
             _ = context.Memory.GetSpan(applicationDataPosition, (int)applicationDataSize).ToArray();
 
@@ -121,23 +88,6 @@ namespace Ryujinx.HLE.HOS.Services.Caps
             ulong screenshotDataPosition = context.Request.SendBuff[1].Position;
             ulong screenshotDataSize = context.Request.SendBuff[1].Size;
 
-            if (userIdListSize != 0x88)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid UserIdList size 0x{userIdListSize:X}; expected 0x88.");
-                return ResultCode.InvalidArgument;
-            }
-
-            if (screenshotDataSize < ScreenshotDataSize)
-            {
-                Logger.Warning?.PrintMsg(
-                    LogClass.ServiceCaps,
-                    $"Invalid screenshot buffer size 0x{screenshotDataSize:X}; expected at least 0x{ScreenshotDataSize:X}.");
-
-                return ResultCode.NullInputBuffer;
-            }
-
             // TODO: Parse the UserIdList.
             _ = context.Memory.GetSpan(userIdListPosition, (int)userIdListSize).ToArray();
 

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs

@@ -56,7 +56,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             _activeCount = 0;
 
             JoyHold = NpadJoyHoldType.Vertical;
-            SixAxisActive = false;
         }
 
         internal ref KEvent GetStyleSetUpdateEvent(PlayerIndex player)
@@ -581,29 +580,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return needUpdateRight;
         }
-        
-        public bool isAtRest(int playerNumber)
-        {
-            ref NpadInternalState currentNpad = ref _device.Hid.SharedMemory.Npads[playerNumber].InternalState;
-
-            if (currentNpad.StyleSet == NpadStyleTag.None)
-            {
-                return true; // it will always be at rest because it cannot move.
-            }
-            
-            ref SixAxisSensorState storage = ref GetSixAxisSensorLifo(ref currentNpad, false).GetCurrentEntryRef();
-                
-            float acceleration = Math.Abs(storage.Acceleration.X)
-                                 + Math.Abs(storage.Acceleration.Y)
-                                 + Math.Abs(storage.Acceleration.Z);
-
-            float angularVelocity = Math.Abs(storage.AngularVelocity.X)
-                                    + Math.Abs(storage.AngularVelocity.Y)
-                                    + Math.Abs(storage.AngularVelocity.Z);
-
-            // TODO: check against config deadzone and add sensitivity setting
-            return ((acceleration <= 1.0F) && (angularVelocity <= 1.0F));
-        }
 
         private void UpdateDisconnectedInputSixAxis(PlayerIndex index)
         {

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -602,33 +602,19 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         }
 
         [CommandCmif(82)]
-        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAtRest
+        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAsRest
         public ResultCode IsSixAxisSensorAtRest(ServiceCtx context)
         {
             int sixAxisSensorHandle = context.RequestData.ReadInt32();
-            
-            // 4 byte struct w/ 4-byte alignment
-            
-            // uint typeValue = (uint) sixAxisSensorHandle;                 // 0x0 	0x4 	TypeValue
-            // uint npadStyleIndex = (uint) sixAxisSensorHandle & 0xff;     // 0x0 	0x1 	NpadStyleIndex
-            int playerNumber = (sixAxisSensorHandle << 8) & 0xff;           // 0x1 	0x1 	PlayerNumber
-            // uint deviceIdx= ((uint) sixAxisSensorHandle << 16) & 0xff;   // 0x2 	0x1 	DeviceIdx 
-            // uint unknown = ((uint) sixAxisSensorHandle << 24) & 0xff;
-            
-            // 32bit sign extension padding -> if = 0, + offset, else - offset
-            
-            // npadStyleIndex = ((npadStyleIndex & 0x8000) == 0) ? npadStyleIndex | 0xFFFF0000 : npadStyleIndex & 0xFFFF0000;
-            // playerNumber = ((playerNumber & 0x8000) == 0) ? playerNumber | 0xFFFF0000 : playerNumber & 0xFFFF0000;
-            // deviceIdx = ((deviceIdx & 0x8000) == 0) ? deviceIdx | 0xFFFF0000 : deviceIdx & 0xFFFF0000;
-            // unknown = ((unknown & 0x8000) == 0) ? unknown | 0xFFFF0000 : unknown & 0xFFFF0000;
-            
             context.RequestData.BaseStream.Position += 4; // Padding
             long appletResourceUserId = context.RequestData.ReadInt64();
-            
-            // TODO: link to context.Device.Hid.Npads.SixAxisActive when properly implemented
-            // We currently do not support stopping or starting SixAxisTracking.
-            
-            context.ResponseData.Write(context.Device.Hid.Npads.isAtRest(playerNumber));
+
+            bool isAtRest = true;
+
+            context.ResponseData.Write(isAtRest);
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, isAtRest });
+
             return ResultCode.Success;
         }
 
@@ -643,7 +629,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             context.ResponseData.Write(_isFirmwareUpdateAvailableForSixAxisSensor);
 
             Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, _isFirmwareUpdateAvailableForSixAxisSensor });
-            
+
             return ResultCode.Success;
         }
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -66,11 +66,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             {
                 if (localCommunicationId == localCommunicationIdChecked)
                 {
-                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"CheckLocalCommumicationIdPermission: Checked!");
                     return true;
                 }
             }
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"CheckLocalCommumicationIdPermission: Check failed!");
+
             return false;
         }
 
@@ -81,7 +80,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             if (_nifmResultCode != ResultCode.Success)
             {
                 context.ResponseData.Write((int)NetworkState.Error);
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetState: _nifmResultCode = {_nifmResultCode.ToString()}");
+
                 return ResultCode.Success;
             }
 
@@ -113,14 +112,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfo: _nifmResultCode = {_nifmResultCode.ToString()}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetState: resultCode = {resultCode.ToString()}");
                 return resultCode;
             }
 
@@ -136,22 +133,18 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             if (_state == NetworkState.StationConnected)
             {
                 networkInfo = _station.NetworkInfo;
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: _station");
             }
             else if (_state == NetworkState.AccessPointCreated)
             {
                 networkInfo = _accessPoint.NetworkInfo;
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: _accessPoint");
             }
             else
             {
                 networkInfo = new NetworkInfo();
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: Invalid state!");
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfoImpl: networkInfo = {networkInfo}");
+
                 return ResultCode.InvalidState;
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfoImpl: networkInfo = {networkInfo}");
             return ResultCode.Success;
         }
 
@@ -203,7 +196,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                     }
                     else
                     {
-                        Logger.NetLog?.Print(LogClass.ServiceLdn, $"Console's LDN IP is \"{unicastAddress.Address}\".");
+                        Logger.Info?.Print(LogClass.ServiceLdn, $"Console's LDN IP is \"{unicastAddress.Address}\".");
 
                         context.ResponseData.Write(NetworkHelpers.ConvertIpv4Address(unicastAddress.Address));
                         context.ResponseData.Write(NetworkHelpers.ConvertIpv4Address(unicastAddress.IPv4Mask));
@@ -211,7 +204,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
                 else
                 {
-                    Logger.NetLog?.Print(LogClass.ServiceLdn, $"LDN obtained proxy IP.");
+                    Logger.Info?.Print(LogClass.ServiceLdn, $"LDN obtained proxy IP.");
 
                     context.ResponseData.Write(config.ProxyIp);
                     context.ResponseData.Write(config.ProxySubnetMask);
@@ -232,7 +225,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             // NOTE: Returns ResultCode.InvalidArgument if _disconnectReason is null, doesn't occur in our case.
 
             context.ResponseData.Write((short)_disconnectReason);
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetDisconnectReason: {_disconnectReason}");
+
             return ResultCode.Success;
         }
 
@@ -252,14 +245,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -270,8 +261,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             };
 
             context.ResponseData.WriteStruct(securityParameter);
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: securityParameter = {securityParameter}");
+
             return ResultCode.Success;
         }
 
@@ -281,14 +271,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -302,8 +290,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             };
 
             context.ResponseData.WriteStruct(networkConfig);
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: networkConfig = {networkConfig}");
 
             return ResultCode.Success;
         }
@@ -334,14 +320,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkInfoLatestUpdate: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkInfoLatestUpdate: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -392,7 +376,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -415,7 +398,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (scanFilter.Ssid.Length <= 31)
                             {
-                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
                                 return resultCode;
                             }
                         }
@@ -424,13 +406,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (scanFilterFlag > ScanFilterFlag.All)
                             {
-                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
                                 return resultCode;
                             }
 
                             if (_state - 3 >= NetworkState.AccessPoint)
                             {
-                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ScanImpl: Invalid state!");
                                 resultCode = ResultCode.InvalidState;
                             }
                             else
@@ -455,8 +435,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                     }
                 }
             }
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
+
             return resultCode;
         }
 
@@ -481,7 +460,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanInternal: availableGames = {availableGames}");
             return ResultCode.Success;
         }
 
@@ -509,37 +487,17 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             return ResultCode.Success;
         }
 
-        [CommandCmif(106)] // 20.0.0+
-        // SetProtocol
-        public ResultCode SetProtocol(ServiceCtx context)
-        {
-            uint protocolValue =  context.RequestData.ReadUInt32();
-
-            // On NX only input value 1 or 3 is allowed, with an error being thrown otherwise.
-
-            if (protocolValue != 1 && protocolValue != 3)
-            {
-                throw new ArgumentException($"{GetType().FullName}: Protocol value is not 1 or 3!! Protocol value: {protocolValue}");
-            }
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetProtocol: protocolValue = {protocolValue}");
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn, new { protocolValue});
-            return ResultCode.Success;
-        }
-
         [CommandCmif(200)]
         // OpenAccessPoint()
         public ResultCode OpenAccessPoint(ServiceCtx context)
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenAccessPoint: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.Initialized)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "OpenAccessPoint: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -561,7 +519,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CloseAccessPoint: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -571,7 +528,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             }
             else
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseAccessPoint: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -621,13 +577,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             bool isLocalCommunicationIdValid = CheckLocalCommunicationIdPermission(context, (ulong)networkConfig.IntentId.LocalCommunicationId);
             if (!isLocalCommunicationIdValid && NetworkClient.NeedsRealId)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CreateNetworkImpl: Invalid object!");
                 return ResultCode.InvalidObject;
             }
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -656,22 +610,16 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                                     AddressList addressList = MemoryMarshal.Cast<byte, AddressList>(addressListBytes)[0];
 
                                     _accessPoint.CreateNetworkPrivate(securityConfig, securityParameter, userConfig, networkConfig, addressList);
-                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: Created private network! " +
-                                        $"| securityConfig = {securityConfig} | securityParameter = {securityParameter} " +
-                                        $"| userConfig = {userConfig} | networkConfig = {networkConfig} | addressList = {addressList}");
                                 }
                                 else
                                 {
                                     _accessPoint.CreateNetwork(securityConfig, userConfig, networkConfig);
-                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: Created network! " +
-                                        $"| securityConfig = {securityConfig} | userConfig = {userConfig} | networkConfig = {networkConfig}");
                                 }
 
                                 return ResultCode.Success;
                             }
                             else
                             {
-                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CreateNetworkImpl: Invalid state!");
                                 return ResultCode.InvalidState;
                             }
                         }
@@ -693,7 +641,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DestroyNetworkImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -710,11 +657,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
                 CloseAccessPoint();
 
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DestroyNetworkImpl: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DestroyNetworkImpl: Invalid argument!");
             return ResultCode.InvalidArgument;
         }
 
@@ -731,17 +676,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"RejectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.AccessPointCreated)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "RejectImpl: Invalid state!");
                 return ResultCode.InvalidState; // Must be network host to reject nodes.
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"RejectImpl: disconnectReason = {disconnectReason} | nodeId = {nodeId}");
             return NetworkClient.Reject(disconnectReason, nodeId);
         }
 
@@ -753,13 +695,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetAdvertiseData: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (bufferSize is 0 or > LdnConst.AdvertiseDataSizeMax)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetAdvertiseData: Invalid argument!");
                 return ResultCode.InvalidArgument;
             }
 
@@ -768,12 +708,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 byte[] advertiseData = new byte[bufferSize];
 
                 context.Memory.Read(bufferPosition, advertiseData);
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetAdvertiseData: advertiseData = {advertiseData}");
+
                 return _accessPoint.SetAdvertiseData(advertiseData);
             }
             else
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetAdvertiseData: Invalid state!");
                 return ResultCode.InvalidState;
             }
         }
@@ -786,24 +725,20 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetStationAcceptPolicy: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (acceptPolicy > AcceptPolicy.WhiteList)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetStationAcceptPolicy: Invalid argument!");
                 return ResultCode.InvalidArgument;
             }
 
             if (_state is NetworkState.AccessPoint or NetworkState.AccessPointCreated)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetStationAcceptPolicy: acceptPolicy = {acceptPolicy}");
                 return _accessPoint.SetStationAcceptPolicy(acceptPolicy);
             }
             else
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetStationAcceptPolicy: Invalid state!");
                 return ResultCode.InvalidState;
             }
         }
@@ -814,7 +749,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"AddAcceptFilterEntry: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -829,7 +763,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ClearAcceptFilter: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -844,13 +777,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenStation: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.Initialized)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "OpenStation: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -863,8 +794,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             // NOTE: Calls nifm service and returns related result codes.
             //       Since we use our own implementation we can return ResultCode.Success.
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenStation: _station = {_station}");
 
             return ResultCode.Success;
         }
@@ -875,7 +804,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CloseStation: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -885,13 +813,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             }
             else
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseStation: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
             SetState(NetworkState.Initialized);
-            
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseStation: Closed.");
+
             return ResultCode.Success;
         }
 
@@ -956,13 +882,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             bool isLocalCommunicationIdValid = CheckLocalCommunicationIdPermission(context, (ulong)networkInfo.NetworkId.IntentId.LocalCommunicationId);
             if (!isLocalCommunicationIdValid && NetworkClient.NeedsRealId)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ConnectImpl: Invalid object!");
                 return ResultCode.InvalidObject;
             }
 
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -982,7 +906,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (_state != NetworkState.Station)
                             {
-                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ConnectImpl: Invalid state!");
                                 resultCode = ResultCode.InvalidState;
                             }
                             else
@@ -990,16 +913,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                                 if (isPrivate)
                                 {
                                     resultCode = _station.ConnectPrivate(securityConfig, securityParameter, userConfig, localCommunicationVersion, optionUnknown, networkConfig);
-                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: Private connection established! " +
-                                        $"| securityConfig = {securityConfig} | securityParameter = {securityParameter} | userConfig = {userConfig} " +
-                                        $"| localCommunicationVersion = {localCommunicationVersion} | optionUnknown = {optionUnknown} | networkConfig = {networkConfig}");
                                 }
                                 else
                                 {
                                     resultCode = _station.Connect(securityConfig, userConfig, localCommunicationVersion, optionUnknown, networkInfo);
-                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: Connection established! " +
-                                        $"| securityConfig = {securityConfig} | userConfig = {userConfig} " +
-                                        $"| localCommunicationVersion = {localCommunicationVersion} | optionUnknown = {optionUnknown} | networkConfig = {networkConfig}");
                                 }
                             }
                         }
@@ -1007,8 +924,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: resultCode = {resultCode}");
-
             return resultCode;
         }
 
@@ -1023,7 +938,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DisconnectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -1037,17 +951,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
                     _disconnectReason = disconnectReason;
 
-                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DisconnectImpl: _disconnectReason = {_disconnectReason}");
                     return ResultCode.Success;
                 }
 
                 CloseStation();
 
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DisconnectImpl: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DisconnectImpl: Invalid argument!");
             return ResultCode.InvalidArgument;
         }
 
@@ -1064,7 +975,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
-                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"Finalize: _disconnectReason = {_disconnectReason}");
                 return _nifmResultCode;
             }
 
@@ -1081,13 +991,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 _stateChangeEventHandle = 0;
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"Finalize: resultCode = {resultCode}");
             return resultCode;
         }
 
         private ResultCode FinalizeImpl(bool isCausedBySystem)
         {
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "FinalizeImpl");
             DisconnectReason disconnectReason;
 
             switch (_state)
@@ -1211,6 +1119,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         NetworkClient.SetGameVersion(context.Device.Processes.ActiveApplication.ApplicationControlProperties.DisplayVersion);
 
                         resultCode = ResultCode.Success;
+
                         _nifmResultCode = resultCode;
 
                         SetState(NetworkState.Initialized);
@@ -1224,7 +1133,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"InitializeImpl: resultCode = {resultCode}");
             return resultCode;
         }
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -132,7 +132,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnConnected()
         {
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client connected a new session with Id {Id}");
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client connected a new session with Id {Id}");
 
             UpdatePassphraseIfNeeded();
 
@@ -141,7 +141,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnDisconnected()
         {
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client disconnected a session with Id {Id}");
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client disconnected a session with Id {Id}");
 
             _passphrase = null;
 
@@ -174,7 +174,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnError(SocketError error)
         {
-            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client caught an error with code {error}");
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client caught an error with code {error}");
 
             _error.Set();
         }
@@ -428,7 +428,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
                     }
                     else
                     {
-                        Logger.NetLog?.Print(LogClass.ServiceLdn, $"Created a wireless P2P network on port {request.ExternalProxyPort}.");
+                        Logger.Info?.Print(LogClass.ServiceLdn, $"Created a wireless P2P network on port {request.ExternalProxyPort}.");
                         _hostedProxy.Start();
 
                         (_, UnicastIPAddressInformation unicastAddress) = NetworkHelpers.GetLocalInterface();

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/Station.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.HLE.HOS.Services.Ldn.Types;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.Types;
@@ -37,12 +36,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 if (Connected)
                 {
                     _parent.SetState(NetworkState.StationConnected);
-                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"NetworkChanged: {NetworkInfo}");
                 }
                 else
                 {
                     _parent.SetDisconnectReason(e.DisconnectReasonOrDefault(DisconnectReason.DestroyedByUser));
-                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"NetworkChanged: Disconnected (DestroyedByUser)");
                 }
             }
             else

src/Ryujinx.HLE/HOS/Services/Mii/DatabaseImpl.cs

@@ -81,10 +81,8 @@ namespace Ryujinx.HLE.HOS.Services.Mii
             return ResultCode.Success;
         }
 
-        public ResultCode UpdateLatest<T>(DatabaseSessionMetadata metadata, T oldMiiData, SourceFlag flag, out T newMiiData) where T : unmanaged, IStoredData<T>
+        public ResultCode UpdateLatest<T>(DatabaseSessionMetadata metadata, IStoredData<T> oldMiiData, SourceFlag flag, IStoredData<T> newMiiData) where T : unmanaged
         {
-            newMiiData = default;
-
             if (!flag.HasFlag(SourceFlag.Database))
             {
                 return ResultCode.NotFound;
@@ -108,7 +106,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii
 
                 newMiiData.SetFromStoreData(storeData);
 
-                if (oldMiiData.Equals(newMiiData))
+                if (oldMiiData == newMiiData)
                 {
                     return ResultCode.NotUpdated;
                 }
@@ -288,18 +286,6 @@ namespace Ryujinx.HLE.HOS.Services.Mii
             return result;
         }
 
-        public ResultCode Append(DatabaseSessionMetadata metadata, CharInfo charInfo)
-        {
-            ResultCode result = _miiDatabase.Append(metadata, _utilityImpl, charInfo);
-
-            if (result == ResultCode.Success)
-            {
-                result = _miiDatabase.SaveDatabase();
-            }
-
-            return result;
-        }
-
         public ResultCode ConvertCharInfoToCoreData(CharInfo charInfo, out CoreData coreData)
         {
             coreData = new CoreData();

src/Ryujinx.HLE/HOS/Services/Mii/MiiDatabaseManager.cs

@@ -449,32 +449,6 @@ namespace Ryujinx.HLE.HOS.Services.Mii
             return ResultCode.Success;
         }
 
-        public ResultCode Append(DatabaseSessionMetadata metadata, UtilityImpl utilityImpl, CharInfo charInfo)
-        {
-            if (!charInfo.IsValid())
-            {
-                return ResultCode.InvalidCharInfo;
-            }
-
-            if (charInfo.Type == 1)
-            {
-                return ResultCode.InvalidOperationOnSpecialMii;
-            }
-
-            CoreData coreData = new();
-            coreData.SetFromCharInfo(charInfo);
-
-            StoreData storeData;
-
-            do
-            {
-                storeData = StoreData.BuildFromCoreData(utilityImpl, coreData);
-            }
-            while (_database.GetIndexByCreatorId(out _, storeData.CreateId));
-
-            return AddOrReplace(metadata, storeData);
-        }
-
         public ResultCode Delete(DatabaseSessionMetadata metadata, CreateId createId)
         {
             if (!_database.GetIndexByCreatorId(out int index, createId))

src/Ryujinx.HLE/HOS/Services/Mii/StaticService/DatabaseServiceImpl.cs

@@ -54,7 +54,9 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService
 
         protected override ResultCode UpdateLatest(CharInfo oldCharInfo, SourceFlag flag, out CharInfo newCharInfo)
         {
-            return _database.UpdateLatest(_metadata, oldCharInfo, flag, out newCharInfo);
+            newCharInfo = default;
+
+            return _database.UpdateLatest(_metadata, oldCharInfo, flag, newCharInfo);
         }
 
         protected override ResultCode BuildRandom(Age age, Gender gender, Race race, out CharInfo charInfo)
@@ -111,14 +113,14 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService
 
         protected override ResultCode UpdateLatest1(StoreData oldStoreData, SourceFlag flag, out StoreData newStoreData)
         {
+            newStoreData = default;
+
             if (!_isSystem)
             {
-                newStoreData = default;
-
                 return ResultCode.PermissionDenied;
             }
 
-            return _database.UpdateLatest(_metadata, oldStoreData, flag, out newStoreData);
+            return _database.UpdateLatest(_metadata, oldStoreData, flag, newStoreData);
         }
 
         protected override ResultCode FindIndex(CreateId createId, bool isSpecial, out int index)
@@ -260,10 +262,5 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService
         {
             return _database.ConvertCharInfoToCoreData(charInfo, out coreData);
         }
-
-        protected override ResultCode Append(CharInfo charInfo)
-        {
-            return _database.Append(_metadata, charInfo);
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Mii/StaticService/IDatabaseService.cs

@@ -340,15 +340,6 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService
             return result;
         }
 
-        [CommandCmif(26)] // 10.2.0+
-        // Append(nn::mii::CharInfo char_info)
-        public ResultCode Append(ServiceCtx context)
-        {
-            CharInfo charInfo = context.RequestData.ReadStruct<CharInfo>();
-
-            return Append(charInfo);
-        }
-
         private Span<byte> CreateByteSpanFromBuffer(ServiceCtx context, IpcBuffDesc ipcBuff, bool isOutput)
         {
             byte[] rawData;
@@ -430,7 +421,5 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService
         protected abstract ResultCode ConvertCoreDataToCharInfo(CoreData coreData, out CharInfo charInfo);
 
         protected abstract ResultCode ConvertCharInfoToCoreData(CharInfo charInfo, out CoreData coreData);
-
-        protected abstract ResultCode Append(CharInfo charInfo);
     }
 }

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/IUserManager.cs

@@ -1,19 +1,8 @@
-using Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager;
-
 namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare
 {
     [Service("nfc:mf:u")]
     class IUserManager : IpcService
     {
         public IUserManager(ServiceCtx context) { }
-
-        [CommandCmif(0)]
-        // CreateUserInterface() -> object<nn::nfc::mf::IUser>
-        public ResultCode CreateUserInterface(ServiceCtx context)
-        {
-            MakeObject(context, new IMifare());
-
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/IMifare.cs

@@ -1,477 +0,0 @@
-using Ryujinx.Common.Memory;
-using Ryujinx.Cpu;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Hid;
-using Ryujinx.HLE.HOS.Services.Hid.HidServer;
-using Ryujinx.Horizon.Common;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    class IMifare : IpcService
-    {
-        private State _state;
-
-        private KEvent _availabilityChangeEvent;
-
-        private CancellationTokenSource _cancelTokenSource;
-
-        public IMifare()
-        {
-            _state = State.NonInitialized;
-        }
-
-        [CommandCmif(0)]
-        public ResultCode Initialize(ServiceCtx context)
-        {
-            _state = State.Initialized;
-
-            NfcDevice devicePlayer1 = new()
-            {
-                NpadIdType = NpadIdType.Player1,
-                Handle = HidUtils.GetIndexFromNpadIdType(NpadIdType.Player1),
-                State = NfcDeviceState.Initialized,
-            };
-
-            context.Device.System.NfcDevices.Add(devicePlayer1);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1)]
-        public ResultCode Finalize(ServiceCtx context)
-        {
-            if (_state == State.Initialized)
-            {
-                _cancelTokenSource?.Cancel();
-
-                // NOTE: All events are destroyed here.
-                context.Device.System.NfcDevices.Clear();
-
-                _state = State.NonInitialized;
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(2)]
-        public ResultCode GetListDevices(ServiceCtx context)
-        {
-            if (context.Request.RecvListBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            ulong outputPosition = context.Request.RecvListBuff[0].Position;
-            ulong outputSize = context.Request.RecvListBuff[0].Size;
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, (int)outputSize);
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                context.Memory.Write(outputPosition + ((uint)i * sizeof(long)), (uint)context.Device.System.NfcDevices[i].Handle);
-            }
-
-            context.ResponseData.Write(context.Device.System.NfcDevices.Count);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(3)]
-        public ResultCode StartDetection(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].State = NfcDeviceState.SearchingForTag;
-
-                    break;
-                }
-            }
-
-            _cancelTokenSource = new CancellationTokenSource();
-
-            Task.Run(() =>
-            {
-                while (true)
-                {
-                    if (_cancelTokenSource.Token.IsCancellationRequested)
-                    {
-                        break;
-                    }
-
-                    for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-                    {
-                        if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagFound)
-                        {
-                            context.Device.System.NfcDevices[i].SignalActivate();
-                            Thread.Sleep(125); // NOTE: Simulate skylander scanning delay.
-
-                            break;
-                        }
-                    }
-                }
-            }, _cancelTokenSource.Token);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(4)]
-        public ResultCode StopDetection(ServiceCtx context)
-        {
-            _cancelTokenSource?.Cancel();
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].State = NfcDeviceState.Initialized;
-                    Array.Clear(context.Device.System.NfcDevices[i].Data);
-                    context.Device.System.NfcDevices[i].SignalDeactivate();
-
-                    break;
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(5)]
-        public ResultCode ReadMifare(ServiceCtx context)
-        {
-            if (context.Request.ReceiveBuff.Count == 0 || context.Request.SendBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            ulong outputPosition = context.Request.ReceiveBuff[0].Position;
-            ulong outputSize = context.Request.ReceiveBuff[0].Size;
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, (int)outputSize);
-
-            ulong inputPosition = context.Request.SendBuff[0].Position;
-            ulong inputSize = context.Request.SendBuff[0].Size;
-
-            byte[] readBlockParameter = new byte[inputSize];
-
-            context.Memory.Read(inputPosition, readBlockParameter);
-
-            var span = MemoryMarshal.Cast<byte, NfcMifareReadBlockParameter>(readBlockParameter);
-            var list = new List<NfcMifareReadBlockParameter>(span.Length);
-
-            foreach (var item in span)
-                list.Add(item);
-
-            Thread.Sleep(125 * list.Count); // NOTE: Simulate skylander scanning delay.
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        return ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        for (int p = 0; p < list.Count; p++)
-                        {
-                            NfcMifareReadBlockData blockData = new()
-                            {
-                                SectorNumber = list[p].SectorNumber,
-                                Reserved = new Array7<byte>(),
-                            };
-                            byte[] data = new byte[16];
-
-                            switch (list[p].SectorKey.MifareCommand)
-                            {
-                                case NfcMifareCommand.NfcMifareCommand_Read:
-                                case NfcMifareCommand.NfcMifareCommand_AuthA:
-                                    if (IsCurrentBlockKeyBlock(list[p].SectorNumber))
-                                    {
-                                        Array.Copy(context.Device.System.NfcDevices[i].Data, (16 * list[p].SectorNumber) + 6, data, 6, 4);
-                                    }
-                                    else
-                                    {
-                                        Array.Copy(context.Device.System.NfcDevices[i].Data, 16 * list[p].SectorNumber, data, 0, 16);
-                                    }
-                                    data.CopyTo(blockData.Data.AsSpan());
-                                    context.Memory.Write(outputPosition + ((uint)(p * Unsafe.SizeOf<NfcMifareReadBlockData>())), blockData);
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(6)]
-        public ResultCode WriteMifare(ServiceCtx context)
-        {
-            if (context.Request.SendBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            ulong inputPosition = context.Request.SendBuff[0].Position;
-            ulong inputSize = context.Request.SendBuff[0].Size;
-
-            byte[] writeBlockParameter = new byte[inputSize];
-
-            context.Memory.Read(inputPosition, writeBlockParameter);
-
-            var span = MemoryMarshal.Cast<byte, NfcMifareWriteBlockParameter>(writeBlockParameter);
-            var list = new List<NfcMifareWriteBlockParameter>(span.Length);
-
-            foreach (var item in span)
-                list.Add(item);
-
-            Thread.Sleep(125 * list.Count); // NOTE: Simulate skylander scanning delay.
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        return ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        for (int p = 0; p < list.Count; p++)
-                        {
-                            switch (list[p].SectorKey.MifareCommand)
-                            {
-                                case NfcMifareCommand.NfcMifareCommand_Write:
-                                case NfcMifareCommand.NfcMifareCommand_AuthA:
-                                    list[p].Data.AsSpan().CopyTo(context.Device.System.NfcDevices[i].Data.AsSpan(list[p].SectorNumber * 16, 16));
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(7)]
-        public ResultCode GetTagInfo(ServiceCtx context)
-        {
-            ResultCode resultCode = ResultCode.Success;
-
-            if (context.Request.RecvListBuff.Count == 0)
-            {
-                return ResultCode.WrongArgument;
-            }
-
-            ulong outputPosition = context.Request.RecvListBuff[0].Position;
-
-            context.Response.PtrBuff[0] = context.Response.PtrBuff[0].WithSize((uint)Marshal.SizeOf<TagInfo>());
-
-            MemoryHelper.FillWithZeros(context.Memory, outputPosition, Marshal.SizeOf<TagInfo>());
-
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            if (context.Device.System.NfcDevices.Count == 0)
-            {
-                return ResultCode.DeviceNotFound;
-            }
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if (context.Device.System.NfcDevices[i].Handle == (PlayerIndex)deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagRemoved)
-                    {
-                        resultCode = ResultCode.TagNotFound;
-                    }
-                    else
-                    {
-                        if (context.Device.System.NfcDevices[i].State == NfcDeviceState.TagMounted || context.Device.System.NfcDevices[i].State == NfcDeviceState.TagFound)
-                        {
-                            TagInfo tagInfo = new()
-                            {
-                                UuidLength = 4,
-                                Reserved1 = new Array21<byte>(),
-                                Protocol = (uint)NfcProtocol.NfcProtocol_TypeA, // Type A Protocol
-                                TagType = (uint)NfcTagType.NfcTagType_Mifare, // Mifare Type
-                                Reserved2 = new Array6<byte>(),
-                            };
-
-                            byte[] uuid = new byte[4];
-
-                            Array.Copy(context.Device.System.NfcDevices[i].Data, 0, uuid, 0, 4);
-
-                            uuid.CopyTo(tagInfo.Uuid.AsSpan());
-
-                            context.Memory.Write(outputPosition, tagInfo);
-
-                            resultCode = ResultCode.Success;
-                        }
-                        else
-                        {
-                            resultCode = ResultCode.WrongDeviceState;
-                        }
-                    }
-
-                    break;
-                }
-            }
-
-            return resultCode;
-        }
-
-        [CommandCmif(8)]
-        public ResultCode AttachActivateEvent(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].ActivateEvent = new KEvent(context.Device.System.KernelContext);
-
-                    if (context.Process.HandleTable.GenerateHandle(context.Device.System.NfcDevices[i].ActivateEvent.ReadableEvent, out int activateEventHandle) != Result.Success)
-                    {
-                        throw new InvalidOperationException("Out of handles!");
-                    }
-
-                    context.Response.HandleDesc = IpcHandleDesc.MakeCopy(activateEventHandle);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(9)]
-        public ResultCode AttachDeactivateEvent(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.Device.System.NfcDevices[i].DeactivateEvent = new KEvent(context.Device.System.KernelContext);
-
-                    if (context.Process.HandleTable.GenerateHandle(context.Device.System.NfcDevices[i].DeactivateEvent.ReadableEvent, out int deactivateEventHandle) != Result.Success)
-                    {
-                        throw new InvalidOperationException("Out of handles!");
-                    }
-
-                    context.Response.HandleDesc = IpcHandleDesc.MakeCopy(deactivateEventHandle);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(10)]
-        public ResultCode GetState(ServiceCtx context)
-        {
-            context.ResponseData.Write((int)_state);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(11)]
-        public ResultCode GetDeviceState(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    if (context.Device.System.NfcDevices[i].State > NfcDeviceState.Finalized)
-                    {
-                        throw new InvalidOperationException($"{nameof(context.Device.System.NfcDevices)} contains an invalid state for device {i}: {context.Device.System.NfcDevices[i].State}");
-                    }
-                    context.ResponseData.Write((uint)context.Device.System.NfcDevices[i].State);
-
-                    return ResultCode.Success;
-                }
-            }
-
-            context.ResponseData.Write((uint)NfcDeviceState.Unavailable);
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(12)]
-        public ResultCode GetNpadId(ServiceCtx context)
-        {
-            uint deviceHandle = (uint)context.RequestData.ReadUInt64();
-
-            for (int i = 0; i < context.Device.System.NfcDevices.Count; i++)
-            {
-                if ((uint)context.Device.System.NfcDevices[i].Handle == deviceHandle)
-                {
-                    context.ResponseData.Write((uint)HidUtils.GetNpadIdTypeFromIndex(context.Device.System.NfcDevices[i].Handle));
-
-                    return ResultCode.Success;
-                }
-            }
-
-            return ResultCode.DeviceNotFound;
-        }
-
-        [CommandCmif(13)]
-        public ResultCode AttachAvailabilityChangeEvent(ServiceCtx context)
-        {
-            _availabilityChangeEvent = new KEvent(context.Device.System.KernelContext);
-
-            if (context.Process.HandleTable.GenerateHandle(_availabilityChangeEvent.ReadableEvent, out int availabilityChangeEventHandle) != Result.Success)
-            {
-                throw new InvalidOperationException("Out of handles!");
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(availabilityChangeEventHandle);
-
-            return ResultCode.Success;
-        }
-
-        private bool IsCurrentBlockKeyBlock(byte block)
-        {
-            return ((block + 1) % 4) == 0;
-        }
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcDevice.cs

@@ -1,21 +0,0 @@
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Hid;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    class NfcDevice
-    {
-        public KEvent ActivateEvent;
-        public KEvent DeactivateEvent;
-
-        public void SignalActivate() => ActivateEvent.ReadableEvent.Signal();
-        public void SignalDeactivate() => DeactivateEvent.ReadableEvent.Signal();
-
-        public NfcDeviceState State = NfcDeviceState.Unavailable;
-
-        public PlayerIndex Handle;
-        public NpadIdType NpadIdType;
-
-        public byte[] Data;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareCommand.cs

@@ -1,14 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcMifareCommand : byte
-    {
-        NfcMifareCommand_Read = 0x30,
-        NfcMifareCommand_AuthA = 0x60,
-        NfcMifareCommand_AuthB = 0x61,
-        NfcMifareCommand_Write = 0xA0,
-        NfcMifareCommand_Transfer = 0xB0,
-        NfcMifareCommand_Decrement = 0xC0,
-        NfcMifareCommand_Increment = 0xC1,
-        NfcMifareCommand_Store = 0xC2,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareReadBlockData.cs

@@ -1,13 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x18)]
-    struct NfcMifareReadBlockData
-    {
-        public Array16<byte> Data;
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareReadBlockParameter.cs

@@ -1,13 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x18)]
-    struct NfcMifareReadBlockParameter
-    {
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-        public NfcSectorKey SectorKey;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcMifareWriteBlockParameter.cs

@@ -1,14 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x28)]
-    struct NfcMifareWriteBlockParameter
-    {
-        public Array16<byte> Data;
-        public byte SectorNumber;
-        public Array7<byte> Reserved;
-        public NfcSectorKey SectorKey;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcProtocol.cs

@@ -1,11 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcProtocol : byte
-    {
-        NfcProtocol_None = 0b_0000_0000,
-        NfcProtocol_TypeA = 0b_0000_0001, ///< ISO14443A
-        NfcProtocol_TypeB = 0b_0000_0010, ///< ISO14443B
-        NfcProtocol_TypeF = 0b_0000_0100, ///< Sony FeliCa
-        NfcProtocol_All = 0xFF,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcSectorKey.cs

@@ -1,16 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x10)]
-    struct NfcSectorKey
-    {
-        public NfcMifareCommand MifareCommand;
-        public byte Unknown;
-        public Array6<byte> Reserved1;
-        public Array6<byte> SectorKey;
-        public Array2<byte> Reserved2;
-
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfcTagType.cs

@@ -1,15 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcTagType : byte
-    {
-        NfcTagType_None = 0b_0000_0000,
-        NfcTagType_Type1 = 0b_0000_0001, ///< ISO14443A RW. Topaz
-        NfcTagType_Type2 = 0b_0000_0010, ///< ISO14443A RW. Ultralight, NTAGX, ST25TN
-        NfcTagType_Type3 = 0b_0000_0100, ///< ISO14443A RW/RO. Sony FeliCa
-        NfcTagType_Type4A = 0b_0000_1000, ///< ISO14443A RW/RO. DESFire
-        NfcTagType_Type4B = 0b_0001_0000, ///< ISO14443B RW/RO. DESFire
-        NfcTagType_Type5 = 0b_0010_0000, ///< ISO15693 RW/RO. SLI, SLIX, ST25TV
-        NfcTagType_Mifare = 0b_0100_0000, ///< Mifare clasic. Skylanders
-        NfcTagType_All = 0xFF,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/NfpDeviceState.cs

@@ -1,13 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum NfcDeviceState : byte
-    {
-        Initialized = 0,
-        SearchingForTag = 1,
-        TagFound = 2,
-        TagRemoved = 3,
-        TagMounted = 4,
-        Unavailable = 5,
-        Finalized = 6,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/State.cs

@@ -1,8 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    enum State
-    {
-        NonInitialized,
-        Initialized,
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/MifareManager/Types/TagInfo.cs

@@ -1,16 +0,0 @@
-using Ryujinx.Common.Memory;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare.MifareManager
-{
-    [StructLayout(LayoutKind.Sequential, Size = 0x58)]
-    struct TagInfo
-    {
-        public Array10<byte> Uuid;
-        public byte UuidLength;
-        public Array21<byte> Reserved1;
-        public uint Protocol;
-        public uint TagType;
-        public Array6<byte> Reserved2;
-    }
-}

src/Ryujinx.HLE/HOS/Services/Nfc/Mifare/ResultCode.cs

@@ -1,17 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nfc.Mifare
-{
-    public enum ResultCode
-    {
-        ModuleId = 161,
-        ErrorCodeShift = 9,
-
-        Success = 0,
-
-        DeviceNotFound = (64 << ErrorCodeShift) | ModuleId, // 0x80A1
-        WrongArgument = (65 << ErrorCodeShift) | ModuleId, // 0x82A1
-        WrongDeviceState = (73 << ErrorCodeShift) | ModuleId, // 0x92A1
-        NfcDisabled = (80 << ErrorCodeShift) | ModuleId, // 0xA0A1
-        TagNotFound = (97 << ErrorCodeShift) | ModuleId, // 0xC2A1
-        MifareAccessError = (288 << ErrorCodeShift) | ModuleId, // 0x240a1
-    }
-}

src/Ryujinx.HLE/HOS/Services/Notification/INotificationServices.cs

@@ -1,24 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Notification
-{
-    [Service("notif:s")] // 9.0.0+
-    class INotificationServices : IpcService
-    {
-        public INotificationServices(ServiceCtx context) { }
-        
-        [CommandCmif(1000)] // 9.0.0+
-        // GetNotificationCount() -> nn::notification::server::INotificationSystemEventAccessor
-        public ResultCode GetNotificationCount(ServiceCtx context)
-        {
-            MakeObject(context, new INotificationSystemEventAccessor(context));
-            return ResultCode.Success;
-        }
-        
-        [CommandCmif(1040)] // 9.0.0+
-        // GetNotificationSendingNotifier() -> nn::notification::server::INotificationSystemEventAccessor
-        public ResultCode GetNotificationSendingNotifier(ServiceCtx context)
-        {
-            MakeObject(context, new INotificationSystemEventAccessor(context));
-            return ResultCode.Success;
-        }
-    }
-}

src/Ryujinx.HLE/HOS/Services/Notification/INotificationServicesForApplication.cs

@@ -1,33 +1,8 @@
-using Ryujinx.Common.Logging;
-
 namespace Ryujinx.HLE.HOS.Services.Notification
 {
     [Service("notif:a")] // 9.0.0+
     class INotificationServicesForApplication : IpcService
     {
         public INotificationServicesForApplication(ServiceCtx context) { }
-        
-        // Leaving this here since I can never find it: https://switchbrew.org/wiki/Glue_services
-        
-        [CommandCmif(520)] // 9.0.0+
-        // ListAlarmSettings(nn::arp::ApplicationCertificate) -> s32 AlarmSettingsCount
-        public ResultCode ListAlarmSettings(ServiceCtx context)
-        {
-            // TO-DO: Currently just returns 0. Should read in an ApplicationCertificate.
-            int alarmSettingsCount = 0;
-            context.ResponseData.Write(alarmSettingsCount);
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1000)] // 9.0.0+
-        // Initialize(PID-descriptor, u64 pid_reserved)
-        public ResultCode Intialize(ServiceCtx context)
-        {
-            ulong pid = context.Request.HandleDesc.PId;
-            context.RequestData.ReadUInt64(); // pid placeholder, zero
-            
-            Logger.Stub?.PrintStub(LogClass.ServiceNotification, new { pid });
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Notification/INotificationServicesForSystem.cs

@@ -0,0 +1,8 @@
+namespace Ryujinx.HLE.HOS.Services.Notification
+{
+    [Service("notif:s")] // 9.0.0+
+    class INotificationServicesForSystem : IpcService
+    {
+        public INotificationServicesForSystem(ServiceCtx context) { }
+    }
+}

src/Ryujinx.HLE/HOS/Services/Notification/INotificationSystemEventAccessor.cs

@@ -1,32 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.Horizon.Common;
-using System;
-
-namespace Ryujinx.HLE.HOS.Services.Notification
-{
-    class INotificationSystemEventAccessor : IpcService
-    {
-
-        private readonly KEvent _getNotificationSendingNotifierEvent;
-        private int _getNotificationSendingNotifierEventHandle;
-        public INotificationSystemEventAccessor(ServiceCtx context) { }
-
-        [CommandCmif(0)] // 9.0.0+
-        // GetNotificationSendingNotifier() -> nn::notification::server::INotificationSystemEventAccessor
-        public ResultCode GetSystemEvent(ServiceCtx context)
-        {
-            if (_getNotificationSendingNotifierEventHandle == 0)
-            {
-                if (context.Process.HandleTable.GenerateHandle(_getNotificationSendingNotifierEvent.ReadableEvent, out _getNotificationSendingNotifierEventHandle) != Result.Success)
-                {
-                    throw new InvalidOperationException("Out of handles!");
-                }
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_getNotificationSendingNotifierEventHandle);
-            return ResultCode.Success;
-        }
-    }
-}

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -79,15 +79,9 @@ namespace Ryujinx.HLE.HOS.Services
                 ProcessCreationFlags.Is64Bit |
                 ProcessCreationFlags.PoolPartitionSystem;
 
-            ProcessCreationInfo creationInfo = new(Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
+            ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
-            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, () =>
-            {
-                var currentThread = KernelStatic.GetCurrentThread();
-                currentThread.HostThread.Name = $"{{{Name}}}";
-
-                Main();
-            });
+            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, Main);
         }
 
         private void AddPort(int serverPortHandle, Func<IpcService> objectFactory)

src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -17,12 +17,13 @@ namespace Ryujinx.HLE.HOS.Services.Sm
         private static readonly Dictionary<string, Type> _services;
 
         private readonly SmRegistry _registry;
-        private ServerBase _commonServer;
+        private readonly ServerBase _commonServer;
 
         private bool _isInitialized;
 
         public IUserInterface(KernelContext context, SmRegistry registry) : base(registerTipc: true)
         {
+            _commonServer = new ServerBase(context, "CommonServer");
             _registry = registry;
         }
 
@@ -96,11 +97,6 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
                     IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
 
-                    if (_commonServer is null)
-                    {
-                        _commonServer = new ServerBase(context.Device.System.KernelContext, "Common");
-                    }
-                    
                     service.TrySetServer(_commonServer);
                     service.Server.AddSessionObj(session.ServerSession, service);
                 }
@@ -257,7 +253,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
         public override void DestroyAtExit()
         {
-            _commonServer?.Dispose();
+            _commonServer.Dispose();
 
             base.DestroyAtExit();
         }

src/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl
         public ISslService(ServiceCtx context) { }
 
         [CommandCmif(0)]
-        // CreateContext(nn::ssl::sf::SslVersion, u64 pid_placeholder, pid) -> object<nn::ssl::sf::ISslContext>
+        // CreateContext(nn::ssl::sf::SslVersion, u64, pid) -> object<nn::ssl::sf::ISslContext>
         public ResultCode CreateContext(ServiceCtx context)
         {
             SslVersion sslVersion = (SslVersion)context.RequestData.ReadUInt32();
@@ -126,18 +126,14 @@ namespace Ryujinx.HLE.HOS.Services.Ssl
         }
 
         [CommandCmif(100)]
-        // CreateContextForSystem(nn::ssl::sf::SslVersion, u64 pid_placeholder, pid) -> object<nn::ssl::sf::ISslContextForSystem>
+        // CreateContextForSystem(u64 pid, nn::ssl::sf::SslVersion, u64)
         public ResultCode CreateContextForSystem(ServiceCtx context)
         {
+            ulong pid = context.RequestData.ReadUInt64();
             SslVersion sslVersion = (SslVersion)context.RequestData.ReadUInt32();
-#pragma warning disable IDE0059 // Remove unnecessary value assignment
             ulong pidPlaceholder = context.RequestData.ReadUInt64();
-#pragma warning restore IDE0059
 
-            // Note: We use ISslContext here instead of ISslContextForSystem class because Ryujinx implements both in one class.
-            MakeObject(context, new ISslContext(context.Request.HandleDesc.PId, sslVersion));
-
-            Logger.Stub?.PrintStub(LogClass.ServiceSsl, new { sslVersion });
+            Logger.Stub?.PrintStub(LogClass.ServiceSsl, new { pid, sslVersion, pidPlaceholder });
 
             return ResultCode.Success;
         }

src/Ryujinx.HLE/HOS/SystemState/SystemLanguage.cs

@@ -20,7 +20,5 @@ namespace Ryujinx.HLE.HOS.SystemState
         SimplifiedChinese,
         TraditionalChinese,
         BrazilianPortuguese,
-        Polish,
-        Thai,
     }
 }

src/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs

@@ -23,9 +23,7 @@ namespace Ryujinx.HLE.HOS.SystemState
             "es-419",
             "zh-Hans",
             "zh-Hant",
-            "pt-BR",
-            "pl",
-            "th"
+            "pt-BR"
         ];
 
         internal long DesiredKeyboardLayout { get; private set; }

src/Ryujinx.HLE/HOS/SystemState/TitleLanguage.cs

@@ -18,7 +18,5 @@ namespace Ryujinx.HLE.HOS.SystemState
         TraditionalChinese,
         SimplifiedChinese,
         BrazilianPortuguese,
-        Polish,
-        Thai,
     }
 }

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -28,7 +28,6 @@ namespace Ryujinx.HLE.Loaders.Processes
 
         private ulong _latestPid;
 
-#nullable enable
         public ProcessResult? ActiveApplication
         {
             get
@@ -45,7 +44,6 @@ namespace Ryujinx.HLE.Loaders.Processes
                 return value;
             }
         }
-#nullable disable
 
         public ProcessLoader(Switch device)
         {

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -27,9 +27,7 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="MsgPack.Cli" />
     <PackageReference Include="SkiaSharp" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Win32" />
-    <PackageReference Include="SkiaSharp.NativeAssets.macOS" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" />
     <PackageReference Include="NetCoreServer" />
     <PackageReference Include="Open.NAT.Core" />
   </ItemGroup>

src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs

@@ -33,20 +33,7 @@ namespace Ryujinx.Horizon.Prepo.Ipc
         [CmifCommand(10100)] // 1.0.0-5.1.0
         [CmifCommand(10102)] // 6.0.0-9.2.0
         [CmifCommand(10104)] // 10.0.0+
-        public Result SaveReportOld([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
-        {
-            if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
-            {
-                return PrepoResult.PermissionDenied;
-            }
-
-            ProcessPlayReport(PlayReportKind.Normal, gameRoomBuffer, reportBuffer, pid, Uid.Null);
-
-            return Result.Success;
-        }
-
-        [CmifCommand(10106)] // 21.0.0+
-        public Result SaveReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid, bool optInCheckEnabled)
+        public Result SaveReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
         {
             if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
             {
@@ -61,20 +48,7 @@ namespace Ryujinx.Horizon.Prepo.Ipc
         [CmifCommand(10101)] // 1.0.0-5.1.0
         [CmifCommand(10103)] // 6.0.0-9.2.0
         [CmifCommand(10105)] // 10.0.0+
-        public Result SaveReportWithUserOld(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
-        {
-            if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
-            {
-                return PrepoResult.PermissionDenied;
-            }
-
-            ProcessPlayReport(PlayReportKind.Normal, gameRoomBuffer, reportBuffer, pid, userId, true);
-
-            return Result.Success;
-        }
-
-        [CmifCommand(10107)] // 21.0.0+
-        public Result SaveReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid, bool optInCheckEnabled)
+        public Result SaveReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
         {
             if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
             {

src/Ryujinx.Horizon/Sdk/Ns/ApplicationControlProperty.cs

@@ -1,19 +1,12 @@
 using Ryujinx.Common.Memory;
 using System;
-using System.Buffers.Binary;
-using System.IO;
-using System.IO.Compression;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Ryujinx.Horizon.Sdk.Ns
 {
     public struct ApplicationControlProperty
     {
-        /// <summary>
-        /// Use <see cref="Title"/> to access titles instead of accessing them directly.
-        /// </summary>
-        public Array16<ApplicationTitle> TitleBlock;
+        public Array16<ApplicationTitle> Title;
         public Array37<byte> Isbn;
         public StartupUserAccountValue StartupUserAccount;
         public UserAccountSwitchLockValue UserAccountSwitchLock;
@@ -65,10 +58,7 @@ namespace Ryujinx.Horizon.Sdk.Ns
         public RepairFlagValue RepairFlag;
         public byte ProgramIndex;
         public RequiredNetworkServiceLicenseOnLaunchValue RequiredNetworkServiceLicenseOnLaunchFlag;
-        public byte ApplicationErrorCodePrefix;
-        public TitleCompressionValue TitleCompression;
-        public byte AcdIndex;
-        public byte ApparentPlatform;
+        public Array4<byte> Reserved3214;
         public ApplicationNeighborDetectionClientConfiguration NeighborDetectionClientConfiguration;
         public ApplicationJitConfiguration JitConfiguration;
         public RequiredAddOnContentsSetBinaryDescriptor RequiredAddOnContentsSetBinaryDescriptors;
@@ -84,47 +74,6 @@ namespace Ryujinx.Horizon.Sdk.Ns
         public readonly string DisplayVersionString => Encoding.UTF8.GetString(DisplayVersion.AsSpan()).TrimEnd('\0');
         public readonly string ApplicationErrorCodeCategoryString => Encoding.UTF8.GetString(ApplicationErrorCodeCategory.AsSpan()).TrimEnd('\0');
         public readonly string BcatPassphraseString => Encoding.UTF8.GetString(BcatPassphrase.AsSpan()).TrimEnd('\0');
-        
-        private const int TitleCount = 32;
-        private const int TitleEntrySize = 0x300;
-        
-
-        /// <summary>
-        /// Returns the resolved title entries. When <see cref="TitleCompression"/> is
-        /// <see cref="TitleCompressionValue.Enable"/>, the raw <see cref="TitleBlock"/> bytes are
-        /// decompressed (raw deflate) from 0x3000 into 0x6000 bytes yielding up to 32 entries.
-        /// Otherwise the 16 uncompressed entries from <see cref="TitleBlock"/> are returned directly.
-        /// </summary>
-        public readonly ApplicationTitle[] Title
-        {
-            get
-            {
-                var titles = new ApplicationTitle[TitleCount];
-                
-                if (TitleCompression != TitleCompressionValue.Enable)
-                {
-                    TitleBlock.AsSpan().CopyTo(titles);
-                    
-                    return titles;
-                }
-
-                ReadOnlySpan<byte> titleBytes = MemoryMarshal.AsBytes(TitleBlock.AsSpan());
-                ushort compressedBlobSize = BinaryPrimitives.ReadUInt16LittleEndian(titleBytes);
-                ReadOnlySpan<byte> compressedBlob = titleBytes.Slice(2, compressedBlobSize);
-
-                byte[] decompressed = new byte[TitleCount * TitleEntrySize];
-
-                using (var compressedStream = new MemoryStream(compressedBlob.ToArray()))
-                using (var deflateStream = new DeflateStream(compressedStream, CompressionMode.Decompress))
-                {
-                    deflateStream.ReadExactly(decompressed, 0, decompressed.Length);
-                }
-
-                MemoryMarshal.Cast<byte, ApplicationTitle>(decompressed).CopyTo(titles);
-
-                return titles;
-            }
-        }
 
         public struct ApplicationTitle
         {
@@ -181,8 +130,6 @@ namespace Ryujinx.Horizon.Sdk.Ns
             TraditionalChinese = 13,
             SimplifiedChinese = 14,
             BrazilianPortuguese = 15,
-            Polish = 16,
-            Thai = 17,
         }
 
         public enum Organization
@@ -355,11 +302,5 @@ namespace Ryujinx.Horizon.Sdk.Ns
             Deny = 0,
             Allow = 1,
         }
-
-        public enum TitleCompressionValue : byte
-        {
-            Disable = 0,
-            Enable = 1,
-        }
     }
 }

src/Ryujinx.Horizon/Sdk/Prepo/IPrepoService.cs

@@ -8,10 +8,8 @@ namespace Ryujinx.Horizon.Sdk.Prepo
 {
     interface IPrepoService : IServiceObject
     {
-        Result SaveReportOld(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
-        Result SaveReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid, bool optInCheckEnabled);
-        Result SaveReportWithUserOld(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
-        Result SaveReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid, bool optInCheckEnabled);
+        Result SaveReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
+        Result SaveReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
         Result RequestImmediateTransmission();
         Result GetTransmissionStatus(out int status);
         Result GetSystemSessionId(out ulong systemSessionId);

src/Ryujinx.Horizon/ServiceEntry.cs

@@ -9,14 +9,12 @@ namespace Ryujinx.Horizon
         private readonly Action<ServiceTable> _entrypoint;
         private readonly ServiceTable _serviceTable;
         private readonly HorizonOptions _options;
-        public readonly string Name;
 
-        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options, string name)
+        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options)
         {
             _entrypoint = entrypoint;
             _serviceTable = serviceTable;
             _options = options;
-            Name = name;
         }
 
         public void Start(ISyscallApi syscallApi, IVirtualMemoryManager addressSpace, IThreadContext threadContext)

src/Ryujinx.Horizon/ServiceTable.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Horizon
 
             void RegisterService<T>() where T : IService
             {
-                entries.Add(new ServiceEntry(T.Main, this, options, typeof(T).Name));
+                entries.Add(new ServiceEntry(T.Main, this, options));
             }
 
             RegisterService<ArpMain>();

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -151,9 +151,7 @@ namespace Ryujinx.Input.SDL3
                 result |= GamepadFeaturesFlag.Led;
             }
             SDL_UnlockProperties(propID);
-
-            // NOTE: Do not call SDL_DestroyProperties here. These properties are owned
-            // internally by SDL and are freed when SDL_CloseGamepad is called (in Dispose).
+            SDL_DestroyProperties(propID);
 
             return result;
         }

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -9,20 +9,10 @@ using static SDL.SDL3;
 
 namespace Ryujinx.Input.SDL3
 {
-    
-    
     public unsafe class SDL3GamepadDriver : IGamepadDriver
     {
         private readonly Dictionary<SDL_JoystickID, string> _gamepadsInstanceIdsMapping;
         private readonly Dictionary<SDL_JoystickID, string> _gamepadsIds;
-        /// <summary>
-        /// Unlinked joy-cons
-        /// </summary>
-        private readonly Dictionary<SDL_JoystickID, string> _joyConsIds;
-        /// <summary>
-        /// Linked joy-cons, remove dual joy-con from <c>_gamepadsIds</c> when a linked joy-con is removed
-        /// </summary>
-        private readonly Dictionary<SDL_JoystickID,string> _linkedJoyConsIds;
         private readonly Lock _lock = new();
 
         public ReadOnlySpan<string> GamepadsIds
@@ -31,11 +21,7 @@ namespace Ryujinx.Input.SDL3
             {
                 lock (_lock)
                 {
-                    List<string> temp = [];
-                    temp.AddRange(_gamepadsIds.Values);
-                    temp.AddRange(_joyConsIds.Values);
-                    temp.AddRange(_linkedJoyConsIds.Values);
-                    return temp.ToArray();
+                    return _gamepadsIds.Values.ToArray();
                 }
             }
         }
@@ -49,8 +35,6 @@ namespace Ryujinx.Input.SDL3
         {
             _gamepadsInstanceIdsMapping = new Dictionary<SDL_JoystickID, string>();
             _gamepadsIds = [];
-            _joyConsIds = [];
-            _linkedJoyConsIds = [];
 
             SDL3Driver.Instance.Initialize();
             SDL3Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
@@ -108,7 +92,7 @@ namespace Ryujinx.Input.SDL3
                 int guidIndex = 0;
                 id = guidIndex + "-" + guidString;
 
-                while (_gamepadsIds.ContainsValue(id) || _joyConsIds.ContainsValue(id) || _linkedJoyConsIds.ContainsValue(id))
+                while (_gamepadsIds.ContainsValue(id))
                 {
                     id = (++guidIndex) + "-" + guidString;
                 }
@@ -120,47 +104,16 @@ namespace Ryujinx.Input.SDL3
         private void HandleJoyStickDisconnected(SDL_JoystickID joystickInstanceId)
         {
             bool joyConPairDisconnected = false;
-            string fakeId = null;
 
             if (!_gamepadsInstanceIdsMapping.Remove(joystickInstanceId, out string id))
                 return;
 
             lock (_lock)
             {
-                if (!_linkedJoyConsIds.ContainsKey(joystickInstanceId))
+                _gamepadsIds.Remove(joystickInstanceId);
+                if (!SDL3JoyConPair.IsCombinable(_gamepadsIds))
                 {
-                    if (!_joyConsIds.Remove(joystickInstanceId))
-                    {
-                        _gamepadsIds.Remove(joystickInstanceId);
-                    }
-                }
-                else
-                {
-                    foreach (string matchId in _gamepadsIds.Values)
-                    {
-                        if (matchId.Contains(id))
-                        {
-                            fakeId = matchId;
-                            break;
-                        }
-                    }
-                        
-                    string leftId = fakeId!.Split('_')[0];
-                    string rightId = fakeId!.Split('_')[1];
-
-                    if (leftId == id)
-                    {
-                        _linkedJoyConsIds.Remove(GetInstanceIdFromId(rightId));
-                        _joyConsIds.Add(GetInstanceIdFromId(rightId), rightId);
-                    }
-                    else
-                    {
-                        _linkedJoyConsIds.Remove(GetInstanceIdFromId(leftId));
-                        _joyConsIds.Add(GetInstanceIdFromId(leftId), leftId);
-                    }
-                        
-                    _linkedJoyConsIds.Remove(joystickInstanceId);
-                    _gamepadsIds.Remove(GetInstanceIdFromId(fakeId));
+                    _gamepadsIds.Remove(GetInstanceIdFromId(SDL3JoyConPair.Id));
                     joyConPairDisconnected = true;
                 }
             }
@@ -168,14 +121,13 @@ namespace Ryujinx.Input.SDL3
             OnGamepadDisconnected?.Invoke(id);
             if (joyConPairDisconnected)
             {
-                OnGamepadDisconnected?.Invoke(fakeId);
+                OnGamepadDisconnected?.Invoke(SDL3JoyConPair.Id);
             }
         }
 
         private void HandleJoyStickConnected(SDL_JoystickID joystickInstanceId)
         {
             bool joyConPairConnected = false;
-            string fakeId = null;
 
             if (SDL_IsGamepad(joystickInstanceId))
             {
@@ -197,40 +149,27 @@ namespace Ryujinx.Input.SDL3
                 {
                     lock (_lock)
                     {
-                        if (!SDL3JoyCon.IsJoyCon(joystickInstanceId))
+
+                        _gamepadsIds.Add(joystickInstanceId, id);
+
+                        if (SDL3JoyConPair.IsCombinable(_gamepadsIds))
                         {
-                            _gamepadsIds.Add(joystickInstanceId, id);
-                        }
-                        else
-                        {
-                            if (SDL3JoyConPair.IsCombinable(joystickInstanceId, _joyConsIds, out SDL_JoystickID match))
+                            // TODO - It appears that you can only have one joy con pair connected at a time?
+                            // This was also the behavior before SDL3
+                            _gamepadsIds.Remove(GetInstanceIdFromId(SDL3JoyConPair.Id));
+                            uint fakeInstanceID = uint.MaxValue;
+                            while (!_gamepadsIds.TryAdd((SDL_JoystickID)fakeInstanceID, SDL3JoyConPair.Id))
                             {
-                                _joyConsIds.Remove(match, out string matchId);
-                                _linkedJoyConsIds.Add(joystickInstanceId, id);
-                                _linkedJoyConsIds.Add(match, matchId);
-                                
-                                uint fakeInstanceId = uint.MaxValue;
-                                fakeId = SDL3JoyCon.IsLeftJoyCon(joystickInstanceId)
-                                    ? $"{id}_{matchId}"
-                                    : $"{matchId}_{id}";
-                                while (!_gamepadsIds.TryAdd((SDL_JoystickID)fakeInstanceId, fakeId))
-                                {
-                                    fakeInstanceId--;
-                                }
-                                _gamepadsInstanceIdsMapping.Add((SDL_JoystickID)fakeInstanceId, fakeId);
-                                joyConPairConnected = true;
-                            }
-                            else
-                            {
-                                _joyConsIds.Add(joystickInstanceId, id);
+                                fakeInstanceID--;
                             }
+                            joyConPairConnected = true;
                         }
                     }
 
                     OnGamepadConnected?.Invoke(id);
                     if (joyConPairConnected)
                     {
-                        OnGamepadConnected?.Invoke(fakeId);
+                        OnGamepadConnected?.Invoke(SDL3JoyConPair.Id);
                     }
                 }
             }
@@ -254,22 +193,10 @@ namespace Ryujinx.Input.SDL3
                 {
                     OnGamepadDisconnected?.Invoke(gamepad.Value);
                 }
-                
-                foreach (var gamepad in _joyConsIds)
-                {
-                    OnGamepadDisconnected?.Invoke(gamepad.Value);
-                }
-                
-                foreach (var gamepad in _linkedJoyConsIds)
-                {
-                    OnGamepadDisconnected?.Invoke(gamepad.Value);
-                }
 
                 lock (_lock)
                 {
                     _gamepadsIds.Clear();
-                    _joyConsIds.Clear();
-                    _linkedJoyConsIds.Clear();
                 }
 
                 SDL3Driver.Instance.Dispose();
@@ -288,27 +215,11 @@ namespace Ryujinx.Input.SDL3
 
         public IGamepad GetGamepad(string id)
         {
-            // joy-con pair ids is the combined ids of its parts which are split using a '_'
-            if (id.Contains('_'))
+            if (id == SDL3JoyConPair.Id)
             {
                 lock (_lock)
                 {
-                    string leftId = id.Split('_')[0];
-                    string rightId = id.Split('_')[1];
-                    
-                    SDL_JoystickID leftInstanceId = GetInstanceIdFromId(leftId);
-                    SDL_JoystickID rightInstanceId = GetInstanceIdFromId(rightId);
-
-                    SDL_Gamepad* leftGamepadHandle = SDL_OpenGamepad(leftInstanceId);
-                    SDL_Gamepad* rightGamepadHandle = SDL_OpenGamepad(rightInstanceId);
-
-                    if (leftGamepadHandle == null || rightGamepadHandle == null)
-                    {
-                        return null;
-                    }
-
-                    return new SDL3JoyConPair(new SDL3JoyCon(leftGamepadHandle, leftId),
-                        new SDL3JoyCon(rightGamepadHandle, rightId));
+                    return SDL3JoyConPair.GetGamepad(_gamepadsIds);
                 }
             }
 
@@ -321,7 +232,7 @@ namespace Ryujinx.Input.SDL3
                 return null;
             }
 
-            if (SDL3JoyCon.IsJoyCon(instanceId))
+            if (SDL_GetGamepadName(gamepadHandle).StartsWith(SDL3JoyCon.Prefix))
             {
                 return new SDL3JoyCon(gamepadHandle, id);
             }
@@ -331,18 +242,12 @@ namespace Ryujinx.Input.SDL3
 
         public IEnumerable<IGamepad> GetGamepads()
         {
-            string[] ids;
-            lock (_lock)
+            lock (_gamepadsIds)
             {
-                ids = _gamepadsIds.Values
-                    .Concat(_joyConsIds.Values)
-                    .Concat(_linkedJoyConsIds.Values)
-                    .ToArray();
-            }
-
-            foreach (string id in ids)
-            {
-                yield return GetGamepad(id);
+                foreach (var gamepad in _gamepadsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
             }
         }
     }

src/Ryujinx.Input.SDL3/SDL3JoyCon.cs

@@ -24,10 +24,10 @@ namespace Ryujinx.Input.SDL3
         private readonly Dictionary<GamepadButtonInputId, SDL_GamepadButton> _leftButtonsDriverMapping = new()
         {
              {GamepadButtonInputId.LeftStick, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_STICK},
-             {GamepadButtonInputId.DpadUp, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
-             {GamepadButtonInputId.DpadDown, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
-             {GamepadButtonInputId.DpadLeft, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
-             {GamepadButtonInputId.DpadRight, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
+             {GamepadButtonInputId.DpadUp, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
+             {GamepadButtonInputId.DpadDown, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
+             {GamepadButtonInputId.DpadLeft, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
+             {GamepadButtonInputId.DpadRight, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
              {GamepadButtonInputId.Minus, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_START},
              {GamepadButtonInputId.LeftShoulder, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_PADDLE1},
              {GamepadButtonInputId.LeftTrigger, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_PADDLE2},
@@ -37,10 +37,10 @@ namespace Ryujinx.Input.SDL3
         private readonly Dictionary<GamepadButtonInputId, SDL_GamepadButton> _rightButtonsDriverMapping = new()
         {
              {GamepadButtonInputId.RightStick, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_STICK},
-             {GamepadButtonInputId.A, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
-             {GamepadButtonInputId.B, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
-             {GamepadButtonInputId.X, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
-             {GamepadButtonInputId.Y, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
+             {GamepadButtonInputId.A, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_EAST},
+             {GamepadButtonInputId.B, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_NORTH},
+             {GamepadButtonInputId.X, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_SOUTH},
+             {GamepadButtonInputId.Y, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_WEST},
              {GamepadButtonInputId.Plus, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_START},
              {GamepadButtonInputId.RightShoulder, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1},
              {GamepadButtonInputId.RightTrigger, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2},
@@ -398,15 +398,5 @@ namespace Ryujinx.Input.SDL3
 
             return SDL_GetGamepadButton(_gamepadHandle, button);
         }
-        
-        public static bool IsJoyCon(SDL_JoystickID gamepadsId)
-        {
-            return SDL_GetGamepadNameForID(gamepadsId) is LeftName or RightName;
-        }
-        
-        public static bool IsLeftJoyCon(SDL_JoystickID gamepadsId)
-        {
-            return SDL_GetGamepadNameForID(gamepadsId) is LeftName;
-        }
     }
 }

src/Ryujinx.Input.SDL3/SDL3JoyConPair.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Input.SDL3
         public const string Id = "JoyConPair";
         string IGamepad.Id => Id;
 
-        public string Name => "Nintendo Switch Dual Joy-Con (L/R)";
+        public string Name => "* Nintendo Switch Joy-Con (L/R)";
         public bool IsConnected => left is { IsConnected: true } && right is { IsConnected: true };
 
         public void Dispose()
@@ -96,23 +96,44 @@ namespace Ryujinx.Input.SDL3
             right.SetTriggerThreshold(triggerThreshold);
         }
 
-        public static bool IsCombinable(SDL_JoystickID joyCon1, Dictionary<SDL_JoystickID, string> joyConIds, out SDL_JoystickID match)
+        public static bool IsCombinable(Dictionary<SDL_JoystickID, string> gamepadsIds)
         {
-            bool isLeft = SDL3JoyCon.IsLeftJoyCon(joyCon1);
-            string matchName = isLeft ? SDL3JoyCon.RightName : SDL3JoyCon.LeftName;
-            match = 0;
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+            return leftIndex >= 0 && rightIndex >= 0;
+        }
 
-            foreach (var joyConId in joyConIds.Keys)
+        private static (int leftIndex, int rightIndex) DetectJoyConPair(Dictionary<SDL_JoystickID, string> gamepadsIds)
+        {
+            Dictionary<string, SDL_JoystickID> gamepadNames = gamepadsIds
+                .Where(gamepadId => gamepadId.Value != Id && SDL_GetGamepadNameForID(gamepadId.Key) is SDL3JoyCon.LeftName or SDL3JoyCon.RightName)
+                .Select(gamepad => (SDL_GetGamepadNameForID(gamepad.Key), gamepad.Key))
+                .ToDictionary();
+            SDL_JoystickID idx;
+            int leftIndex = gamepadNames.TryGetValue(SDL3JoyCon.LeftName, out idx) ? (int)idx : -1;
+            int rightIndex = gamepadNames.TryGetValue(SDL3JoyCon.RightName, out idx) ? (int)idx : -1;
+
+            return (leftIndex, rightIndex);
+        }
+
+        public unsafe static IGamepad GetGamepad(Dictionary<SDL_JoystickID, string> gamepadsIds)
+        {
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+
+            if (leftIndex <= 0 || rightIndex <= 0)
             {
-                if (SDL_GetGamepadNameForID(joyConId) == matchName)
-                {
-                    match = joyConId;
-                    
-                    return true;
-                }
+                return null;
             }
-            
-            return false;
+
+            SDL_Gamepad* leftGamepadHandle = SDL_OpenGamepad((SDL_JoystickID)leftIndex);
+            SDL_Gamepad* rightGamepadHandle = SDL_OpenGamepad((SDL_JoystickID)rightIndex);
+
+            if (leftGamepadHandle == null || rightGamepadHandle == null)
+            {
+                return null;
+            }
+
+            return new SDL3JoyConPair(new SDL3JoyCon(leftGamepadHandle, gamepadsIds[(SDL_JoystickID)leftIndex]),
+                new SDL3JoyCon(rightGamepadHandle, gamepadsIds[(SDL_JoystickID)rightIndex]));
         }
     }
 }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -563,7 +563,7 @@ namespace Ryujinx.Input.HLE
                     float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble));
                     float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble));
 
-                    _gamepad?.Rumble(low, high, uint.MaxValue);
+                    _gamepad.Rumble(low, high, uint.MaxValue);
 
                     Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " +
                         $"L.low.amp={leftVibrationValue.AmplitudeLow}, " +

src/Ryujinx.SDL3.Common/Ryujinx.SDL3.Common.csproj

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ryujinx.SDL3-CS" />
+    <PackageReference Include="ppy.SDL3-CS" />
   </ItemGroup>
 
 </Project>

src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameterTests.cs

@@ -10,7 +10,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Parameter.Effect
         public void EnsureTypeSize()
         {
             Assert.AreEqual(0x18, Unsafe.SizeOf<BiquadFilterEffectParameter1>());
-            Assert.AreEqual(0x28, Unsafe.SizeOf<BiquadFilterEffectParameter2>());
+            Assert.AreEqual(0x24, Unsafe.SizeOf<BiquadFilterEffectParameter2>());
         }
     }
 }

src/Ryujinx.Tests/HLE/CaptureManagerTests.cs

@@ -1,187 +0,0 @@
-using NUnit.Framework;
-using Ryujinx.HLE.HOS.Services.Caps;
-using Ryujinx.HLE.HOS.Services.Caps.Types;
-using SkiaSharp;
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Tests.HLE
-{
-    public class CaptureManagerTests
-    {
-        private const int ScreenshotWidth = 1280;
-        private const int ScreenshotHeight = 720;
-        private const int BytesPerPixel = 4;
-
-        private const int ScreenshotDataSize = ScreenshotWidth * ScreenshotHeight * BytesPerPixel; // 0x384000
-        private const int PaddedScreenshotDataSize = ScreenshotWidth * 768 * BytesPerPixel;        // 0x3C0000
-
-        [Test]
-        public void SaveScreenShotRejectsBufferSmallerThan720p()
-        {
-            using TempSdCard tempSdCard = new();
-
-            CaptureManager captureManager = CreateCaptureManager(tempSdCard.Path);
-            byte[] screenshotData = new byte[ScreenshotDataSize - 1];
-
-            ResultCode result = captureManager.SaveScreenShot(
-                screenshotData,
-                appletResourceUserId: 0,
-                titleId: 0x0100000000001000,
-                out _);
-
-            Assert.That(result, Is.EqualTo(ResultCode.NullInputBuffer));
-            Assert.That(Directory.Exists(Path.Combine(tempSdCard.Path, "Nintendo", "Album")), Is.False);
-        }
-
-        [Test]
-        public void SaveScreenShotAcceptsExact720pBuffer()
-        {
-            using TempSdCard tempSdCard = new();
-
-            CaptureManager captureManager = CreateCaptureManager(tempSdCard.Path);
-            byte[] screenshotData = CreateTestPattern(ScreenshotDataSize);
-
-            ResultCode result = captureManager.SaveScreenShot(
-                screenshotData,
-                appletResourceUserId: 0,
-                titleId: 0x0100000000001000,
-                out ApplicationAlbumEntry applicationAlbumEntry);
-
-            string filePath = GetSingleAlbumFile(tempSdCard.Path);
-
-            using SKBitmap bitmap = SKBitmap.Decode(filePath);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result, Is.EqualTo(ResultCode.Success));
-                Assert.That(bitmap.Width, Is.EqualTo(ScreenshotWidth));
-                Assert.That(bitmap.Height, Is.EqualTo(ScreenshotHeight));
-                Assert.That(applicationAlbumEntry.TitleId, Is.EqualTo(0x0100000000001000));
-                Assert.That(applicationAlbumEntry.AlbumStorage, Is.EqualTo(AlbumStorage.Sd));
-                Assert.That(applicationAlbumEntry.ContentType, Is.EqualTo(ContentType.Screenshot));
-                Assert.That(applicationAlbumEntry.Unknown0x1f, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void SaveScreenShotAcceptsBufferLargerThan720p()
-        {
-            using TempSdCard tempSdCard = new();
-
-            CaptureManager captureManager = CreateCaptureManager(tempSdCard.Path);
-            byte[] screenshotData = CreateTestPattern(PaddedScreenshotDataSize);
-
-            ResultCode result = captureManager.SaveScreenShot(
-                screenshotData,
-                appletResourceUserId: 0,
-                titleId: 0x0100000000001000,
-                out ApplicationAlbumEntry applicationAlbumEntry);
-
-            string filePath = GetSingleAlbumFile(tempSdCard.Path);
-
-            using SKBitmap bitmap = SKBitmap.Decode(filePath);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result, Is.EqualTo(ResultCode.Success));
-                Assert.That(bitmap.Width, Is.EqualTo(ScreenshotWidth));
-                Assert.That(bitmap.Height, Is.EqualTo(ScreenshotHeight));
-                Assert.That(applicationAlbumEntry.TitleId, Is.EqualTo(0x0100000000001000));
-            });
-        }
-
-        [Test]
-        public void SaveScreenShotCreatesUniqueFileNamesForRepeatedSaves()
-        {
-            using TempSdCard tempSdCard = new();
-
-            CaptureManager captureManager = CreateCaptureManager(tempSdCard.Path);
-            byte[] screenshotData = CreateTestPattern(ScreenshotDataSize);
-
-            ResultCode firstResult = captureManager.SaveScreenShot(
-                screenshotData,
-                appletResourceUserId: 0,
-                titleId: 0x0100000000001000,
-                out _);
-
-            ResultCode secondResult = captureManager.SaveScreenShot(
-                screenshotData,
-                appletResourceUserId: 0,
-                titleId: 0x0100000000001000,
-                out _);
-
-            string[] files = Directory.GetFiles(
-                Path.Combine(tempSdCard.Path, "Nintendo", "Album"),
-                "*.jpg",
-                SearchOption.AllDirectories);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(firstResult, Is.EqualTo(ResultCode.Success));
-                Assert.That(secondResult, Is.EqualTo(ResultCode.Success));
-                Assert.That(files, Has.Length.EqualTo(2));
-            });
-        }
-
-        private static CaptureManager CreateCaptureManager(string sdCardPath)
-        {
-            CaptureManager captureManager = (CaptureManager)RuntimeHelpers.GetUninitializedObject(typeof(CaptureManager));
-
-            typeof(CaptureManager)
-                .GetField("_sdCardPath", BindingFlags.Instance | BindingFlags.NonPublic)
-                .SetValue(captureManager, sdCardPath);
-
-            return captureManager;
-        }
-
-        private static string GetSingleAlbumFile(string sdCardPath)
-        {
-            string albumPath = Path.Combine(sdCardPath, "Nintendo", "Album");
-
-            string[] files = Directory.GetFiles(albumPath, "*.jpg", SearchOption.AllDirectories);
-
-            Assert.That(files, Has.Length.EqualTo(1));
-
-            return files.Single();
-        }
-
-        private static byte[] CreateTestPattern(int size)
-        {
-            byte[] data = new byte[size];
-
-            int pixelCount = size / BytesPerPixel;
-
-            for (int i = 0; i < pixelCount; i++)
-            {
-                int x = i % ScreenshotWidth;
-                int y = i / ScreenshotWidth;
-
-                data[(i * 4) + 0] = (byte)(x & 0xff);
-                data[(i * 4) + 1] = (byte)(y & 0xff);
-                data[(i * 4) + 2] = 0x80;
-                data[(i * 4) + 3] = 0xff;
-            }
-
-            return data;
-        }
-
-        private sealed class TempSdCard : IDisposable
-        {
-            public string Path { get; } = System.IO.Path.Combine(
-                TestContext.CurrentContext.WorkDirectory,
-                "sdcard-" + Guid.NewGuid());
-
-            public void Dispose()
-            {
-                if (Directory.Exists(Path))
-                {
-                    Directory.Delete(Path, recursive: true);
-                }
-            }
-        }
-    }
-}