nuget: bump Microsoft.IdentityModel.JsonWebTokens from 8.2.1 to 8.3.0

* Bump SkiaSharp group from 2.88.8 to 2.88.9

* Bump Microsoft.IdentityModel.JsonWebTokens from 8.2.0 to 8.2.1

.github/workflows/build.yml

@@ -129,11 +129,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 14
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 14
 
       - name: Install rcodesign
         run: |

.github/workflows/canary.yml

@@ -210,11 +210,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15
 
       - name: Install rcodesign
         run: |

.github/workflows/release.yml

@@ -191,11 +191,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15
 
       - name: Install rcodesign
         run: |

distribution/macos/bundle_fix_up.py

@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
     OTOOL = shutil.which("llvm-otool")
     if OTOOL is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
             otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
             if otool_path is not None:
                 OTOOL = otool_path

distribution/macos/construct_universal_dylib.py

@@ -26,7 +26,7 @@ else:
     LIPO = shutil.which("llvm-lipo")
 
     if LIPO is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
             lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
             if lipo_path is not None:
                 LIPO = lipo_path

distribution/macos/create_macos_build_ava.sh

@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
     fi
 else
     LIPO=lipo

distribution/macos/create_macos_build_headless.sh

@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
     fi
 else
     LIPO=lipo

src/Ryujinx.Common/RyujinxException.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Common
-{
-    public class RyujinxException : Exception
-    {
-        public RyujinxException(string message) : base(message)
-        { }
-    }
-}

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

@@ -702,18 +702,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return ResultCode.Success;
         }
-        
-        [CommandCmif(92)]
-        // SetGestureOutputRanges(pid, ushort Unknown0)
-        public ResultCode SetGestureOutputRanges(ServiceCtx context)
-        {
-            ulong pid = context.Request.HandleDesc.PId;
-            ushort unknown0 = context.RequestData.ReadUInt16();
-
-            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
-
-            return ResultCode.Success;
-        }
 
         [CommandCmif(100)]
         // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)

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

@@ -26,17 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes
 
         private ulong _latestPid;
 
-        public ProcessResult ActiveApplication
-        {
-            get
-            {
-                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
-                    throw new RyujinxException(
-                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
-                
-                return value;
-            }
-        }
+        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
 
         public ProcessLoader(Switch device)
         {

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\Controller_JoyConLeft.svg" />
+    <None Remove="Resources\Controller_JoyConPair.svg" />
+    <None Remove="Resources\Controller_JoyConRight.svg" />
+    <None Remove="Resources\Controller_ProCon.svg" />
+    <None Remove="Resources\Icon_NCA.png" />
+    <None Remove="Resources\Icon_NRO.png" />
+    <None Remove="Resources\Icon_NSO.png" />
+    <None Remove="Resources\Icon_NSP.png" />
+    <None Remove="Resources\Icon_XCI.png" />
+    <None Remove="Resources\Logo_Amiibo.png" />
+    <None Remove="Resources\Logo_Discord.png" />
+    <None Remove="Resources\Logo_GitHub.png" />
+    <None Remove="Resources\Logo_Ryujinx.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DiscordRichPresence" />
+    <PackageReference Include="DynamicData" />
+    <PackageReference Include="securifybv.ShellLink" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+  </ItemGroup>
+
+</Project>

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,5 +1,4 @@
 using DiscordRPC;
-using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -76,23 +75,11 @@ namespace Ryujinx.Ava
                     _discordClient = new DiscordRpcClient(ApplicationId);
 
                     _discordClient.Initialize();
-
-                    Use(TitleIDs.CurrentApplication);
+                    _discordClient.SetPresence(_discordPresenceMain);
                 }
             }
         }
 
-        public static void Use(Optional<string> titleId)
-        {
-            if (titleId.TryGet(out string tid))
-                SwitchToPlayingState(
-                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
-                    Switch.Shared.Processes.ActiveApplication
-                );
-            else 
-                SwitchToMainState();
-        }
-
         private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
         {
             _discordClient?.SetPresence(new RichPresence

src/Ryujinx/Program.cs

@@ -21,7 +21,6 @@ using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL2.Common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -244,33 +243,16 @@ namespace Ryujinx.Ava
                     : $"Launch Mode: {AppDataManager.Mode}");
         }
 
-        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
         {
             Logger.Log log = Logger.Error ?? Logger.Notice;
+            string message = $"Unhandled exception caught: {ex}";
 
-            List<Exception> exceptions = [];
-
-            if (initialException is AggregateException ae)
-            {
-                exceptions.AddRange(ae.InnerExceptions);
-            }
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            if (sender?.GetType()?.AsPrettyString() is { } senderName)
+                log.Print(LogClass.Application, message, senderName);
             else
-            {
-                exceptions.Add(initialException);
-            }
-
-            foreach (var e in exceptions)
-            {
-                string message = $"Unhandled exception caught: {e}";
-                // ReSharper disable once ConstantConditionalAccessQualifier
-                if (sender?.GetType()?.AsPrettyString() is { } senderName)
-                    log.Print(LogClass.Application, message, senderName);
-                else
-                    log.PrintMsg(LogClass.Application, message);
-            }
-            
-
-
+                log.PrintMsg(LogClass.Application, message);
 
             if (isTerminating)
                 Exit();