Merge branch ryujinx:master into ui-userprofiles-and-misc

2026-03-11 20:45:32 +00:00 · 2025-12-23 02:27:12 -06:00 · 2025-12-23 02:27:12 -06:00 · 46bae1c40a
commit 46bae1c40a
parent 5536bba1fa f585b36263
25 changed files with 32 additions and 93 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@ -63,7 +63,6 @@ jobs:
          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
-          echo "commit_message=$(git log -1 --pretty=%B)" >> $GITHUB_OUTPUT
        shell: bash

      - name: Configure for release
@ -90,7 +89,7 @@ jobs:
          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd

-          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
+          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 }}
@ -104,7 +103,7 @@ jobs:
          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd

-          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/canary -n Ryubing-Canary -v ${{ steps.version_info.outputs.build_version }} -p release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
+          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)
@ -141,7 +140,7 @@ jobs:
          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 }} -p release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
+          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

  macos_release:
@ -202,7 +201,7 @@ 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 }} -p publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
+          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

  create_gitlab_release:
    name: Create GitLab Release
@ -229,12 +228,11 @@ jobs:
          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
-          echo "commit_message=$(git log -1 --pretty=%B)" >> $GITHUB_OUTPUT
        shell: bash
          
      - name: Create tag
        run: |
-          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 }} -c "${{ steps.version_info.outputs.commit_message }}"
+          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: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -86,7 +86,7 @@ jobs:
          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd

-          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip
+          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 }}
@ -100,7 +100,7 @@ jobs:
          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd

-          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -p release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz
+          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 }}
@ -139,7 +139,7 @@ jobs:
          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
          popd

-          gli upload-generic-package -T ${{ secrets.GITLAB_TOKEN }} -P ryubing/ryujinx -n Ryubing -v ${{ steps.version_info.outputs.build_version }} -p release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
+          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:
@ -203,7 +203,7 @@ jobs:
        run: |
          ./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 }} -p publish/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz
+          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
--- a/src/Ryujinx.Common/Configuration/AntiAliasing.cs
+++ b/src/Ryujinx.Common/Configuration/AntiAliasing.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AntiAliasing>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AntiAliasing>))]
    public enum AntiAliasing
    {
        None,
--- a/src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs
+++ b/src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AspectRatio>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AspectRatio>))]
    public enum AspectRatio
    {
        Fixed4x3,
--- a/src/Ryujinx.Common/Configuration/BackendThreading.cs
+++ b/src/Ryujinx.Common/Configuration/BackendThreading.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<BackendThreading>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<BackendThreading>))]
    public enum BackendThreading
    {
        Auto,
--- a/src/Ryujinx.Common/Configuration/GraphicsBackend.cs
+++ b/src/Ryujinx.Common/Configuration/GraphicsBackend.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GraphicsBackend>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GraphicsBackend>))]
    public enum GraphicsBackend
    {
        Vulkan,
--- a/src/Ryujinx.Common/Configuration/GraphicsDebugLevel.cs
+++ b/src/Ryujinx.Common/Configuration/GraphicsDebugLevel.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GraphicsDebugLevel>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GraphicsDebugLevel>))]
    public enum GraphicsDebugLevel
    {
        None,
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<GamepadInputId>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<GamepadInputId>))]
    public enum GamepadInputId : byte
    {
        Unbound,
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<MotionInputBackendType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<MotionInputBackendType>))]
    public enum MotionInputBackendType : byte
    {
        Invalid,
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
@ -1,15 +1,14 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<StickInputId>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<StickInputId>))]
    public enum StickInputId : byte
    {
        Unbound,
        Left,
        Right,
-
+        
        Count,
    }
 }
--- a/src/Ryujinx.Common/Configuration/Hid/ControllerType.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/ControllerType.cs
@ -1,4 +1,3 @@
-using Ryujinx.Common.Utilities;
 using System;
 using System.Text.Json.Serialization;

