UI: Store config migrations in a dictionary and loop through it to do migrations.

Rename DirtyHack.ShaderCompilationThreadSleep to ShaderTranslationDelay
Changed EnabledDirtyHack to a struct
rename DirtyHackCollection to DirtyHacks

.github/workflows/nightly_pr_comment.yml

@@ -37,7 +37,7 @@ jobs:
             if (!artifacts.length) {
               return core.error(`No artifacts found`);
             }
-            let body = `Download the artifacts for this pull request:\n`;
+            let body = `*You need to be logged into GitHub to download these files.*\n\nDownload 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://github.com/Ryubing/Ryujinx/actions/runs/${run_id}/artifacts/${art.id}`;

Directory.Packages.props

@@ -41,7 +41,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.6.8" />
+    <PackageVersion Include="Gommon" Version="2.7.0" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />

src/Ryujinx.BuildValidationTasks/IValidationTask.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.BuildValidationTasks
 {
-    public interface ValidationTask
+    public interface IValidationTask
     {
         public bool Execute(string projectPath, bool isGitRunner);
     }

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -7,7 +7,7 @@ using System.Text.Encodings.Web;
 
 namespace Ryujinx.BuildValidationTasks
 {
-    public class LocalesValidationTask : ValidationTask
+    public class LocalesValidationTask : IValidationTask
     {
         public LocalesValidationTask() { }
 

src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj

@@ -10,6 +10,7 @@
     <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
       Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
       ConsoleToMsBuild="true"
+      Condition="'$(RuntimeIdentifier)' == ''"
       />
   </Target>
 

src/Ryujinx.Common/BitTricks.cs

@@ -1,35 +0,0 @@
-namespace Ryujinx.Common
-{
-    public class BitTricks
-    {
-        // Never actually written bit packing logic before, so I looked it up.
-        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
-        
-        public static ulong PackBitFields(uint[] values, byte[] bitFields)
-        {
-            ulong retVal = values[0]; //we set the first value right away
-            for (int f = 1; f < values.Length; f++)
-            {
-                retVal <<= bitFields[f]; // we shift the previous value
-                retVal += values[f];// and add our current value
-            }
-            return retVal;
-        }
-
-        public static uint[] UnpackBitFields(ulong packed, byte[] bitFields)
-        {
-            int fields = bitFields.Length - 1; // number of fields to unpack
-            uint[] retArr = new uint[fields + 1]; // init return array
-            int curPos = 0; // current field bit position (start)
-            int lastEnd; // position where last field ended
-            for (int f = fields; f >= 0; f--) // loop from last
-            {
-                lastEnd = curPos; // we store where the last value ended
-                curPos += bitFields[f]; // we get where the current value starts
-                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
-                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
-            }
-            return retArr;
-        }
-    }
-}

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -0,0 +1,60 @@
+using Gommon;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Common.Configuration
+{
+    [Flags]
+    public enum DirtyHack : byte
+    {
+        Xc2MenuSoftlockFix = 1,
+        ShaderTranslationDelay = 2
+    }
+
+    public readonly struct EnabledDirtyHack(DirtyHack hack, int value)
+    {
+        public DirtyHack Hack => hack;
+        public int Value => value;
+        
+        
+        
+        public ulong Pack() => Raw.PackBitFields(PackedFormat);
+
+        public static EnabledDirtyHack Unpack(ulong packedHack)
+        {
+            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
+            if (unpackedFields is not [var hack, var value])
+                throw new ArgumentException(nameof(packedHack));
+            
+            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
+        }
+        
+        private uint[] Raw => [(uint)Hack, (uint)Value.CoerceAtLeast(0)];
+        
+        public static readonly byte[] PackedFormat = [8, 32];
+    }
+
+    public class DirtyHacks : Dictionary<DirtyHack, int>
+    {
+        public DirtyHacks(IEnumerable<EnabledDirtyHack> hacks) 
+            => hacks.ForEach(edh => Add(edh.Hack, edh.Value));
+
+        public DirtyHacks(ulong[] packedHacks) : this(packedHacks.Select(EnabledDirtyHack.Unpack)) {}
+
+        public ulong[] PackEntries() 
+            => Entries.Select(it => it.Pack()).ToArray();
+        
+        public EnabledDirtyHack[] Entries 
+            => this
+                .Select(it => new EnabledDirtyHack(it.Key, it.Value))
+                .ToArray();
+
+        public static implicit operator DirtyHacks(EnabledDirtyHack[] hacks) => new(hacks);
+        public static implicit operator DirtyHacks(ulong[] packedHacks) => new(packedHacks);
+
+        public new int this[DirtyHack hack] => TryGetValue(hack, out var value) ? value : -1;
+
+        public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
+    }
+}

src/Ryujinx.Common/Configuration/DirtyHacks.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Common.Configuration
-{
-    [Flags]
-    public enum DirtyHacks : byte
-    {
-        Xc2MenuSoftlockFix = 1,
-        ShaderCompilationThreadSleep = 2
-    }
-
-    public record EnabledDirtyHack(DirtyHacks Hack, int Value)
-    {
-        public static readonly byte[] PackedFormat = [8, 32];
-        
-        public ulong Pack() => BitTricks.PackBitFields([(uint)Hack, (uint)Value], PackedFormat);
-
-        public static EnabledDirtyHack Unpack(ulong packedHack)
-        {
-            var unpackedFields = BitTricks.UnpackBitFields(packedHack, PackedFormat);
-            if (unpackedFields is not [var hack, var value])
-                throw new ArgumentException(nameof(packedHack));
-            
-            return new EnabledDirtyHack((DirtyHacks)hack, (int)value);
-        }
-    }
-
-    public class DirtyHackCollection : Dictionary<DirtyHacks, int>
-    {
-        public DirtyHackCollection(EnabledDirtyHack[] hacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in hacks)
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-        
-        public DirtyHackCollection(ulong[] packedHacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in packedHacks.Select(EnabledDirtyHack.Unpack))
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-
-        public ulong[] PackEntries() =>
-            this
-                .Select(it => 
-                    BitTricks.PackBitFields([(uint)it.Key, (uint)it.Value], EnabledDirtyHack.PackedFormat))
-                .ToArray();
-
-        public static implicit operator DirtyHackCollection(EnabledDirtyHack[] hacks) => new(hacks);
-        public static implicit operator DirtyHackCollection(ulong[] packedHacks) => new(packedHacks);
-
-        public new int this[DirtyHacks hack] => TryGetValue(hack, out var value) ? value : -1;
-
-        public bool IsEnabled(DirtyHacks hack) => ContainsKey(hack);
-    }
-}

src/Ryujinx.Common/TitleIDs.cs

@@ -35,7 +35,8 @@ namespace Ryujinx.Common
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
             "01005CA01580E000", // Persona 5
-            "01001f5010dfa000", // Pokemon Legends Arceus
+            "0100187003A36000", // Pokémon: Let's Go, Evoli!
+            "010003f003a34000", // Pokémon: Let's Go, Pikachu!
             "01008C0016544000", // Sea of Stars
             "01006A800016E000", // Smash Ultimate
             "0100000000010000", // Super Mario Odyessy

src/Ryujinx.Common/Utilities/BitUtils.cs

@@ -40,5 +40,35 @@ namespace Ryujinx.Common
 
             return (value >> 32) | (value << 32);
         }
+        
+        // Never actually written bit packing logic before, so I looked it up.
+        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
+        
+        public static ulong PackBitFields(this uint[] values, byte[] bitFields)
+        {
+            ulong retVal = values[0]; //we set the first value right away
+            for (int f = 1; f < values.Length; f++)
+            {
+                retVal <<= bitFields[f]; // we shift the previous value
+                retVal += values[f];// and add our current value
+            }
+            return retVal;
+        }
+
+        public static uint[] UnpackBitFields(this ulong packed, byte[] bitFields)
+        {
+            int fields = bitFields.Length - 1; // number of fields to unpack
+            uint[] retArr = new uint[fields + 1]; // init return array
+            int curPos = 0; // current field bit position (start)
+            int lastEnd; // position where last field ended
+            for (int f = fields; f >= 0; f--) // loop from last
+            {
+                lastEnd = curPos; // we store where the last value ended
+                curPos += bitFields[f]; // we get where the current value starts
+                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
+                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
+            }
+            return retArr;
+        }
     }
 }

