misc: New Solution Format (.SLNX)

Validation Project v2 (#444 )
Refactor of the Validation System for more ease of use in the future. The project now builds a standalone executable and executes it before the main project is built or published. Since it is now a standalone executable we are also able to use .NET Core features as we are no longer locked to netstandard. The project currently includes 1 task, LocalesValidationTask, that will check if the locales.json file has any of the following issues: The json is invalid. The json has locales with missing languages. The json has locales with langauges that are just duplicates of the en_US field. If the project is built or published locally it will also fix any missing languages or duplicate fields. --------- Co-authored-by: Evan Husted <gr33m11@gmail.com> Co-authored-by: Evan Husted <greem@greemdev.net>
2025-09-10 11:55:16 +00:00 · 2024-12-30 02:02:55 -06:00 · 2024-12-30 01:54:25 -06:00 · 2024-12-30 01:53:43 -06:00 · 2024-12-30 01:53:06 -06:00 · 2024-12-30 01:33:07 -06:00
22 changed files with 534 additions and 620 deletions
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -1,270 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32228.430
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Unicorn", "src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj", "{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE", "src\Ryujinx.HLE\Ryujinx.HLE.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.ShaderTools", "src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj", "{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Common", "src\Ryujinx.Common\Ryujinx.Common.csproj", "{5FD4E4F6-8928-4B3C-BE07-28A675C17226}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMeilleure", "src\ARMeilleure\ARMeilleure.csproj", "{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Gpu", "src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj", "{ADA7EA87-0D63-4D97-9433-922A2124401F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.GAL", "src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj", "{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.OpenGL", "src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj", "{9558FB96-075D-4219-8FFF-401979DC0B69}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture", "src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj", "{E1B1AD28-289D-47B7-A106-326972240207}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "src\Ryujinx.Audio\Ryujinx.Audio.csproj", "{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Memory", "src\Ryujinx.Memory\Ryujinx.Memory.csproj", "{A5E6C691-9E22-4263-8F40-42F002CE66BE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Memory", "src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj", "{D1CC5322-7325-4F6B-9625-194B30BE1296}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Cpu", "src\Ryujinx.Cpu\Ryujinx.Cpu.csproj", "{3DF35E3D-D844-4399-A9A1-A9E923264C17}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Device", "src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj", "{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Host1x", "src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj", "{C35F1536-7DE5-4F9D-9604-B5B4E1561947}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.Vp9", "src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj", "{B9AECA11-E248-4886-A10B-81B631CAAF29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vic", "src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj", "{81BB2C11-9408-4EA3-822E-42987AF54429}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Video", "src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj", "{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.OpenAL", "src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj", "{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SoundIo", "src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj", "{716364DE-B988-41A6-BAB4-327964266ECC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input", "src\Ryujinx.Input\Ryujinx.Input.csproj", "{C16F112F-38C3-40BC-9F5F-4791112063D6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input.SDL2", "src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj", "{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj", "{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Generators", "src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj", "{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vulkan", "src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj", "{D4D09B08-D580-4D69-B886-C35D2853F6C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spv.Generator", "src\Spv.Generator\Spv.Generator.csproj", "{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.UI.LocaleGenerator", "src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj", "{77D01AD9-2C98-478E-AE1D-8F7100738FB4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Common", "src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj", "{77F96ECE-4952-42DB-A528-DED25572A573}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryujinx.Horizon\Ryujinx.Horizon.csproj", "{AF34127A-3A92-43E5-8496-14960A50B1F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal.SharpMetalExtensions", "src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj", "{81EA598C-DBA1-40B0-8DA4-4796B78F2037}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.github\workflows\build.yml = .github\workflows\build.yml
-		.github\workflows\canary.yml = .github\workflows\canary.yml
-		Directory.Packages.props = Directory.Packages.props
-		.github\workflows\release.yml = .github\workflows\release.yml
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {110169B3-3328-4730-8AB0-BA05BEF75C1A}
-	EndGlobalSection
-EndGlobal
--- a/Ryujinx.slnx
+++ b/Ryujinx.slnx
@@ -0,0 +1,52 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".github\workflows\build.yml" />
+    <File Path=".github\workflows\canary.yml" />
+    <File Path="Directory.Packages.props" />
+    <File Path=".github\workflows\release.yml" />
+  </Folder>
+  <Project Path="src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj" Type="Classic C#" />
+  <Project Path="src\ARMeilleure\ARMeilleure.csproj" />
+  <Project Path="src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
+  <Project Path="src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
+  <Project Path="src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
+  <Project Path="src\Ryujinx.Audio\Ryujinx.Audio.csproj" />
+  <Project Path="src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Type="Classic C#">
+    <Configuration Solution="Debug|Any CPU" Project="Debug|Any CPU|NoBuild" />
+    <Configuration Solution="Release|Any CPU" Project="Release|Any CPU|NoBuild" />
+  </Project>
+  <Project Path="src\Ryujinx.Common\Ryujinx.Common.csproj" />
+  <Project Path="src\Ryujinx.Cpu\Ryujinx.Cpu.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj" />
+  <Project Path="src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj" />
+  <Project Path="src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj" />
+  <Project Path="src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+  <Project Path="src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj" />
+  <Project Path="src\Ryujinx.HLE\Ryujinx.HLE.csproj" />
+  <Project Path="src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj" />
+  <Project Path="src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj" />
+  <Project Path="src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj" />
+  <Project Path="src\Ryujinx.Horizon\Ryujinx.Horizon.csproj" />
+  <Project Path="src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
+  <Project Path="src\Ryujinx.Input\Ryujinx.Input.csproj" />
+  <Project Path="src\Ryujinx.Memory\Ryujinx.Memory.csproj" />
+  <Project Path="src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj" />
+  <Project Path="src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj" />
+  <Project Path="src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj" />
+  <Project Path="src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj" />
+  <Project Path="src\Ryujinx.Tests\Ryujinx.Tests.csproj" />
+  <Project Path="src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj" />
+  <Project Path="src\Ryujinx\Ryujinx.csproj" />
+  <Project Path="src\Spv.Generator\Spv.Generator.csproj" />
+</Solution>
--- a/distribution/linux/appimage/build-appimage.sh
+++ b/distribution/linux/appimage/build-appimage.sh
@@ -13,7 +13,7 @@ mkdir -p AppDir/usr/bin

 cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
 cp distribution/linux/appimage/AppRun AppDir/AppRun
-cp src/Ryujinx.UI.Common/Resources/Logo_Ryujinx.png AppDir/Ryujinx.svg
+cp distribution/misc/Logo.svg AppDir/Ryujinx.svg


 cp -r "$BUILDDIR"/* AppDir/usr/bin/
--- a/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
@@ -9,20 +9,12 @@ namespace Ryujinx.Audio.Backends.Dummy
 {
    public class DummyHardwareDeviceDriver : IHardwareDeviceDriver
    {
-        private readonly ManualResetEvent _updateRequiredEvent;
-        private readonly ManualResetEvent _pauseEvent;
+        private readonly ManualResetEvent _updateRequiredEvent = new(false);
+        private readonly ManualResetEvent _pauseEvent = new(true);

        public static bool IsSupported => true;

-        public float Volume { get; set; }
-
-        public DummyHardwareDeviceDriver()
-        {
-            _updateRequiredEvent = new ManualResetEvent(false);
-            _pauseEvent = new ManualResetEvent(true);
-
-            Volume = 1f;
-        }
+        public float Volume { get; set; } = 1f;

        public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount)
        {
@@ -60,7 +52,7 @@ namespace Ryujinx.Audio.Backends.Dummy
            Dispose(true);
        }

-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
        {
            if (disposing)
            {
--- a/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
@@ -1,73 +0,0 @@
-using System;
-using Microsoft.Build.Utilities;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using Newtonsoft.Json;
-using Microsoft.Build.Framework;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class LocaleValidationTask : Task
-    {
-        public override bool Execute()
-        {
-            string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
-
-            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
-            {
-                //i assume that we are in a build directory in the solution dir
-                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
-            }
-            else
-            {
-                path = path.Split(["src"], StringSplitOptions.None)[0];
-                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
-            }
-
-            string data;
-
-            using (StreamReader sr = new(path))
-            {
-                data = sr.ReadToEnd();
-            }
-
-            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
-
-            for (int i = 0; i < json.Locales.Count; i++)
-            {
-                LocalesEntry locale = json.Locales[i];
-
-                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
-                {
-                    locale.Translations.Add(langCode, string.Empty);
-                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
-                }
-
-                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-                json.Locales[i] = locale;
-            }
-
-            string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
-
-            using (StreamWriter sw = new(path))
-            {
-                sw.Write(jsonString);
-            }
-
-            return true;
-        }
-
-        struct LocalesJson
-        {
-            public List<string> Languages { get; set; }
-            public List<LocalesEntry> Locales { get; set; }
-        }
-
-        struct LocalesEntry
-        {
-            public string ID { get; set; }
-            public Dictionary<string, string> Translations { get; set; }
-        }
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using System.Text.Json;
+using System.Text.Encodings.Web;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class LocalesValidationTask : ValidationTask
+    {
+        public LocalesValidationTask() { }
+
+        public bool Execute(string projectPath, bool isGitRunner)
+        {
+            Console.WriteLine("Running Locale Validation Task...");
+
+            string path = projectPath + "src/Ryujinx/Assets/locales.json";
+            string data;
+
+            using (StreamReader sr = new(path))
+            {
+                data = sr.ReadToEnd();
+            }
+
+            LocalesJson json;
+
+            if (isGitRunner && data.Contains("\r\n"))
+                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, build locally to fix...");
+
+            try
+            {
+                json = JsonSerializer.Deserialize<LocalesJson>(data);
+
+            }
+            catch (JsonException e)
+            {
+                throw new JsonException(e.Message); //shorter and easier stacktrace
+            }
+
+
+
+            bool encounteredIssue = false;
+
+            for (int i = 0; i < json.Locales.Count; i++)
+            {
+                LocalesEntry locale = json.Locales[i];
+
+                foreach (string langCode in json.Languages.Where(lang => !locale.Translations.ContainsKey(lang)))
+                {
+                    encounteredIssue = true;
+
+                    if (!isGitRunner)
+                    {
+                        locale.Translations.Add(langCode, string.Empty);
+                        Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
+                    }
+                }
+
+                foreach (string langCode in json.Languages.Where(lang => locale.Translations.ContainsKey(lang) && lang != "en_US" && locale.Translations[lang] == locale.Translations["en_US"]))
+                {
+                    encounteredIssue = true;
+
+                    if (!isGitRunner)
+                    {
+                        locale.Translations[langCode] = string.Empty;
+                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
+                    }
+                }
+
+                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
+                json.Locales[i] = locale;
+            }
+
+            if (isGitRunner && encounteredIssue)
+                throw new JsonException("1 or more locales are invalid!");
+
+            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
+            {
+                WriteIndented = true,
+                NewLine = "\n",
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            };
+
+            string jsonString = JsonSerializer.Serialize(json, jsonOptions);
+
+            using (StreamWriter sw = new(path))
+            {
+                sw.Write(jsonString);
+            }
+
+            Console.WriteLine("Finished Locale Validation Task!");
+
+            return true;
+        }
+
+        struct LocalesJson
+        {
+            public List<string> Languages { get; set; }
+            public List<LocalesEntry> Locales { get; set; }
+        }
+
+        struct LocalesEntry
+        {
+            public string ID { get; set; }
+            public Dictionary<string, string> Translations { get; set; }
+        }
+    }
+}
--- a/src/Ryujinx.BuildValidationTasks/Program.cs
+++ b/src/Ryujinx.BuildValidationTasks/Program.cs
@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Linq;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            // Display the number of command line arguments.
+            if (args.Length == 0)
+                throw new ArgumentException("Error: too few arguments!");
+
+            string path = args[0];
+
+            if (string.IsNullOrEmpty(path))
+                throw new ArgumentException("Error: path is null or empty!");
+
+            if (!Path.Exists(path))
+                throw new FileLoadException($"path {{{path}}} does not exist!");
+
+            path = Path.GetFullPath(path);
+
+            if (!Directory.GetDirectories(path).Contains($"{path}src"))
+                throw new FileLoadException($"path {{{path}}} is not a valid ryujinx project!");
+
+            bool isGitRunner = path.Contains("runner") || path.Contains("D:\\a\\Ryujinx\\Ryujinx");
+            if (isGitRunner)
+                Console.WriteLine("Is Git Runner!");
+
+            // Run tasks
+            // Pass extra info needed in the task constructors
+            new LocalesValidationTask().Execute(path, isGitRunner);
+        }
+    }
+}
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <OutputType>Exe</OutputType>
  </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" />
-    <PackageReference Include="Newtonsoft.Json" />
-  </ItemGroup>
+  <Target Name="PostBuildTarget" AfterTargets="AfterBuild">
+    <Message Text="Running Validation Project" Importance="high" />

-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
-
-  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
-    <LocaleValidationTask />
+    <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
+      Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
+      ConsoleToMsBuild="true"
+      />
  </Target>

-</Project>
+</Project>
--- a/src/Ryujinx.BuildValidationTasks/ValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/ValidationTask.cs
@@ -0,0 +1,7 @@
+namespace Ryujinx.BuildValidationTasks
+{
+    public interface ValidationTask
+    {
+        public bool Execute(string projectPath, bool isGitRunner);
+    }
+}
--- a/src/Ryujinx.Common/Configuration/DirtyHacks.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHacks.cs
@@ -13,13 +13,13 @@ namespace Ryujinx.Common.Configuration

    public record EnabledDirtyHack(DirtyHacks Hack, int Value)
    {
-        private static readonly byte[] _packedFormat = [8, 32];
+        public static readonly byte[] PackedFormat = [8, 32];
        
-        public ulong Pack() => BitTricks.PackBitFields([(uint)Hack, (uint)Value], _packedFormat);
+        public ulong Pack() => BitTricks.PackBitFields([(uint)Hack, (uint)Value], PackedFormat);

-        public static EnabledDirtyHack FromPacked(ulong packedHack)
+        public static EnabledDirtyHack Unpack(ulong packedHack)
        {
-            var unpackedFields = BitTricks.UnpackBitFields(packedHack, _packedFormat);
+            var unpackedFields = BitTricks.UnpackBitFields(packedHack, PackedFormat);
            if (unpackedFields is not [var hack, var value])
                throw new ArgumentException(nameof(packedHack));
            
@@ -39,12 +39,21 @@ namespace Ryujinx.Common.Configuration
        
        public DirtyHackCollection(ulong[] packedHacks)
        {
-            foreach ((DirtyHacks dirtyHacks, int value) in packedHacks.Select(EnabledDirtyHack.FromPacked))
+            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);
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
@@ -366,6 +367,9 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        {
            try
            {
+                if (_context.DirtyHacks.IsEnabled(DirtyHacks.ShaderCompilationThreadSleep))
+                    Thread.Sleep(_context.DirtyHacks[DirtyHacks.ShaderCompilationThreadSleep]);
+                
                AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
                _asyncTranslationQueue.Add(asyncTranslation, _cancellationToken);
            }
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
@@ -114,10 +114,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
                }
            }

-            string usedCharacterStr = BitConverter.ToString(usedCharacter).Replace("-", "");
-            string variationStr = BitConverter.ToString(variation).Replace("-", "");
-            string amiiboIDStr = BitConverter.ToString(amiiboID).Replace("-", "");
-            string setIDStr = BitConverter.ToString(setID).Replace("-", "");
+            string usedCharacterStr = Convert.ToHexString(usedCharacter);
+            string variationStr = Convert.ToHexString(variation);
+            string amiiboIDStr = Convert.ToHexString(amiiboID);
+            string setIDStr = Convert.ToHexString(setID);
            string head = usedCharacterStr + variationStr;
            string tail = amiiboIDStr + setIDStr + "02";
            string finalID = head + tail;
@@ -289,8 +289,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption

        private static void LogFinalData(byte[] titleId, byte[] appId, string head, string tail, string finalID, string nickName, DateTime initDateTime, DateTime writeDateTime, ushort settingsValue, ushort writeCounterValue, byte[] applicationAreas)
        {
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Title ID: 0x{BitConverter.ToString(titleId).Replace("-", "")}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Application Program ID: 0x{BitConverter.ToString(appId).Replace("-", "")}");
+            Logger.Debug?.Print(LogClass.ServiceNfp, $"Title ID: 0x{Convert.ToHexString(titleId)}");
+            Logger.Debug?.Print(LogClass.ServiceNfp, $"Application Program ID: 0x{Convert.ToHexString(appId)}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Head: {head}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Tail: {tail}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Final ID: {finalID}");
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1564,7 +1564,7 @@
        "pl_PL": "Wersja",
        "pt_BR": "Versão",
        "ru_RU": "Версия",
-        "sv_SE": "Version",
+        "sv_SE": "",
        "th_TH": "เวอร์ชั่น",
        "tr_TR": "Sürüm",
        "uk_UA": "Версія",
@@ -2213,8 +2213,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "ExeFS",
-        "sv_SE": "ExeFS",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -2263,8 +2263,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "RomFS",
-        "sv_SE": "RomFS",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -2310,7 +2310,7 @@
        "it_IT": "",
        "ja_JP": "ロゴ",
        "ko_KR": "로고",
-        "no_NO": "Logo",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Лого",
@@ -3260,11 +3260,11 @@
        "it_IT": "Sistema",
        "ja_JP": "システム",
        "ko_KR": "시스템",
-        "no_NO": "System",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Sistema",
        "ru_RU": "Система",
-        "sv_SE": "System",
+        "sv_SE": "",
        "th_TH": "ระบบ",
        "tr_TR": "Sistem",
        "uk_UA": "Система",
@@ -3335,11 +3335,11 @@
        "it_IT": "Giappone",
        "ja_JP": "日本",
        "ko_KR": "일본",
-        "no_NO": "Japan",
+        "no_NO": "",
        "pl_PL": "Japonia",
        "pt_BR": "Japão",
        "ru_RU": "Япония",
-        "sv_SE": "Japan",
+        "sv_SE": "",
        "th_TH": "ญี่ปุ่น",
        "tr_TR": "Japonya",
        "uk_UA": "Японія",
@@ -3360,11 +3360,11 @@
        "it_IT": "Stati Uniti d'America",
        "ja_JP": "アメリカ",
        "ko_KR": "미국",
-        "no_NO": "USA",
+        "no_NO": "",
        "pl_PL": "Stany Zjednoczone",
        "pt_BR": "EUA",
        "ru_RU": "США",
-        "sv_SE": "USA",
+        "sv_SE": "",
        "th_TH": "สหรัฐอเมริกา",
        "tr_TR": "ABD",
        "uk_UA": "США",
@@ -3410,7 +3410,7 @@
        "it_IT": "",
        "ja_JP": "オーストラリア",
        "ko_KR": "호주",
-        "no_NO": "Australia",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Austrália",
        "ru_RU": "Австралия",
@@ -3460,11 +3460,11 @@
        "it_IT": "Corea",
        "ja_JP": "韓国",
        "ko_KR": "한국",
-        "no_NO": "Korea",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Coreia",
        "ru_RU": "Корея",
-        "sv_SE": "Korea",
+        "sv_SE": "",
        "th_TH": "เกาหลี",
        "tr_TR": "Kore",
        "uk_UA": "Корея",
@@ -3485,11 +3485,11 @@
        "it_IT": "",
        "ja_JP": "台湾",
        "ko_KR": "대만",
-        "no_NO": "Taiwan",
+        "no_NO": "",
        "pl_PL": "Tajwan",
        "pt_BR": "",
        "ru_RU": "Тайвань",
-        "sv_SE": "Taiwan",
+        "sv_SE": "",
        "th_TH": "ไต้หวัน",
        "tr_TR": "Tayvan",
        "uk_UA": "Тайвань",
@@ -3955,7 +3955,7 @@
        "el_GR": "Ζώνη Ώρας Συστήματος:",
        "en_US": "System Time Zone:",
        "es_ES": "Zona horaria del sistema:",
-        "fr_FR": "Fuseau horaire du système :",
+        "fr_FR": "Fuseau horaire du système\u00A0:",
        "he_IL": "אזור זמן מערכת:",
        "it_IT": "Fuso orario del sistema:",
        "ja_JP": "タイムゾーン:",
@@ -4135,11 +4135,11 @@
        "it_IT": "",
        "ja_JP": "ダミー",
        "ko_KR": "더미",
-        "no_NO": "Dummy",
+        "no_NO": "",
        "pl_PL": "Atrapa",
        "pt_BR": "Nenhuma",
        "ru_RU": "Без звука",
-        "sv_SE": "Dummy",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Yapay",
        "uk_UA": "",
@@ -4163,8 +4163,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "OpenAL",
-        "sv_SE": "OpenAL",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4188,8 +4188,8 @@
        "no_NO": "Lyd Inn/Ut",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "SoundIO",
-        "sv_SE": "SoundIO",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4213,8 +4213,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "SDL2",
-        "sv_SE": "SDL2",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4230,12 +4230,12 @@
        "el_GR": "Μικροδιορθώσεις",
        "en_US": "Hacks",
        "es_ES": "",
-        "fr_FR": "Hacks",
+        "fr_FR": "",
        "he_IL": "האצות",
        "it_IT": "Espedienti",
        "ja_JP": "ハック",
        "ko_KR": "핵",
-        "no_NO": "Hacks",
+        "no_NO": "",
        "pl_PL": "Hacki",
        "pt_BR": "",
        "ru_RU": "Хаки",
@@ -4314,7 +4314,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "4ГиБ",
-        "sv_SE": "4GiB",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "4Гб",
@@ -4339,7 +4339,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "6ГиБ",
-        "sv_SE": "6GiB",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "6Гб",
@@ -4364,7 +4364,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "8ГиБ",
-        "sv_SE": "8GiB",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "8Гб",
@@ -4389,7 +4389,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "12ГиБ",
-        "sv_SE": "12GiB",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "12Гб",
@@ -4585,11 +4585,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "2배",
-        "no_NO": "2x",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "2x",
-        "sv_SE": "2x",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4610,11 +4610,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "4배",
-        "no_NO": "4x",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "4x",
-        "sv_SE": "4x",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4635,11 +4635,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "8배",
-        "no_NO": "8x",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "8x",
-        "sv_SE": "8x",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4660,11 +4660,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "16배",
-        "no_NO": "16x",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "16x",
-        "sv_SE": "16x",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4760,11 +4760,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "2배(1440p/2160p)",
-        "no_NO": "2x (1440p/2160p)",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "2x (1440p/2160p)",
-        "sv_SE": "2x (1440p/2160p)",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4785,11 +4785,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "3배(2160p/3240p)",
-        "no_NO": "3x (2160p/3240p)",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "3x (2160p/3240p)",
-        "sv_SE": "3x (2160p/3240p)",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4863,8 +4863,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "4:3",
-        "sv_SE": "4:3",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4888,8 +4888,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "16:9",
-        "sv_SE": "16:9",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4913,8 +4913,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "16:10",
-        "sv_SE": "16:10",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4938,8 +4938,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "21:9",
-        "sv_SE": "21:9",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4960,11 +4960,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "",
-        "no_NO": "32:9",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "32:9",
-        "sv_SE": "32:9",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -5060,7 +5060,7 @@
        "it_IT": "Log",
        "ja_JP": "ロギング",
        "ko_KR": "로그 기록",
-        "no_NO": "Logging",
+        "no_NO": "",
        "pl_PL": "Dziennik zdarzeń",
        "pt_BR": "Log",
        "ru_RU": "Журналирование",
@@ -5085,7 +5085,7 @@
        "it_IT": "Log",
        "ja_JP": "ロギング",
        "ko_KR": "로그 기록",
-        "no_NO": "Logging",
+        "no_NO": "",
        "pl_PL": "Dziennik zdarzeń",
        "pt_BR": "Log",
        "ru_RU": "Журналирование",
@@ -6113,8 +6113,8 @@
        "no_NO": "",
        "pl_PL": "Pro Kontroler",
        "pt_BR": "",
-        "ru_RU": "Pro Controller",
-        "sv_SE": "Pro Controller",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "โปรคอนโทรลเลอร์",
        "tr_TR": "Profesyonel Kumanda",
        "uk_UA": "Контролер Pro",
@@ -8088,8 +8088,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Enter",
-        "sv_SE": "Enter",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8114,7 +8114,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Esc",
-        "sv_SE": "Escape",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Esc",
        "uk_UA": "",
@@ -8163,8 +8163,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Tab",
-        "sv_SE": "Tab",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8188,8 +8188,8 @@
        "no_NO": "Tilbaketast",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Backspace",
-        "sv_SE": "Backspace",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Geri tuşu",
        "uk_UA": "",
@@ -8213,8 +8213,8 @@
        "no_NO": "Sett inn",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Insert",
-        "sv_SE": "Insert",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8238,8 +8238,8 @@
        "no_NO": "Slett",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Delete",
-        "sv_SE": "Delete",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8263,8 +8263,8 @@
        "no_NO": "Side opp",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Page Up",
-        "sv_SE": "Page Up",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8288,8 +8288,8 @@
        "no_NO": "Side ned",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Page Down",
-        "sv_SE": "Page Down",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8313,8 +8313,8 @@
        "no_NO": "Hjem",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Home",
-        "sv_SE": "Home",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8338,8 +8338,8 @@
        "no_NO": "Avslutt",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "End",
-        "sv_SE": "End",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8363,8 +8363,8 @@
        "no_NO": "Skiftelås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Caps Lock",
-        "sv_SE": "Caps Lock",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8388,8 +8388,8 @@
        "no_NO": "Rullelås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Scroll Lock",
-        "sv_SE": "Scroll Lock",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8413,8 +8413,8 @@
        "no_NO": "Skjermbilde",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Print Screen",
-        "sv_SE": "Print Screen",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8438,8 +8438,8 @@
        "no_NO": "Stans midlertidig",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Pause",
-        "sv_SE": "Pause",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8463,8 +8463,8 @@
        "no_NO": "Numerisk Lås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Num Lock",
-        "sv_SE": "Num Lock",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8514,7 +8514,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 0",
-        "sv_SE": "Keypad 0",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8539,7 +8539,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 1",
-        "sv_SE": "Keypad 1",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8564,7 +8564,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 2",
-        "sv_SE": "Keypad 2",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8589,7 +8589,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 3",
-        "sv_SE": "Keypad 3",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8614,7 +8614,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 4",
-        "sv_SE": "Keypad 4",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8639,7 +8639,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 5",
-        "sv_SE": "Keypad 5",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8664,7 +8664,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 6",
-        "sv_SE": "Keypad 6",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8689,7 +8689,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 7",
-        "sv_SE": "Keypad 7",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8714,7 +8714,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 8",
-        "sv_SE": "Keypad 8",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8739,7 +8739,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 9",
-        "sv_SE": "Keypad 9",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8889,7 +8889,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Enter (блок цифр)",
-        "sv_SE": "Keypad Enter",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8913,7 +8913,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "0",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8938,7 +8938,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "1",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8963,7 +8963,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "2",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8988,7 +8988,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "3",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9013,7 +9013,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "4",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9038,7 +9038,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "5",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9063,7 +9063,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "6",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9088,7 +9088,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "7",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9113,7 +9113,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "8",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9138,7 +9138,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "9",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9163,7 +9163,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "~",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9188,7 +9188,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "`",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9213,7 +9213,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "-",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9238,7 +9238,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "+",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9263,7 +9263,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "[",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9288,7 +9288,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "]",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9313,7 +9313,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": ";",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9363,7 +9363,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": ",",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9388,7 +9388,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": ".",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9413,7 +9413,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "/",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9738,7 +9738,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "-",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9763,7 +9763,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "+",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "4",
@@ -9789,7 +9789,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Кнопка меню",
-        "sv_SE": "Guide",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Rehber",
        "uk_UA": "",
@@ -12438,7 +12438,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "{0}: {1}",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -14289,7 +14289,7 @@
        "pl_PL": "Seria Amiibo",
        "pt_BR": "Franquia Amiibo",
        "ru_RU": "Серия Amiibo",
-        "sv_SE": "Amiibo Series",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Amiibo Serisi",
        "uk_UA": "Серія Amiibo",
@@ -15755,7 +15755,7 @@
        "el_GR": "",
        "en_US": "Aspect Ratio applied to the renderer window.\n\nOnly change this if you're using an aspect ratio mod for your game, otherwise the graphics will be stretched.\n\nLeave on 16:9 if unsure.",
        "es_ES": "Relación de aspecto aplicada a la ventana del renderizador.\n\nSolamente modificar esto si estás utilizando un mod de relación de aspecto para su juego, en cualquier otro caso los gráficos se estirarán.\n\nDejar en 16:9 si no sabe que hacer.",
-        "fr_FR": "Format d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
+        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
        "he_IL": "",
        "it_IT": "Proporzioni dello schermo applicate alla finestra di renderizzazione.\n\nCambialo solo se stai usando una mod di proporzioni per il tuo gioco, altrimenti la grafica verrà allungata.\n\nLasciare il 16:9 se incerto.",
        "ja_JP": "レンダリングウインドウに適用するアスペクト比です.\n\nゲームにアスペクト比を変更する mod を使用している場合のみ変更してください.\n\nわからない場合は16:9のままにしておいてください.\n",
@@ -17439,7 +17439,7 @@
        "pl_PL": "Wersja {0}",
        "pt_BR": "Versão {0}",
        "ru_RU": "Версия {0}",
-        "sv_SE": "Version {0}",
+        "sv_SE": "",
        "th_TH": "เวอร์ชั่น {0}",
        "tr_TR": "Sürüm {0}",
        "uk_UA": "Версія {0}",
@@ -17664,7 +17664,7 @@
        "pl_PL": "",
        "pt_BR": "Ryujinx - Informação",
        "ru_RU": "Ryujinx - Информация",
-        "sv_SE": "Ryujinx - Info",
+        "sv_SE": "",
        "th_TH": "Ryujinx – ข้อมูล",
        "tr_TR": "Ryujinx - Bilgi",
        "uk_UA": "Ryujin x - Інформація",
@@ -18813,8 +18813,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Amiibo",
-        "sv_SE": "Amiibo",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -19435,7 +19435,7 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "XCI 파일 트리머",
-        "no_NO": "XCI File Trimmer",
+        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Уменьшение размера XCI файлов",
@@ -19639,7 +19639,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "{0:n0} Мб",
-        "sv_SE": "{0:n0} Mb",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "{0:n0} Мб",
@@ -20914,7 +20914,7 @@
        "pl_PL": "Głoś",
        "pt_BR": "",
        "ru_RU": "Громкость",
-        "sv_SE": "Vol",
+        "sv_SE": "",
        "th_TH": "ระดับเสียง",
        "tr_TR": "Ses",
        "uk_UA": "Гуч.",
@@ -21055,7 +21055,7 @@
        "el_GR": "Όνομα",
        "en_US": "Name",
        "es_ES": "Nombre",
-        "fr_FR": "Nom ",
+        "fr_FR": "Nom\u00A0",
        "he_IL": "שם",
        "it_IT": "Nome",
        "ja_JP": "名称",
@@ -21388,8 +21388,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "FSR",
-        "sv_SE": "FSR",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -21888,8 +21888,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "ldn_mitm",
-        "sv_SE": "ldn_mitm",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -21913,8 +21913,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "RyuLDN",
-        "sv_SE": "RyuLDN",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22214,7 +22214,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Вертикальная синхронизация:",
-        "sv_SE": "VSync:",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Вертикальна синхронізація (VSync):",
@@ -22255,7 +22255,7 @@
        "el_GR": "",
        "en_US": "Switch",
        "es_ES": "",
-        "fr_FR": "Switch",
+        "fr_FR": "",
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
@@ -22264,7 +22264,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Консоль",
-        "sv_SE": "Switch",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22598,4 +22598,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -13,9 +13,13 @@
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

-  <Target Name="BuildValidationProj" BeforeTargets="BeforeRebuild">
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Rebuild">
-    </MSBuild>
+  <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 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>

  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@@ -0,0 +1,77 @@
+using Gommon;
+using Ryujinx.Ava.Utilities.Configuration;
+
+namespace Ryujinx.Ava.UI.ViewModels
+{
+    public class SettingsHacksViewModel : BaseModel
+    {
+        private readonly SettingsViewModel _baseViewModel;
+
+        public SettingsHacksViewModel() {}
+        
+        public SettingsHacksViewModel(SettingsViewModel settingsVm)
+        {
+            _baseViewModel = settingsVm;
+        }
+
+        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
+        private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderTranslationDelay;
+        
+        public bool Xc2MenuSoftlockFixEnabled
+        {
+            get => _xc2MenuSoftlockFix;
+            set
+            {
+                _xc2MenuSoftlockFix = value;
+                
+                OnPropertyChanged();
+            }
+        }
+        
+        public bool ShaderTranslationDelayEnabled
+        {
+            get => _shaderTranslationThreadSleep;
+            set
+            {
+                _shaderTranslationThreadSleep = value;
+                
+                OnPropertyChanged();
+            }
+        }
+
+        public string ShaderTranslationDelayTooltipText => $"Current value: {ShaderTranslationDelay}"; 
+        
+        public int ShaderTranslationDelay
+        {
+            get => _shaderTranslationSleepDelay;
+            set
+            {
+                _shaderTranslationSleepDelay = value;
+                
+                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayTooltipText));
+            }
+        }
+        
+        public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine(
+                    "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                .AppendLine();
+            
+            sb.AppendLine("From the issue on GitHub:").AppendLine();
+            sb.Append(
+                "When clicking very fast from game main menu to 2nd submenu, " +
+                "there is a low chance that the game will softlock, " +
+                "the submenu won't show up, while background music is still there.");
+        });
+
+        public static string ShaderTranslationDelayTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine("This hack applies the delay you specify every time shaders are attempted to be translated.")
+                .AppendLine();
+
+            sb.Append("Configurable via slider, only when this option is enabled.");
+        });
+    }
+}
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -65,9 +65,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private string _ldnPassphrase;
        private string _ldnServer;

-        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
-        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderCompilationThreadSleep;
-        private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderCompilationThreadSleepDelay;
+        public SettingsHacksViewModel DirtyHacks { get; }

        public int ResolutionScale
        {
@@ -279,39 +277,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public bool Xc2MenuSoftlockFixEnabled
-        {
-            get => _xc2MenuSoftlockFix;
-            set
-            {
-                _xc2MenuSoftlockFix = value;
-                
-                OnPropertyChanged();
-            }
-        }
-        
-        public bool ShaderTranslationDelayEnabled
-        {
-            get => _shaderTranslationThreadSleep;
-            set
-            {
-                _shaderTranslationThreadSleep = value;
-                
-                OnPropertyChanged();
-            }
-        }
-        
-        public int ShaderTranslationDelay
-        {
-            get => _shaderTranslationSleepDelay;
-            set
-            {
-                _shaderTranslationSleepDelay = value;
-                
-                OnPropertyChanged();
-            }
-        }
-
        public int Language { get; set; }
        public int Region { get; set; }
        public int FsGlobalAccessLogMode { get; set; }
@@ -424,9 +389,12 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
+            
            if (Program.PreviewerDetached)
            {
                Task.Run(LoadTimeZones);
+                
+                DirtyHacks = new SettingsHacksViewModel(this);
            }
        }

@@ -446,6 +414,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            {
                Task.Run(LoadAvailableGpus);
                LoadCurrentConfiguration();
+
+                DirtyHacks = new SettingsHacksViewModel(this);
            }
        }

@@ -660,9 +630,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;

            MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value;
-            DisableP2P = config.Multiplayer.DisableP2p.Value;
-            LdnPassphrase = config.Multiplayer.LdnPassphrase.Value;
-            LdnServer = config.Multiplayer.LdnServer.Value;
+            DisableP2P = config.Multiplayer.DisableP2p;
+            LdnPassphrase = config.Multiplayer.LdnPassphrase;
+            LdnServer = config.Multiplayer.LdnServer;
        }

        public void SaveSettings()
@@ -786,9 +756,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Multiplayer.LdnServer.Value = LdnServer;
            
            // Dirty Hacks
-            config.Hacks.Xc2MenuSoftlockFix.Value = Xc2MenuSoftlockFixEnabled;
-            config.Hacks.EnableShaderCompilationThreadSleep.Value = ShaderTranslationDelayEnabled;
-            config.Hacks.ShaderCompilationThreadSleepDelay.Value = ShaderTranslationDelay;
+            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFixEnabled;
+            config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
+            config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;

            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);

@@ -822,24 +792,5 @@ namespace Ryujinx.Ava.UI.ViewModels
            RevertIfNotSaved();
            CloseWindow?.Invoke();
        }
-
-        public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
-        {
-            sb.AppendLine(
-                "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
-                .AppendLine();
-            
-            sb.AppendLine("From the issue on GitHub:").AppendLine();
-            sb.Append(
-                "When clicking very fast from game main menu to 2nd submenu, " +
-                "there is a low chance that the game will softlock, " +
-                "the submenu won't show up, while background music is still there.");
-        });
-        
-        public static string ShaderTranslationDelayTooltip { get; } = Lambda.String(sb =>
-        {
-            sb.Append(
-                "This hack applies the delay you specify every time shaders are attempted to be translated.");
-        });
    }
 }
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@@ -29,34 +29,35 @@
                <TextBlock
                    Foreground="{DynamicResource SecondaryTextColor}"
                    TextDecorations="Underline"
-                    Text="Game-specific hacks &amp; tricks to alleviate performance issues or crashing. May cause issues." />
+                    Text="Game-specific hacks &amp; tricks to alleviate performance issues or crashing. Will cause issues." />
                <StackPanel
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding Xc2MenuFixTooltip}">
+                    ToolTip.Tip="{Binding DirtyHacks.Xc2MenuFixTooltip}">
                    <CheckBox
                        Margin="0"
-                        IsChecked="{Binding Xc2MenuSoftlockFixEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFixEnabled}"/>
                    <TextBlock
                        VerticalAlignment="Center"
                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                </StackPanel>
-                <!--<Separator/>
+                <Separator/>
                <StackPanel
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding ShaderTranslationDelayTooltip}">
+                    ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltip}">
                    <CheckBox
                        Margin="0"
-                        IsChecked="{Binding ShaderTranslationDelayEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"/>
                    <TextBlock VerticalAlignment="Center"
                               Text="Arbitrary Delay on Shader Translation"/>
                </StackPanel>
-                <Slider HorizontalAlignment="Center" 
-                        Value="{Binding ShaderTranslationDelay}"
-                        ToolTip.Tip="{Binding ShaderTranslationDelay}"
+                <Slider IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
+                        HorizontalAlignment="Center" 
+                        Value="{Binding DirtyHacks.ShaderTranslationDelay}"
+                        ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltipText}"
                        Width="175"
                        Margin="0,-3,0,0"
                        Height="32"
@@ -68,7 +69,7 @@
                        VerticalAlignment="Center"
                        Minimum="1"
                        Maximum="1000" />
-                <Separator/>-->
+                <Separator/>
            </StackPanel>
        </Border>
    </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml.cs
@@ -1,13 +1,9 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.ViewModels;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
    public partial class SettingsHacksView : UserControl
    {
-        public SettingsViewModel ViewModel;
-        
        public SettingsHacksView()
        {
            InitializeComponent();
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -170,7 +170,7 @@ namespace Ryujinx.Ava.UI.Windows
            {
                var ldnGameDataArray = e.LdnData.ToList();
                ViewModel.LdnData.Clear();
-                foreach (var application in ViewModel.Applications)
+                foreach (var application in ViewModel.Applications.Where(it => it.HasControlHolder))
                {
                    ref var controlHolder = ref application.ControlHolder.Value;
                    
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.UI.Windows
                        NavPanel.Content = LoggingPage;
                        break;
                    case nameof(HacksPage):
-                        HacksPage.ViewModel = ViewModel;
+                        HacksPage.DataContext = ViewModel;
                        NavPanel.Content = HacksPage;
                        break;
                    default:
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -752,13 +752,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
            Hacks.ShowDirtyHacks.Value = configurationFileFormat.ShowDirtyHacks;

            {
-                EnabledDirtyHack[] hacks = configurationFileFormat.DirtyHacks.Select(EnabledDirtyHack.FromPacked).ToArray();
+                EnabledDirtyHack[] hacks = (configurationFileFormat.DirtyHacks ?? []).Select(EnabledDirtyHack.Unpack).ToArray();
            
                Hacks.Xc2MenuSoftlockFix.Value = hacks.Any(it => it.Hack == DirtyHacks.Xc2MenuSoftlockFix);
-            
-                var shaderCompilationThreadSleep = hacks.FirstOrDefault(it => it.Hack == DirtyHacks.ShaderCompilationThreadSleep);
-                Hacks.EnableShaderCompilationThreadSleep.Value = shaderCompilationThreadSleep != null;
-                Hacks.ShaderCompilationThreadSleepDelay.Value = shaderCompilationThreadSleep?.Value ?? 0;
+                
+                var shaderCompilationThreadSleep = hacks.FirstOrDefault(it => 
+                    it.Hack == DirtyHacks.ShaderCompilationThreadSleep);
+                Hacks.EnableShaderTranslationDelay.Value = shaderCompilationThreadSleep != null;
+                Hacks.ShaderTranslationDelay.Value = shaderCompilationThreadSleep?.Value ?? 0;
            }

            if (configurationFileUpdated)
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
@@ -10,6 +10,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using System.Collections.Generic;
 using System.Linq;
+using RyuLogger = Ryujinx.Common.Logging.Logger;

 namespace Ryujinx.Ava.Utilities.Configuration
 {
@@ -628,25 +629,36 @@ namespace Ryujinx.Ava.Utilities.Configuration
            
            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
            
-            public ReactiveObject<bool> EnableShaderCompilationThreadSleep { get; private set; }
+            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
            
-            public ReactiveObject<int> ShaderCompilationThreadSleepDelay { get; private set; }
+            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }

            public HacksSection()
            {
                ShowDirtyHacks = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderCompilationThreadSleep = new ReactiveObject<bool>();
-                EnableShaderCompilationThreadSleep.Event += HackChanged;
-                ShaderCompilationThreadSleepDelay = new ReactiveObject<int>();
+                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                EnableShaderTranslationDelay.Event += HackChanged;
+                ShaderTranslationDelay = new ReactiveObject<int>();
            }

            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
            {
-                Ryujinx.Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"EnabledDirtyHacks set to: [{EnabledHacks.Select(x => x.Hack).JoinToString(", ")}]", "LogValueChange");
+                var newHacks = EnabledHacks.Select(x => x.Hack)
+                    .JoinToString(", ");
+
+                if (newHacks != _lastHackCollection)
+                {
+                    RyuLogger.Info?.Print(LogClass.Configuration, 
+                        $"EnabledDirtyHacks set to: [{newHacks}]", "LogValueChange");
+
+                    _lastHackCollection = newHacks;
+                }
            }

+            private static string _lastHackCollection;
+
            public EnabledDirtyHack[] EnabledHacks
            {
                get
@@ -656,8 +668,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                    if (Xc2MenuSoftlockFix)
                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
                    
-                    if (EnableShaderCompilationThreadSleep)
-                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderCompilationThreadSleepDelay);
+                    if (EnableShaderTranslationDelay)
+                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderTranslationDelay);
                    
                    return enabledHacks.ToArray();
Author	SHA1	Message	Date
Evan Husted	7cbbd02973	misc: New Solution Format (.SLNX)	2024-12-30 02:02:55 -06:00
LotP1	b2e1e553e4	Validation Project v2 (#444 ) Refactor of the Validation System for more ease of use in the future. The project now builds a standalone executable and executes it before the main project is built or published. Since it is now a standalone executable we are also able to use .NET Core features as we are no longer locked to netstandard. The project currently includes 1 task, LocalesValidationTask, that will check if the locales.json file has any of the following issues: The json is invalid. The json has locales with missing languages. The json has locales with langauges that are just duplicates of the en_US field. If the project is built or published locally it will also fix any missing languages or duplicate fields. --------- Co-authored-by: Evan Husted <gr33m11@gmail.com> Co-authored-by: Evan Husted <greem@greemdev.net>	2024-12-30 01:54:25 -06:00
Marco Carvalho	699e1962b1	Prefer 'Convert.ToHexString' over call chains based on 'BitConverter.ToString' (#428 ) [ci-skip] Co-authored-by: Evan Husted <greem@greemdev.net>	2024-12-30 01:53:43 -06:00
WilliamWsyHK	e486b902b1	Skip processing application for LDN if it does not have control holder (#460 ) [ci-skip]	2024-12-30 01:53:06 -06:00
Evan Husted	0ab5b41c4b	misc: Move dirty hack related stuff into a separate viewmodel, only show slider when translation delay is enabled.	2024-12-30 01:33:07 -06:00
Otozinclus	d10a478cce	Shader translation delay hack (#469 ) A workaround to avoid a freeze when translating shaders with the Metal backend, that would happen after changing version or going from Vulkan to Metal. Adds a delay in milliseconds, configurable in the UI behind the Dirty Hacks mechanism. --------- Co-authored-by: Evan Husted <greem@greemdev.net>	2024-12-30 01:12:51 -06:00
Evan Husted	ec1020b165	UI: Dirty hacks clarification [ci skip]	2024-12-30 01:10:40 -06:00
Evan Husted	4082ebad1a	Fix PR builds	2024-12-30 00:35:43 -06:00
Evan Husted	da8ea06074	misc: Small cleanups	2024-12-30 00:14:55 -06:00
Evan Husted	7f9dccb293	misc: chore: Cleanup DummyHardwareDeviceDriver.cs	2024-12-30 00:09:31 -06:00
Evan Husted	8e4a77aba0	UI: Text in the shader translation slider tooltip	2024-12-30 00:09:19 -06:00
Evan Husted	8fd8a776c9	misc: prevent crashes	2024-12-29 23:39:40 -06:00