@ -6,7 +5,7 @@ namespace Ryujinx.Common.Configuration.Hid
 {
    // This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
    [Flags]
-    [JsonConverter(typeof(TypedStringEnumConverter<ControllerType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<ControllerType>))]
    public enum ControllerType
    {
        None,
--- a/src/Ryujinx.Common/Configuration/Hid/InputBackendType.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/InputBackendType.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<InputBackendType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<InputBackendType>))]
    public enum InputBackendType
    {
        Invalid,
--- a/src/Ryujinx.Common/Configuration/Hid/Key.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Key.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Key>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Key>))]
    public enum Key
    {
        Unknown,
--- a/src/Ryujinx.Common/Configuration/Hid/PlayerIndex.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/PlayerIndex.cs
@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration.Hid
 {
    // This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
-    [JsonConverter(typeof(TypedStringEnumConverter<PlayerIndex>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<PlayerIndex>))]
    public enum PlayerIndex
    {
        Player1 = 0,
--- a/src/Ryujinx.Common/Configuration/MemoryManagerMode.cs
+++ b/src/Ryujinx.Common/Configuration/MemoryManagerMode.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<MemoryManagerMode>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<MemoryManagerMode>))]
    public enum MemoryManagerMode : byte
    {
        SoftwarePageTable,
--- a/src/Ryujinx.Common/Configuration/ScalingFilter.cs
+++ b/src/Ryujinx.Common/Configuration/ScalingFilter.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<ScalingFilter>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<ScalingFilter>))]
    public enum ScalingFilter
    {
        Bilinear,
--- a/src/Ryujinx.Common/Logging/LogClass.cs
+++ b/src/Ryujinx.Common/Logging/LogClass.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Logging
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<LogClass>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<LogClass>))]
    public enum LogClass
    {
        Application,
--- a/src/Ryujinx.Common/Logging/LogLevel.cs
+++ b/src/Ryujinx.Common/Logging/LogLevel.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Common.Logging
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<LogLevel>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<LogLevel>))]
    public enum LogLevel
    {
        Debug,
--- a/src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs
+++ b/src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs
@ -1,37 +0,0 @@
-#nullable enable
-using Ryujinx.Common.Logging;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Utilities
-{
-    /// <summary>
-    /// Specifies that value of <see cref="TEnum"/> will be serialized as string in JSONs
-    /// </summary>
-    /// <remarks>
-    /// Trimming friendly alternative to <see cref="JsonStringEnumConverter"/>.
-    /// Get rid of this converter if dotnet supports similar functionality out of the box.
-    /// </remarks>
-    /// <typeparam name="TEnum">Type of enum to serialize</typeparam>
-    public sealed class TypedStringEnumConverter<TEnum> : JsonConverter<TEnum> where TEnum : struct, Enum
-    {
-        public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            string? enumValue = reader.GetString();
-
-            if (Enum.TryParse(enumValue, out TEnum value))
-            {
-                return value;
-            }
-
-            Logger.Warning?.Print(LogClass.Configuration, $"Failed to parse enum value \"{enumValue}\" for {typeof(TEnum)}, using default \"{default(TEnum)}\"");
-            return default;
-        }
-
-        public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.ToString());
-        }
-    }
-}
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/Types/AccountState.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/Types/AccountState.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.HLE.HOS.Services.Account.Acc
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AccountState>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AccountState>))]
    public enum AccountState
    {
        Closed,
--- a/src/Ryujinx/Systems/Configuration/AudioBackend.cs
+++ b/src/Ryujinx/Systems/Configuration/AudioBackend.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Ava.Systems.Configuration
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<AudioBackend>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<AudioBackend>))]
    public enum AudioBackend
    {
        Dummy,
--- a/src/Ryujinx/Systems/Configuration/System/Language.cs
+++ b/src/Ryujinx/Systems/Configuration/System/Language.cs
@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.SystemState;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Ava.Systems.Configuration.System
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Language>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Language>))]
    public enum Language
    {
        Japanese,
--- a/src/Ryujinx/Systems/Configuration/System/Region.cs
+++ b/src/Ryujinx/Systems/Configuration/System/Region.cs
@ -1,10 +1,9 @@
-using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.SystemState;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Ava.Systems.Configuration.System
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<Region>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<Region>))]
    public enum Region
    {
        Japan,
--- a/src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs
+++ b/src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Ava.Systems.Configuration.UI
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<FocusLostType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<FocusLostType>))]
    public enum FocusLostType
    {
        DoNothing,
--- a/src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs
+++ b/src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs
@ -1,9 +1,8 @@
-using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;

 namespace Ryujinx.Ava.Systems.Configuration.UI
 {
-    [JsonConverter(typeof(TypedStringEnumConverter<UpdaterType>))]
+    [JsonConverter(typeof(JsonStringEnumConverter<UpdaterType>))]
    public enum UpdaterType
    {
        Off,