src/Ryujinx.Graphics.Gpu/GpuContext.cs

@@ -92,7 +92,11 @@ namespace Ryujinx.Graphics.Gpu
         /// </summary>
         internal SupportBufferUpdater SupportBufferUpdater { get; }
         
-        internal DirtyHackCollection DirtyHacks { get; }
+        /// <summary>
+        /// Enabled dirty hacks.
+        /// Used for workarounds to emulator bugs we can't fix/don't know how to fix yet.
+        /// </summary>
+        internal DirtyHacks DirtyHacks { get; }
         
 
         /// <summary>
@@ -117,7 +121,7 @@ namespace Ryujinx.Graphics.Gpu
         /// Creates a new instance of the GPU emulation context.
         /// </summary>
         /// <param name="renderer">Host renderer</param>
-        public GpuContext(IRenderer renderer, DirtyHackCollection hackCollection)
+        public GpuContext(IRenderer renderer, DirtyHacks hacks)
         {
             Renderer = renderer;
 
@@ -140,7 +144,7 @@ namespace Ryujinx.Graphics.Gpu
 
             SupportBufferUpdater = new SupportBufferUpdater(renderer);
 
-            DirtyHacks = hackCollection;
+            DirtyHacks = hacks;
 
             _firstTimestamp = ConvertNanosecondsToTicks((ulong)PerformanceCounter.ElapsedNanoseconds);
         }

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -367,8 +367,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         {
             try
             {
-                if (_context.DirtyHacks.IsEnabled(DirtyHacks.ShaderCompilationThreadSleep))
+                if (_context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
-                    Thread.Sleep(_context.DirtyHacks[DirtyHacks.ShaderCompilationThreadSleep]);
+                    Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
                 
                 AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
                 _asyncTranslationQueue.Add(asyncTranslation, _cancellationToken);

src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs

@@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
                 using var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true);
                 Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size);
                 
-                if (context.Device.DirtyHacks.IsEnabled(DirtyHacks.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication.Value == Xc2TitleId)
+                if (context.Device.DirtyHacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication.Value == Xc2TitleId)
                 {
                     // Add a load-bearing sleep to avoid XC2 softlock
                     // https://web.archive.org/web/20240728045136/https://github.com/Ryujinx/Ryujinx/issues/2357

src/Ryujinx.HLE/Switch.cs

@@ -40,7 +40,7 @@ namespace Ryujinx.HLE
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
-        public DirtyHackCollection DirtyHacks { get; }
+        public DirtyHacks DirtyHacks { get; }
 
         public Switch(HLEConfiguration configuration)
         {
@@ -57,7 +57,7 @@ namespace Ryujinx.HLE
                 : MemoryAllocationFlags.Reserve | MemoryAllocationFlags.Mirrorable;
 
 #pragma warning disable IDE0055 // Disable formatting
-            DirtyHacks        = new DirtyHackCollection(Configuration.Hacks);
+            DirtyHacks        = new DirtyHacks(Configuration.Hacks);
             AudioDeviceDriver = new CompatLayerHardwareDeviceDriver(Configuration.AudioDeviceDriver);
             Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
             Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);

src/Ryujinx/Assets/locales.json

@@ -1234,7 +1234,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "자주 묻는 질문(FAQ) 및 안내",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2609,7 +2609,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "펌웨어 버전 : {0}",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "Versão do firmware: {0}",
@@ -4009,7 +4009,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "PC 날짜와 시간에 동기화",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -15259,7 +15259,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "시스템 시간을 PC의 현재 날짜 및 시간과 일치하도록 다시 동기화합니다.\n\n이 설정은 활성 설정이 아니므로 여전히 동기화되지 않을 수 있으며, 이 경우 이 버튼을 다시 클릭하면 됩니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -20509,7 +20509,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "자동",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -20534,7 +20534,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "Vulkan을 사용합니다.\nARM 맥에서 해당 플랫폼에서 잘 실행되는 게임을 플레이하는 경우 Metal 후단부를 사용합니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",

src/Ryujinx/Ryujinx.csproj

@@ -15,10 +15,7 @@
 
   <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
     <Message Text="Building Validation Project for $(TargetFramework)" Importance="high" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Message Text="Building Validation Project for $(TargetFramework) with runtime $(RuntimeIdentifier)" Importance="high" Condition="'$(RuntimeIdentifier)' != ''" />
+    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet build -c Debug /clp:NoSummary" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --ucr true" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --runtime $(RuntimeIdentifier)" Condition="'$(RuntimeIdentifier)' != ''" />
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Properties="Configuration=Debug" />
     
   </Target>
 

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -15,7 +15,6 @@
     x:DataType="viewModels:MainWindowViewModel">
     <UserControl.Resources>
         <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -26,10 +25,10 @@
             Padding="8"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding GridSelectedApplication}"
+            ContextFlyout="{Binding GridAppContextMenu}"
             DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
+            ItemsSource="{Binding AppsObservableList}">
-            SelectionChanged="GameList_SelectionChanged">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <WrapPanel

src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs

@@ -26,11 +26,5 @@ namespace Ryujinx.Ava.UI.Controls
             if (sender is ListBox { SelectedItem: ApplicationData selected })
                 RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
-
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.GridSelectedApplication = selected;
-        }
     }
 }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -7,7 +7,6 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:converters="clr-namespace:Avalonia.Data.Converters;assembly=Avalonia.Base"
     d:DesignHeight="450"
     d:DesignWidth="800"
     Focusable="True"
@@ -16,7 +15,6 @@
     x:DataType="viewModels:MainWindowViewModel">
     <UserControl.Resources>
         <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -28,10 +26,10 @@
             Padding="8"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding ListSelectedApplication}"
+            ContextFlyout="{Binding ListAppContextMenu}"
             DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
+            ItemsSource="{Binding AppsObservableList}">
-            SelectionChanged="GameList_SelectionChanged">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <StackPanel

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -30,12 +30,6 @@ namespace Ryujinx.Ava.UI.Controls
                 RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
 
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.ListSelectedApplication = selected;
-        }
-
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel mwvm)

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -93,10 +93,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             _applicationData = applicationData;
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadDownloadableContents();
         }

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -245,9 +245,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         {
             if (Program.PreviewerDetached)
             {
-                _mainWindow =
+                _mainWindow = RyujinxApp.MainWindow;
-                    (MainWindow)((IClassicDesktopStyleApplicationLifetime)Application.Current
-                        .ApplicationLifetime).MainWindow;
 
                 AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);
 

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -123,8 +123,42 @@ namespace Ryujinx.Ava.UI.ViewModels
         private bool _isActive;
         private bool _isSubMenuOpen;
 
-        public ApplicationData ListSelectedApplication;
+        private ApplicationData _listSelectedApplication;
-        public ApplicationData GridSelectedApplication;
+        private ApplicationData _gridSelectedApplication;
+        private ApplicationContextMenu _listAppContextMenu;
+        private ApplicationContextMenu _gridAppContextMenu;
+
+        public ApplicationData ListSelectedApplication
+        {
+            get => _listSelectedApplication;
+            set
+            {
+                _listSelectedApplication = value;
+
+                if (_listSelectedApplication != null && _listAppContextMenu == null)
+                    ListAppContextMenu = new ApplicationContextMenu();
+                else if (_listSelectedApplication == null && _listAppContextMenu != null)
+                    ListAppContextMenu = null;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public ApplicationData GridSelectedApplication
+        {
+            get => _gridSelectedApplication;
+            set
+            {
+                _gridSelectedApplication = value;
+
+                if (_gridSelectedApplication != null && _gridAppContextMenu == null)
+                    GridAppContextMenu = new ApplicationContextMenu();
+                else if (_gridSelectedApplication == null && _gridAppContextMenu != null)
+                    GridAppContextMenu = null;
+                
+                OnPropertyChanged();
+            }
+        }
         
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
@@ -218,7 +252,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool CanUpdate
         {
-            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate(false);
+            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate();
             set
             {
                 _canUpdate = value;
@@ -247,6 +281,28 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public ApplicationContextMenu ListAppContextMenu
+        {
+            get => _listAppContextMenu;
+            set
+            {
+                _listAppContextMenu = value;
+                
+                OnPropertyChanged();
+            }
+        }
+        
+        public ApplicationContextMenu GridAppContextMenu
+        {
+            get => _gridAppContextMenu;
+            set
+            {
+                _gridAppContextMenu = value;
+                
+                OnPropertyChanged();
+            }
+        }
+
         public bool IsPaused
         {
             get => _isPaused;
@@ -418,13 +474,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool OpenUserSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
+        public bool OpenUserSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
 
-        public bool OpenDeviceSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
+        public bool OpenDeviceSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
 
         public bool TrimXCIEnabled => XCIFileTrimmer.CanTrim(SelectedApplication.Path, new XCITrimmerLog.MainWindow(this));
 
-        public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
+        public bool OpenBcatSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
         public string LoadHeading
         {

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -86,10 +86,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             _modJsonPath = Path.Combine(AppDataManager.GamesDirPath, applicationId.ToString("x16"), "mods.json");
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadMods(applicationId);
         }

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -76,10 +76,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             ApplicationData = applicationData;
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            StorageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                StorageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadUpdates();
         }

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void VSyncMode_PointerReleased(object sender, PointerReleasedEventArgs e)
         {
             Window.ViewModel.ToggleVSyncMode();
-            Logger.Info?.Print(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
+            Logger.Info?.PrintMsg(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
         }
 
         private void DockedStatus_PointerReleased(object sender, PointerReleasedEventArgs e)

src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs

@@ -26,7 +26,6 @@ namespace Ryujinx.Ava.UI.Views.Main
             {
                 DataContext = ViewModel = window.ViewModel;
             }
-
         }
 
         public void Sort_Checked(object sender, RoutedEventArgs args)

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -33,7 +33,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public string Path { get; set; }
         public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }
 
-        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0;
+        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0 && !ControlHolder.ByteSpan.IsZeros();
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -75,11 +75,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             TitleUpdates = _titleUpdates.AsObservableCache();
             DownloadableContents = _downloadableContents.AsObservableCache();
 
-            _nspIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSP.png");
+            _nspIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSP.png");
-            _xciIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_XCI.png");
+            _xciIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_XCI.png");
-            _ncaIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NCA.png");
+            _ncaIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NCA.png");
-            _nroIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NRO.png");
+            _nroIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NRO.png");
-            _nsoIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSO.png");
+            _nsoIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSO.png");
         }
 
         /// <exception cref="Ryujinx.HLE.Exceptions.InvalidNpdmException">The npdm file doesn't contain valid data.</exception>

src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using LibHac.Ns;
 using System;
 using System.Collections.Generic;
@@ -22,7 +23,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
 
             return new Array(receivedData.Where(game =>
-                communicationId.Items.Contains(Convert.ToUInt64(game.TitleId, 16))
+                communicationId.Items.Contains(game.TitleId.ToULong())
             ));
         }
 

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -272,7 +272,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public MemoryManagerMode MemoryManagerMode { get; set; }
 
         /// <summary>
-        /// Expands the RAM amount on the emulated system from 4GiB to 8GiB
+        /// Expands the RAM amount on the emulated system
         /// </summary>
         public MemoryConfiguration DramSize { get; set; }
 

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -666,14 +666,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     List<EnabledDirtyHack> enabledHacks = [];
                     
                     if (Xc2MenuSoftlockFix)
-                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
+                        Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
                     if (EnableShaderTranslationDelay)
-                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderTranslationDelay);
+                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
                     
                     return enabledHacks.ToArray();
 
-                    void Apply(DirtyHacks hack, int value = 0)
+                    void Apply(DirtyHack hack, int value = 0)
                     {
                         enabledHacks.Add(new EnabledDirtyHack(hack, value));
                     }