Merge branch 'master' into update-es-es

Fixed an oopsies
Update es_ES part 2
2024-12-12 09:18:21 -03:00 · 2024-12-07 23:53:17 -03:00 · 2024-12-07 23:49:39 -03:00 · 2024-12-07 22:14:31 -03:00
185 changed files with 16295 additions and 23095 deletions
@@ -61,12 +61,12 @@ jobs:
            
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | Windows 64 bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64 bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux arm 64 bit | [Canary Linux arm Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -200,12 +200,12 @@ jobs:

            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
-            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
-            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
-            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
            
-            "**Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -272,7 +272,19 @@ jobs:
          name: "Canary ${{ steps.version_info.outputs.build_version }}"
          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
-          body: ""
+          body: |
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/GreemDev/Ryujinx/releases/latest) instead if that sounds like something you don't want to deal with.
+            
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -57,9 +57,9 @@ jobs:
            # Regular builds:
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | [Release Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Linux 64-bit | [Release Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Release Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | Windows 64 bit | [Release Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64 bit | [Release Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux arm 64 bit | [Release Linux arm Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Release macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
@@ -189,10 +189,10 @@ jobs:
            # Regular builds:
            | Platform | Artifact |
            |--|--|
-            | Windows 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
-            | Linux 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
-            | Linux ARM 64-bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
-            | macOS | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
          
            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
@@ -261,7 +261,16 @@ jobs:
          name: ${{ steps.version_info.outputs.build_version }}
          artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
-          body: ""
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -5,7 +5,7 @@ If you wish to build the emulator yourself, follow these steps:

 ### Step 1

-Install the [.NET 9.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/9.0).
+Install the [.NET 8.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/8.0).
 Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).

 ### Step 2
@@ -1,6 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-</Project>
@@ -10,9 +10,6 @@
    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
@@ -51,8 +48,8 @@
    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+    <PackageVersion Include="System.Management" Version="8.0.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
 </Project>
@@ -1,26 +1,35 @@
-<table align="center">
-    <tr>
-        <td align="center" width="25%">
-            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
-        </td>
-        <td align="center" width="75%">
-          
-# Ryujinx
-          
-[![Release workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml)
-[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/GreemDev/Ryujinx/releases/latest)
+<h1 align="center">
  <br>
-[![Canary workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml)
-[![Latest canary release](https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary)](https://github.com/GreemDev/Ryujinx-Canary/releases/latest)
-        </td>
-    </tr>
-</table>
+  <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/master/distribution/misc/Logo.svg" alt="Ryujinx" width="150"></a>
+  <br>
+  <b>Ryujinx</b>
+  <br>
+  <sub><sup><b>(REE-YOU-JINX)</b></sup></sub>
+  <br>
+    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml">
+        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg"
+            alt="">
+    </a>
+    <a href="https://github.com/GreemDev/Ryujinx/releases/latest">
+        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx"
+            alt="Latest Release">
+    </a>
+  <br>
+    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml">
+        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg"
+            alt="">
+    </a>
+    <a href="https://github.com/GreemDev/Ryujinx-Canary/releases/latest">
+        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary"
+            alt="Latest Canary Release">
+    </a>
+</h1>

 <p align="center">
  Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
  This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
  It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on GitHub under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on Github under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
  <br />
 </p>
 <p align="center">
@@ -84,14 +84,12 @@ 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
+		.github/workflows/release.yml = .github/workflows/release.yml
+		.github/workflows/canary.yml = .github/workflows/canary.yml
+		.github/workflows/build.yml = .github/workflows/build.yml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -254,9 +252,6 @@ Global
 		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "9.0.100",
+    "version": "8.0.100",
    "rollForward": "latestFeature"
  }
 }
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,5 +1,4 @@
 using ARMeilleure.Common;
-using System;

 namespace ARMeilleure.Decoders
 {
@@ -150,7 +149,7 @@ namespace ARMeilleure.Decoders
            return (((long)opCode << 45) >> 48) & ~3;
        }

-        public static bool VectorArgumentsInvalid(bool q, params ReadOnlySpan<int> args)
+        public static bool VectorArgumentsInvalid(bool q, params int[] args)
        {
            if (q)
            {
@@ -264,7 +264,7 @@ namespace ARMeilleure.Instructions
            return TblOrTbx(dest, vector, bytes, tb0, tb1, tb2, tb3);
        }

-        private static V128 TblOrTbx(V128 dest, V128 vector, int bytes, params ReadOnlySpan<V128> tb)
+        private static V128 TblOrTbx(V128 dest, V128 vector, int bytes, params V128[] tb)
        {
            byte[] res = new byte[16];

@@ -337,7 +337,7 @@ namespace ARMeilleure.IntermediateRepresentation
                return result;
            }

-            public static Operation Operation(Intrinsic intrin, Operand dest, params ReadOnlySpan<Operand> srcs)
+            public static Operation Operation(Intrinsic intrin, Operand dest, params Operand[] srcs)
            {
                Operation result = Make(Instruction.Extended, 0, srcs.Length);

@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using System.Threading;

 namespace ARMeilleure.Translation.Cache
 {
@@ -27,7 +26,7 @@ namespace ARMeilleure.Translation.Cache

        private static readonly List<CacheEntry> _cacheEntries = new();

-        private static readonly Lock _lock = new();
+        private static readonly object _lock = new();
        private static bool _initialized;

        [SupportedOSPlatform("windows")]
@@ -559,27 +559,27 @@ namespace ARMeilleure.Translation
            return dest;
        }

-        public Operand AddIntrinsic(Intrinsic intrin, params ReadOnlySpan<Operand> args)
+        public Operand AddIntrinsic(Intrinsic intrin, params Operand[] args)
        {
            return Add(intrin, Local(OperandType.V128), args);
        }

-        public Operand AddIntrinsicInt(Intrinsic intrin, params ReadOnlySpan<Operand> args)
+        public Operand AddIntrinsicInt(Intrinsic intrin, params Operand[] args)
        {
            return Add(intrin, Local(OperandType.I32), args);
        }

-        public Operand AddIntrinsicLong(Intrinsic intrin, params ReadOnlySpan<Operand> args)
+        public Operand AddIntrinsicLong(Intrinsic intrin, params Operand[] args)
        {
            return Add(intrin, Local(OperandType.I64), args);
        }

-        public void AddIntrinsicNoRet(Intrinsic intrin, params ReadOnlySpan<Operand> args)
+        public void AddIntrinsicNoRet(Intrinsic intrin, params Operand[] args)
        {
            Add(intrin, default, args);
        }

-        private Operand Add(Intrinsic intrin, Operand dest, params ReadOnlySpan<Operand> sources)
+        private Operand Add(Intrinsic intrin, Operand dest, params Operand[] sources)
        {
            NewNextBlockIfNeeded();

@@ -59,7 +59,7 @@ namespace ARMeilleure.Translation.PTC

        private readonly ManualResetEvent _waitEvent;

-        private readonly Lock _lock = new();
+        private readonly object _lock;

        private bool _disposed;

@@ -89,6 +89,8 @@ namespace ARMeilleure.Translation.PTC

            _waitEvent = new ManualResetEvent(true);

+            _lock = new object();
+
            _disposed = false;

            TitleIdText = TitleIdTextDefault;
@@ -41,7 +41,7 @@ namespace ARMeilleure.Translation.PTC

        private readonly ManualResetEvent _waitEvent;

-        private readonly Lock _lock = new();
+        private readonly object _lock;

        private bool _disposed;

@@ -65,6 +65,8 @@ namespace ARMeilleure.Translation.PTC

            _waitEvent = new ManualResetEvent(true);

+            _lock = new object();
+
            _disposed = false;

            ProfiledFuncs = new Dictionary<ulong, FuncProfile>();
@@ -5,7 +5,6 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;

 namespace Ryujinx.Audio.Backends.OpenAL
 {
@@ -19,7 +18,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
        private ulong _playedSampleCount;
        private float _volume;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        public OpenALHardwareDeviceSession(OpenALHardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
        {
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
@@ -11,7 +11,7 @@ namespace Ryujinx.Audio
        /// <summary>
        /// Lock used to control the waiters registration.
        /// </summary>
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        /// <summary>
        /// Events signaled when the driver played audio buffers.
@@ -2,7 +2,6 @@ using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using System;
 using System.Buffers;
-using System.Threading;

 namespace Ryujinx.Audio.Backends.Common
 {
@@ -13,7 +12,7 @@ namespace Ryujinx.Audio.Backends.Common
    {
        private const int RingBufferAlignment = 2048;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private MemoryOwner<byte> _bufferOwner;
        private Memory<byte> _buffer;
@@ -14,12 +14,12 @@ namespace Ryujinx.Audio.Input
    /// </summary>
    public class AudioInputManager : IDisposable
    {
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        /// <summary>
        /// Lock used for session allocation.
        /// </summary>
-        private readonly Lock _sessionLock = new();
+        private readonly object _sessionLock = new();

        /// <summary>
        /// The session ids allocation table.
@@ -48,7 +48,7 @@ namespace Ryujinx.Audio.Input
        /// <summary>
        /// The lock of the parent.
        /// </summary>
-        private readonly Lock _parentLock;
+        private readonly object _parentLock;

        /// <summary>
        /// The dispose state.
@@ -62,7 +62,7 @@ namespace Ryujinx.Audio.Input
        /// <param name="parentLock">The lock of the manager</param>
        /// <param name="deviceSession">The hardware device session</param>
        /// <param name="bufferEvent">The buffer release event of the audio input</param>
-        public AudioInputSystem(AudioInputManager manager, Lock parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
+        public AudioInputSystem(AudioInputManager manager, object parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
        {
            _manager = manager;
            _parentLock = parentLock;
@@ -14,12 +14,12 @@ namespace Ryujinx.Audio.Output
    /// </summary>
    public class AudioOutputManager : IDisposable
    {
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        /// <summary>
        /// Lock used for session allocation.
        /// </summary>
-        private readonly Lock _sessionLock = new();
+        private readonly object _sessionLock = new();

        /// <summary>
        /// The session ids allocation table.
@@ -48,7 +48,7 @@ namespace Ryujinx.Audio.Output
        /// <summary>
        /// THe lock of the parent.
        /// </summary>
-        private readonly Lock _parentLock;
+        private readonly object _parentLock;

        /// <summary>
        /// The dispose state.
@@ -62,7 +62,7 @@ namespace Ryujinx.Audio.Output
        /// <param name="parentLock">The lock of the manager</param>
        /// <param name="deviceSession">The hardware device session</param>
        /// <param name="bufferEvent">The buffer release event of the audio output</param>
-        public AudioOutputSystem(AudioOutputManager manager, Lock parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
+        public AudioOutputSystem(AudioOutputManager manager, object parentLock, IHardwareDeviceSession deviceSession, IWritableEvent bufferEvent)
        {
            _manager = manager;
            _parentLock = parentLock;
@@ -26,7 +26,7 @@ namespace Ryujinx.Audio.Renderer.Server
 {
    public class AudioRenderSystem : IDisposable
    {
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private AudioRendererRenderingDevice _renderingDevice;
        private AudioRendererExecutionMode _executionMode;
@@ -19,12 +19,12 @@ namespace Ryujinx.Audio.Renderer.Server
        /// <summary>
        /// Lock used for session allocation.
        /// </summary>
-        private readonly Lock _sessionLock = new();
+        private readonly object _sessionLock = new();

        /// <summary>
        /// Lock used to control the <see cref="AudioProcessor"/> running state.
        /// </summary>
-        private readonly Lock _audioProcessorLock = new();
+        private readonly object _audioProcessorLock = new();

        /// <summary>
        /// The session ids allocation table.
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Threading;

 namespace Ryujinx.Audio.Renderer.Server.Upsampler
 {
@@ -17,7 +16,7 @@ namespace Ryujinx.Audio.Renderer.Server.Upsampler
        /// <summary>
        /// Global lock of the object.
        /// </summary>
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        /// <summary>
        /// The upsamplers instances.
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,76 +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(new string[] { "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(new string[] { "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 StreamReader(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 language in json.Languages)
-                {
-                    if (!locale.Translations.ContainsKey(language))
-                    {
-                        locale.Translations.Add(language, "");
-                        Log.LogMessage(MessageImportance.High, $"Added {{{language}}} 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 StreamWriter(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; }
-        }
-    }
-}
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" />
-    <PackageReference Include="Newtonsoft.Json" />
-  </ItemGroup>
-
-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
-
-  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
-    <LocaleValidationTask />
-  </Target>
-
-</Project>
@@ -124,7 +124,7 @@ namespace Ryujinx.Common.PreciseSleep
            }
        }

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();
        private readonly List<NanosleepThread> _threads = new();
        private readonly List<NanosleepThread> _active = new();
        private readonly Stack<NanosleepThread> _free = new();
@@ -50,7 +50,7 @@ namespace Ryujinx.Common.SystemInterop
        private long _lastTicks = PerformanceCounter.ElapsedTicks;
        private long _lastId;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();
        private readonly List<WaitingObject> _waitingObjects = new();

        private WindowsGranularTimer()
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
@@ -1,7 +1,6 @@
 using Ryujinx.Memory;
 using System;
 using System.Runtime.Versioning;
-using System.Threading;

 namespace Ryujinx.Cpu.AppleHv
 {
@@ -13,7 +12,7 @@ namespace Ryujinx.Cpu.AppleHv

        private static int _addressSpaces;
        private static HvIpaAllocator _ipaAllocator;
-        private static readonly Lock _lock = new();
+        private static readonly object _lock = new();

        public static (ulong, HvIpaAllocator) CreateAddressSpace(MemoryBlock block)
        {
@@ -115,9 +115,6 @@ namespace Ryujinx.Cpu.Jit.HostTracked
            }

            private readonly AddressIntrusiveRedBlackTree<Mapping> _mappingTree;
-            
-            // type is not Lock due to the unique usage of this mechanism,
-            // an arbitrary object is used as the lock passed in by constructor.
            private readonly object _lock;

            public Block(MemoryTracking tracking, Func<ulong, ulong> readPtCallback, MemoryBlock memory, ulong size, object locker) : base(memory, size)
@@ -177,9 +174,6 @@ namespace Ryujinx.Cpu.Jit.HostTracked

        private readonly MemoryTracking _tracking;
        private readonly Func<ulong, ulong> _readPtCallback;
-        
-        // type is not Lock due to the unique usage of this mechanism,
-        // an arbitrary object is used as the lock passed in by constructor.
        private readonly object _lock;

        public AddressSpacePartitionAllocator(
@@ -478,7 +478,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
            bool skipContext,
            int spillBaseOffset,
            int? resultRegister,
-            params ReadOnlySpan<ulong> callArgs)
+            params ulong[] callArgs)
        {
            uint resultMask = 0u;

@@ -417,7 +417,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
            nint funcPtr,
            int spillBaseOffset,
            int? resultRegister,
-            params ReadOnlySpan<ulong> callArgs)
+            params ulong[] callArgs)
        {
            uint resultMask = 0u;

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using System.Threading;

 namespace Ryujinx.Cpu.LightningJit.Cache
 {
@@ -24,7 +23,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache

        private static readonly List<CacheEntry> _cacheEntries = new();

-        private static readonly Lock _lock = new();
+        private static readonly object _lock = new();
        private static bool _initialized;

        [SupportedOSPlatform("windows")]
@@ -4,7 +4,6 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;

 namespace Ryujinx.Cpu.LightningJit.Cache
 {
@@ -105,7 +104,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
        private readonly MemoryCache _sharedCache;
        private readonly MemoryCache _localCache;
        private readonly PageAlignedRangeList _pendingMap;
-        private readonly Lock _lock = new();
+        private readonly object _lock;

        class ThreadLocalCacheEntry
        {
@@ -138,6 +137,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
            _sharedCache = new(allocator, SharedCacheSize);
            _localCache = new(allocator, LocalCacheSize);
            _pendingMap = new(_sharedCache.ReprotectAsRx, RegisterFunction);
+            _lock = new();
        }

        public unsafe nint Map(nint framePointer, ReadOnlySpan<byte> code, ulong guestAddress, ulong guestSize)
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -5,7 +5,6 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading;

 namespace Ryujinx.Cpu.Signal
 {
@@ -60,7 +59,7 @@ namespace Ryujinx.Cpu.Signal

        private static MemoryBlock _codeBlock;

-        private static readonly Lock _lock = new();
+        private static readonly object _lock = new();
        private static bool _initialized;

        static NativeSignalHandler()
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -58,7 +58,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
        public uint ProgramCount { get; set; } = 0;

        private Action _interruptAction;
-        private readonly Lock _interruptLock = new();
+        private readonly object _interruptLock = new();

        public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -8,7 +8,6 @@ using Ryujinx.Graphics.Texture;
 using Ryujinx.Memory.Range;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;

 namespace Ryujinx.Graphics.Gpu.Image
@@ -999,7 +998,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                    {
                        bool dataOverlaps = texture.DataOverlaps(overlap, compatibility);

-                        if (!overlap.IsView && dataOverlaps && !incompatibleOverlaps.Any(incompatible => incompatible.Group == overlap.Group))
+                        if (!overlap.IsView && dataOverlaps && !incompatibleOverlaps.Exists(incompatible => incompatible.Group == overlap.Group))
                        {
                            incompatibleOverlaps.Add(new TextureIncompatibleOverlap(overlap.Group, compatibility));
                        }
@@ -7,7 +7,6 @@ using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;

 namespace Ryujinx.Graphics.Gpu.Image
@@ -1556,7 +1555,7 @@ namespace Ryujinx.Graphics.Gpu.Image
        /// <param name="copy">True if the overlap should register copy dependencies</param>
        public void RegisterIncompatibleOverlap(TextureIncompatibleOverlap other, bool copy)
        {
-            if (!_incompatibleOverlaps.Any(overlap => overlap.Group == other.Group))
+            if (!_incompatibleOverlaps.Exists(overlap => overlap.Group == other.Group))
            {
                if (copy && other.Compatibility == TextureViewCompatibility.LayoutIncompatible)
                {
@@ -1702,4 +1701,3 @@ namespace Ryujinx.Graphics.Gpu.Image
        }
    }
 }
-
@@ -721,7 +721,7 @@ namespace Ryujinx.Graphics.Gpu.Image
        /// <param name="format">The format of the texture</param>
        /// <param name="components">The texture swizzle components</param>
        /// <returns>The depth-stencil mode</returns>
-        private static DepthStencilMode GetDepthStencilMode(Format format, params ReadOnlySpan<SwizzleComponent> components)
+        private static DepthStencilMode GetDepthStencilMode(Format format, params SwizzleComponent[] components)
        {
            // R = Depth, G = Stencil.
            // On 24-bits depth formats, this is inverted (Stencil is R etc).
@@ -2,7 +2,6 @@ using Ryujinx.Common.Pools;
 using Ryujinx.Memory.Range;
 using System;
 using System.Linq;
-using System.Threading;

 namespace Ryujinx.Graphics.Gpu.Memory
 {
@@ -77,7 +76,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
        private BufferMigration _source;
        private BufferModifiedRangeList _migrationTarget;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        /// <summary>
        /// Whether the modified range list has any entries or not.
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.OpenGL.Queries
        private ulong _accumulatedCounter;
        private int _waiterCount;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private readonly Queue<BufferedQuery> _queryPool;
        private readonly AutoResetEvent _queuedEvent = new(false);
@@ -24,7 +24,7 @@ namespace Ryujinx.Graphics.OpenGL.Queries
        private bool _hostAccessReserved = false;
        private int _refCount = 1; // Starts with a reference from the counter queue.

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();
        private ulong _result = ulong.MaxValue;
        private double _divisor = 1f;

@@ -2,7 +2,6 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.OpenGL.Image;
 using System;
 using System.Collections.Generic;
-using System.Threading;

 namespace Ryujinx.Graphics.OpenGL
 {
@@ -20,7 +19,7 @@ namespace Ryujinx.Graphics.OpenGL
    {
        private const int DisposedLiveFrames = 2;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();
        private readonly Dictionary<TextureCreateInfo, List<DisposedTexture>> _textures = new();

        /// <summary>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -4,7 +4,6 @@ using Ryujinx.Graphics.Shader.StructuredIr;
 using Ryujinx.Graphics.Shader.Translation;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using static Spv.Specification;

 namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
@@ -20,12 +19,13 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
        private const int GeneratorPoolCount = 1;
        private static readonly ObjectPool<SpvInstructionPool> _instructionPool;
        private static readonly ObjectPool<SpvLiteralIntegerPool> _integerPool;
-        private static readonly Lock _poolLock = new();
+        private static readonly object _poolLock;

        static SpirvGenerator()
        {
            _instructionPool = new(() => new SpvInstructionPool(), GeneratorPoolCount);
            _integerPool = new(() => new SpvLiteralIntegerPool(), GeneratorPoolCount);
+            _poolLock = new object();
        }

        private const HelperFunctionsMask NeedsInvocationIdMask = HelperFunctionsMask.SwizzleAdd;
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -25,7 +25,7 @@ namespace Ryujinx.Graphics.Vulkan
            {
                bool useBackground = _gd.BackgroundQueue.Handle != 0 && _gd.Vendor != Vendor.Amd;
                Queue queue = useBackground ? _gd.BackgroundQueue : _gd.Queue;
-                Lock queueLock = useBackground ? _gd.BackgroundQueueLock : _gd.QueueLock;
+                object queueLock = useBackground ? _gd.BackgroundQueueLock : _gd.QueueLock;

                lock (queueLock)
                {
@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly Vk _api;
        private readonly Device _device;
        private readonly Queue _queue;
-        private readonly Lock _queueLock;
+        private readonly object _queueLock;
        private readonly bool _concurrentFenceWaitUnsupported;
        private readonly CommandPool _pool;
        private readonly Thread _owner;
@@ -63,7 +63,7 @@ namespace Ryujinx.Graphics.Vulkan
            Vk api,
            Device device,
            Queue queue,
-            Lock queueLock,
+            object queueLock,
            uint queueFamilyIndex,
            bool concurrentFenceWaitUnsupported,
            bool isLight = false)
@@ -68,7 +68,7 @@ namespace Ryujinx.Graphics.Vulkan
            _optimalTable = new FormatFeatureFlags[totalFormats];
        }

-        public bool BufferFormatsSupport(FormatFeatureFlags flags, params ReadOnlySpan<Format> formats)
+        public bool BufferFormatsSupport(FormatFeatureFlags flags, params Format[] formats)
        {
            foreach (Format format in formats)
            {
@@ -81,7 +81,7 @@ namespace Ryujinx.Graphics.Vulkan
            return true;
        }

-        public bool OptimalFormatsSupport(FormatFeatureFlags flags, params ReadOnlySpan<Format> formats)
+        public bool OptimalFormatsSupport(FormatFeatureFlags flags, params Format[] formats)
        {
            foreach (Format format in formats)
            {
@@ -148,7 +148,7 @@ namespace Ryujinx.Graphics.Vulkan
            return (formatFeatureFlags & flags) == flags;
        }

-        public VkFormat ConvertToVkFormat(Format srcFormat, bool storageFeatureFlagRequired)
+        public VkFormat ConvertToVkFormat(Format srcFormat)
        {
            var format = FormatTable.GetFormat(srcFormat);

@@ -165,7 +165,7 @@ namespace Ryujinx.Graphics.Vulkan
                requiredFeatures |= FormatFeatureFlags.ColorAttachmentBit;
            }

-            if (srcFormat.IsImageCompatible() && storageFeatureFlagRequired)
+            if (srcFormat.IsImageCompatible())
            {
                requiredFeatures |= FormatFeatureFlags.StorageImageBit;
            }
@@ -5,7 +5,6 @@ using Silk.NET.Vulkan;
 using Silk.NET.Vulkan.Extensions.EXT;
 using System;
 using System.Collections.Generic;
-using System.Threading;

 namespace Ryujinx.Graphics.Vulkan
 {
@@ -32,7 +31,7 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly Vk _api;
        private readonly ExtExternalMemoryHost _hostMemoryApi;
        private readonly Device _device;
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private readonly List<HostMemoryAllocation> _allocations;
        private readonly IntervalTree<ulong, HostMemoryAllocation> _allocationTree;
@@ -29,17 +29,11 @@ namespace Ryujinx.Graphics.Vulkan
            int colorCount = 0;
            int maxColorAttachmentIndex = -1;

-            bool isNotMsOrSupportsStorage = gd.Capabilities.SupportsShaderStorageImageMultisample ||
-                 !state.DepthStencilFormat.IsImageCompatible();
-
            for (int i = 0; i < state.AttachmentEnable.Length; i++)
            {
                if (state.AttachmentEnable[i])
                {
-                    bool isNotMsOrSupportsStorageAttachments = gd.Capabilities.SupportsShaderStorageImageMultisample ||
-                         !state.AttachmentFormats[i].IsImageCompatible();
-
-                    attachmentFormats[attachmentCount] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i], isNotMsOrSupportsStorageAttachments);
+                    attachmentFormats[attachmentCount] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i]);

                    attachmentIndices[attachmentCount++] = i;
                    colorCount++;
@@ -49,7 +43,7 @@ namespace Ryujinx.Graphics.Vulkan

            if (state.DepthStencilEnable)
            {
-                attachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat, isNotMsOrSupportsStorage);
+                attachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat);
            }

            if (attachmentCount != 0)
@@ -302,10 +296,7 @@ namespace Ryujinx.Graphics.Vulkan
            {
                if (state.AttachmentEnable[i])
                {
-                    bool isNotMsOrSupportsStorage = gd.Capabilities.SupportsShaderStorageImageMultisample ||
-                         !state.AttachmentFormats[i].IsImageCompatible();
-
-                    pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i], isNotMsOrSupportsStorage);
+                    pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i]);
                    maxColorAttachmentIndex = i;

                    if (state.AttachmentFormats[i].IsInteger())
@@ -319,10 +310,7 @@ namespace Ryujinx.Graphics.Vulkan

            if (state.DepthStencilEnable)
            {
-                bool isNotMsOrSupportsStorage = !state.DepthStencilFormat.IsImageCompatible() ||
-                     gd.Capabilities.SupportsShaderStorageImageMultisample;
-
-                pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat, isNotMsOrSupportsStorage);
+                pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat);
            }

            pipeline.ColorBlendAttachmentStateCount = (uint)(maxColorAttachmentIndex + 1);
@@ -24,7 +24,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries
        private ulong _accumulatedCounter;
        private int _waiterCount;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private readonly Queue<BufferedQuery> _queryPool;
        private readonly AutoResetEvent _queuedEvent = new(false);
@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries
        private bool _hostAccessReserved;
        private int _refCount = 1; // Starts with a reference from the counter queue.

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();
        private ulong _result = ulong.MaxValue;
        private double _divisor = 1f;

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -5,7 +5,6 @@ using shaderc;
 using Silk.NET.Vulkan;
 using System;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Threading.Tasks;

 namespace Ryujinx.Graphics.Vulkan
@@ -14,7 +13,7 @@ namespace Ryujinx.Graphics.Vulkan
    {
        // The shaderc.net dependency's Options constructor and dispose are not thread safe.
        // Take this lock when using them.
-        private static readonly Lock _shaderOptionsLock = new();
+        private static readonly object _shaderOptionsLock = new();

        private static readonly nint _ptrMainEntryPointName = Marshal.StringToHGlobalAnsi("main");

@@ -77,9 +77,7 @@ namespace Ryujinx.Graphics.Vulkan
            _device = device;
            _info = info;

-            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
-
-            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
+            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format);
            var levels = (uint)info.Levels;
            var layers = (uint)info.GetLayers();
            var depth = (uint)(info.Target == Target.Texture3D ? info.Depth : 1);
@@ -93,7 +91,7 @@ namespace Ryujinx.Graphics.Vulkan

            var sampleCountFlags = ConvertToSampleCountFlags(gd.Capabilities.SupportedSampleCounts, (uint)info.Samples);

-            var usage = GetImageUsage(info.Format, gd.Capabilities, isMsImageStorageSupported, true);
+            var usage = GetImageUsage(info.Format, info.Target, gd.Capabilities);

            var flags = ImageCreateFlags.CreateMutableFormatBit | ImageCreateFlags.CreateExtendedUsageBit;

@@ -307,7 +305,7 @@ namespace Ryujinx.Graphics.Vulkan
            }
        }

-        public static ImageUsageFlags GetImageUsage(Format format, in HardwareCapabilities capabilities, bool isMsImageStorageSupported, bool extendedUsage)
+        public static ImageUsageFlags GetImageUsage(Format format, Target target, in HardwareCapabilities capabilities)
        {
            var usage = DefaultUsageFlags;

@@ -320,7 +318,9 @@ namespace Ryujinx.Graphics.Vulkan
                usage |= ImageUsageFlags.ColorAttachmentBit;
            }

-            if ((format.IsImageCompatible() && isMsImageStorageSupported) || extendedUsage)
+            bool supportsMsStorage = capabilities.SupportsShaderStorageImageMultisample;
+
+            if (format.IsImageCompatible() && (supportsMsStorage || !target.IsMultisample()))
            {
                usage |= ImageUsageFlags.StorageBit;
            }
@@ -61,11 +61,8 @@ namespace Ryujinx.Graphics.Vulkan

            gd.Textures.Add(this);

-            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
-
-            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
-            var usage = TextureStorage.GetImageUsage(info.Format, gd.Capabilities, isMsImageStorageSupported, false);
-
+            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format);
+            var usage = TextureStorage.GetImageUsage(info.Format, info.Target, gd.Capabilities);
            var levels = (uint)info.Levels;
            var layers = (uint)info.GetLayers();

@@ -11,7 +11,6 @@ using Silk.NET.Vulkan.Extensions.KHR;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Threading;
 using Format = Ryujinx.Graphics.GAL.Format;
 using PrimitiveTopology = Ryujinx.Graphics.GAL.PrimitiveTopology;
 using SamplerCreateInfo = Ryujinx.Graphics.GAL.SamplerCreateInfo;
@@ -46,8 +45,8 @@ namespace Ryujinx.Graphics.Vulkan
        internal uint QueueFamilyIndex { get; private set; }
        internal Queue Queue { get; private set; }
        internal Queue BackgroundQueue { get; private set; }
-        internal Lock BackgroundQueueLock { get; private set; }
-        internal Lock QueueLock { get; private set; }
+        internal object BackgroundQueueLock { get; private set; }
+        internal object QueueLock { get; private set; }

        internal MemoryAllocator MemoryAllocator { get; private set; }
        internal HostMemoryAllocator HostMemoryAllocator { get; private set; }
@@ -164,7 +163,7 @@ namespace Ryujinx.Graphics.Vulkan
            {
                Api.GetDeviceQueue(_device, queueFamilyIndex, 1, out var backgroundQueue);
                BackgroundQueue = backgroundQueue;
-                BackgroundQueueLock = new();
+                BackgroundQueueLock = new object();
            }

            PhysicalDeviceProperties2 properties2 = new()
@@ -497,7 +496,7 @@ namespace Ryujinx.Graphics.Vulkan

            Api.GetDeviceQueue(_device, queueFamilyIndex, 0, out var queue);
            Queue = queue;
-            QueueLock = new();
+            QueueLock = new object();

            LoadFeatures(maxQueueCount, queueFamilyIndex);

@@ -22,7 +22,6 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
 using Path = System.IO.Path;

 namespace Ryujinx.HLE.FileSystem
@@ -56,7 +55,7 @@ namespace Ryujinx.HLE.FileSystem

        private readonly VirtualFileSystem _virtualFileSystem;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        public ContentManager(VirtualFileSystem virtualFileSystem)
        {
@@ -397,7 +396,7 @@ namespace Ryujinx.HLE.FileSystem
            if (locationList != null)
            {
                LocationEntry entry =
-                    locationList.ToList().FirstOrDefault(x => x.TitleId == titleId && x.ContentType == contentType);
+                    locationList.ToList().Find(x => x.TitleId == titleId && x.ContentType == contentType);

                if (entry.ContentPath != null)
                {
@@ -425,7 +424,7 @@ namespace Ryujinx.HLE.FileSystem
        {
            LinkedList<LocationEntry> locationList = _locationEntries[storageId];

-            return locationList.ToList().FirstOrDefault(x => x.TitleId == titleId && x.ContentType == contentType);
+            return locationList.ToList().Find(x => x.TitleId == titleId && x.ContentType == contentType);
        }

        public void InstallFirmware(string firmwareSource)
@@ -720,7 +719,7 @@ namespace Ryujinx.HLE.FileSystem

                if (updateNcas.TryGetValue(SystemUpdateTitleId, out var ncaEntry))
                {
-                    string metaPath = ncaEntry.FirstOrDefault(x => x.type == NcaContentType.Meta).path;
+                    string metaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path;

                    CnmtContentMetaEntry[] metaEntries = null;

@@ -756,7 +755,7 @@ namespace Ryujinx.HLE.FileSystem

                    if (updateNcas.TryGetValue(SystemVersionTitleId, out var updateNcasItem))
                    {
-                        string versionEntry = updateNcasItem.FirstOrDefault(x => x.type != NcaContentType.Meta).path;
+                        string versionEntry = updateNcasItem.Find(x => x.type != NcaContentType.Meta).path;

                        using Stream ncaStream = GetZipStream(archive.GetEntry(versionEntry));
                        Nca nca = new(_virtualFileSystem.KeySet, ncaStream.AsStorage());
@@ -775,9 +774,9 @@ namespace Ryujinx.HLE.FileSystem
                    {
                        if (updateNcas.TryGetValue(metaEntry.TitleId, out ncaEntry))
                        {
-                            metaPath = ncaEntry.FirstOrDefault(x => x.type == NcaContentType.Meta).path;
+                            metaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path;

-                            string contentPath = ncaEntry.FirstOrDefault(x => x.type != NcaContentType.Meta).path;
+                            string contentPath = ncaEntry.Find(x => x.type != NcaContentType.Meta).path;

                            // Nintendo in 9.0.0, removed PPC and only kept the meta nca of it.
                            // This is a perfect valid case, so we should just ignore the missing content nca and continue.
@@ -916,8 +915,8 @@ namespace Ryujinx.HLE.FileSystem
                {
                    if (updateNcas.TryGetValue(metaEntry.TitleId, out var ncaEntry))
                    {
-                        string metaNcaPath = ncaEntry.FirstOrDefault(x => x.type == NcaContentType.Meta).path;
-                        string contentPath = ncaEntry.FirstOrDefault(x => x.type != NcaContentType.Meta).path;
+                        string metaNcaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path;
+                        string contentPath = ncaEntry.Find(x => x.type != NcaContentType.Meta).path;

                        // Nintendo in 9.0.0, removed PPC and only kept the meta nca of it.
                        // This is a perfect valid case, so we should just ignore the missing content nca and continue.
@@ -46,7 +46,7 @@ namespace Ryujinx.HLE.FileSystem
                    continue;
                }

-                string ncaId = Convert.ToHexStringLower(entry.NcaId).Replace("-", null);
+                string ncaId = BitConverter.ToString(entry.NcaId).Replace("-", null).ToLower();
                Nca nca = _pfs.GetNca(keySet, $"/{ncaId}.nca");

                if (nca.GetProgramIndex() == programIndex)
@@ -14,7 +14,6 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Applets
 {
@@ -63,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Applets
        private bool _canAcceptController = false;
        private KeyboardInputMode _inputMode = KeyboardInputMode.ControllerAndKeyboard;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        public event EventHandler AppletStateChanged;

@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
@@ -22,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
        const string CancelText = "Cancel";
        const string ControllerToggleText = "Toggle input";

-        private readonly Lock _bufferLock = new();
+        private readonly object _bufferLock = new();

        private RenderingSurfaceInfo _surfaceInfo = null;
        private SKImageInfo _imageInfo;
@@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard

        private TRef<bool> _cancelled = null;
        private Thread _thread = null;
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        public bool IsRunning
        {
@@ -16,8 +16,6 @@ using Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemA
 using Ryujinx.HLE.HOS.Services.Apm;
 using Ryujinx.HLE.HOS.Services.Caps;
 using Ryujinx.HLE.HOS.Services.Mii;
-using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
-using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
 using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
 using Ryujinx.HLE.HOS.Services.Nv;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
@@ -339,11 +337,6 @@ namespace Ryujinx.HLE.HOS

        public void ScanAmiibo(int nfpDeviceId, string amiiboId, bool useRandomUuid)
        {
-            if (VirtualAmiibo.ApplicationBytes.Length > 0)
-            {
-                VirtualAmiibo.ApplicationBytes = new byte[0];
-                VirtualAmiibo.InputBin = string.Empty;
-            }
            if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag)
            {
                NfpDevices[nfpDeviceId].State = NfpDeviceState.TagFound;
@@ -351,22 +344,6 @@ namespace Ryujinx.HLE.HOS
                NfpDevices[nfpDeviceId].UseRandomUuid = useRandomUuid;
            }
        }
-        public void ScanAmiiboFromBin(string path)
-        {
-            VirtualAmiibo.InputBin = path;
-            if (VirtualAmiibo.ApplicationBytes.Length > 0)
-            {
-                VirtualAmiibo.ApplicationBytes = new byte[0];
-            }
-            byte[] encryptedData = File.ReadAllBytes(path);
-            VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData);
-            if (SearchingForAmiibo(out int nfpDeviceId))
-            {
-                NfpDevices[nfpDeviceId].State = NfpDeviceState.TagFound;
-                NfpDevices[nfpDeviceId].AmiiboId = newFile.AmiiboId;
-                NfpDevices[nfpDeviceId].UseRandomUuid = false;
-            }
-        }

        public bool SearchingForAmiibo(out int nfpDeviceId)
        {
@@ -2,7 +2,6 @@ using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.Horizon.Common;
 using System.Collections.Generic;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Kernel.Common
 {
@@ -15,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
        private readonly long[] _current2;
        private readonly long[] _peak;

-        private readonly Lock _lock = new();
+        private readonly object _lock;

        private readonly LinkedList<KThread> _waitingThreads;

@@ -28,6 +27,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
            _current2 = new long[(int)LimitableResource.Count];
            _peak = new long[(int)LimitableResource.Count];

+            _lock = new object();
+
            _waitingThreads = new LinkedList<KThread>();
        }

@@ -4,7 +4,6 @@ using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.Horizon.Common;
 using System;
 using System.Diagnostics;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Kernel.Memory
 {
@@ -12,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
    {
        public KProcess Owner { get; private set; }
        private readonly KPageList _pageList;
-        private readonly Lock _lock = new();
+        private readonly object _lock;
        private ulong _address;
        private bool _isOwnerMapped;
        private bool _isMapped;
@@ -20,6 +19,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
        public KCodeMemory(KernelContext context) : base(context)
        {
            _pageList = new KPageList();
+            _lock = new object();
        }

        public Result Initialize(ulong address, ulong size)
@@ -40,8 +40,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process

        public ProcessState State { get; private set; }

-        private readonly Lock _processLock = new();
-        private readonly Lock _threadingLock = new();
+        private readonly object _processLock = new();
+        private readonly object _threadingLock = new();

        public KAddressArbiter AddressArbiter { get; private set; }

@@ -200,7 +200,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading

            WakeThreads(_condVarThreads, count, TryAcquireMutex, x => x.CondVarAddress == address);

-            if (!_condVarThreads.Any(x => x.CondVarAddress == address))
+            if (!_condVarThreads.Exists(x => x.CondVarAddress == address))
            {
                KernelTransfer.KernelToUser(address, 0);
            }
@@ -5,19 +5,20 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
    class KCriticalSection
    {
        private readonly KernelContext _context;
+        private readonly object _lock;
        private int _recursionCount;

-        // type is not Lock due to Monitor class usage
-        public object Lock { get; } = new();
+        public object Lock => _lock;

        public KCriticalSection(KernelContext context)
        {
            _context = context;
+            _lock = new object();
        }

        public void Enter()
        {
-            Monitor.Enter(Lock);
+            Monitor.Enter(_lock);

            _recursionCount++;
        }
@@ -33,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
            {
                ulong scheduledCoresMask = KScheduler.SelectThreads(_context);

-                Monitor.Exit(Lock);
+                Monitor.Exit(_lock);

                KThread currentThread = KernelStatic.GetCurrentThread();
                bool isCurrentThreadSchedulable = currentThread != null && currentThread.IsSchedulable;
@@ -56,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
            }
            else
            {
-                Monitor.Exit(Lock);
+                Monitor.Exit(_lock);
            }
        }
    }
@@ -112,7 +112,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading

        public bool WaitingInArbitration { get; set; }

-        private readonly Lock _activityOperationLock = new();
+        private readonly object _activityOperationLock = new();

        public KThread(KernelContext context) : base(context)
        {
@@ -168,7 +168,7 @@ namespace Ryujinx.HLE.HOS

                if (StrEquals(RomfsDir, modDir.Name))
                {
-                    var modData = modMetadata.Mods.FirstOrDefault(x => modDir.FullName.Contains(x.Path));
+                    var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path));
                    var enabled = modData?.Enabled ?? true;

                    mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));
@@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS
                }
                else if (StrEquals(ExefsDir, modDir.Name))
                {
-                    var modData = modMetadata.Mods.FirstOrDefault(x => modDir.FullName.Contains(x.Path));
+                    var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path));
                    var enabled = modData?.Enabled ?? true;

                    mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));
@@ -275,7 +275,7 @@ namespace Ryujinx.HLE.HOS
            var fsFile = new FileInfo(Path.Combine(applicationDir.FullName, RomfsContainer));
            if (fsFile.Exists)
            {
-                var modData = modMetadata.Mods.FirstOrDefault(x => fsFile.FullName.Contains(x.Path));
+                var modData = modMetadata.Mods.Find(x => fsFile.FullName.Contains(x.Path));
                var enabled = modData == null || modData.Enabled;

                mods.RomfsContainers.Add(new Mod<FileInfo>($"<{applicationDir.Name} RomFs>", fsFile, enabled));
@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS
            fsFile = new FileInfo(Path.Combine(applicationDir.FullName, ExefsContainer));
            if (fsFile.Exists)
            {
-                var modData = modMetadata.Mods.FirstOrDefault(x => fsFile.FullName.Contains(x.Path));
+                var modData = modMetadata.Mods.Find(x => fsFile.FullName.Contains(x.Path));
                var enabled = modData == null || modData.Enabled;

                mods.ExefsContainers.Add(new Mod<FileInfo>($"<{applicationDir.Name} ExeFs>", fsFile, enabled));
@@ -403,7 +403,7 @@ namespace Ryujinx.HLE.HOS
        }

        // Assumes searchDirPaths don't overlap
-        private static void CollectMods(Dictionary<ulong, ModCache> modCaches, PatchCache patches, params ReadOnlySpan<string> searchDirPaths)
+        private static void CollectMods(Dictionary<ulong, ModCache> modCaches, PatchCache patches, params string[] searchDirPaths)
        {
            static bool IsPatchesDir(string name) => StrEquals(AmsNsoPatchDir, name) ||
                                                     StrEquals(AmsNroPatchDir, name) ||
@@ -453,7 +453,7 @@ namespace Ryujinx.HLE.HOS
            patches.Initialized = true;
        }

-        public void CollectMods(IEnumerable<ulong> applications, params ReadOnlySpan<string> searchDirPaths)
+        public void CollectMods(IEnumerable<ulong> applications, params string[] searchDirPaths)
        {
            Clear();

@@ -680,7 +680,7 @@ namespace Ryujinx.HLE.HOS
            ApplyProgramPatches(nroPatches, 0, nro);
        }

-        internal bool ApplyNsoPatches(ulong applicationId, params ReadOnlySpan<IExecutable> programs)
+        internal bool ApplyNsoPatches(ulong applicationId, params IExecutable[] programs)
        {
            IEnumerable<Mod<DirectoryInfo>> nsoMods = _patches.NsoPatches;

@@ -744,7 +744,7 @@ namespace Ryujinx.HLE.HOS
            }
        }

-        private static bool ApplyProgramPatches(IEnumerable<Mod<DirectoryInfo>> mods, int protectedOffset, params ReadOnlySpan<IExecutable> programs)
+        private static bool ApplyProgramPatches(IEnumerable<Mod<DirectoryInfo>> mods, int protectedOffset, params IExecutable[] programs)
        {
            int count = 0;

@@ -755,18 +755,12 @@ namespace Ryujinx.HLE.HOS
                patches[i] = new MemPatch();
            }

-            var buildIds = new List<string>(programs.Length);
-
-            foreach (IExecutable p in programs)
+            var buildIds = programs.Select(p => p switch
            {
-                var buildId = p switch
-                {
-                    NsoExecutable nso => Convert.ToHexString(nso.BuildId.ItemsRo.ToArray()).TrimEnd('0'),
-                    NroExecutable nro => Convert.ToHexString(nro.Header.BuildId).TrimEnd('0'),
-                    _ => string.Empty,
-                };
-                buildIds.Add(buildId);
-            }
+                NsoExecutable nso => Convert.ToHexString(nso.BuildId.ItemsRo.ToArray()).TrimEnd('0'),
+                NroExecutable nro => Convert.ToHexString(nro.Header.BuildId).TrimEnd('0'),
+                _ => string.Empty,
+            }).ToList();

            int GetIndex(string buildId) => buildIds.FindIndex(id => id == buildId); // O(n) but list is small

@@ -4,7 +4,6 @@ using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy.Types;
 using Ryujinx.Horizon.Common;
 using System;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
 {
@@ -18,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
        private KEvent _accumulatedSuspendedTickChangedEvent;
        private int _accumulatedSuspendedTickChangedEventHandle;

-        private readonly Lock _fatalSectionLock = new();
+        private readonly object _fatalSectionLock = new();
        private int _fatalSectionCount;

        // TODO: Set this when the game goes in suspension (go back to home menu ect), we currently don't support that so we can keep it set to 0.
@@ -123,7 +123,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
            return true;
        }

-        public void Configure(params ReadOnlySpan<ControllerConfig> configs)
+        public void Configure(params ControllerConfig[] configs)
        {
            _configuredTypes = new ControllerType[MaxControllers];

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
    {
        public TouchDevice(Switch device, bool active) : base(device, active) { }

-        public void Update(params ReadOnlySpan<TouchPoint> points)
+        public void Update(params TouchPoint[] points)
        {
            ref RingLifo<TouchScreenState> lifo = ref _device.Hid.SharedMemory.TouchScreen;

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Memory;
 using System.Runtime.InteropServices;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Services.Ldn.Types
 {
@@ -13,7 +12,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.Types

    static class NodeLatestUpdateHelper
    {
-        private static readonly Lock _lock = new();
+        private static readonly object _lock = new();

        public static void CalculateLatestUpdate(this Array8<NodeLatestUpdate> array, Array8<NodeInfo> beforeNodes, Array8<NodeInfo> afterNodes)
        {
@@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
        private ILdnTcpSocket _tcp;
        private LdnProxyUdpServer _udp, _udp2;
        private readonly List<LdnProxyTcpSession> _stations = new();
-        private readonly Lock _lock = new();
+        private readonly object _lock = new();

        private readonly AutoResetEvent _apConnected = new(false);

@@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm.Proxy
        private byte[] _buffer;
        private int _bufferEnd;

-        private readonly Lock _scanLock = new();
+        private readonly object _scanLock = new();

        private Dictionary<ulong, NetworkInfo> _scanResultsLast = new();
        private Dictionary<ulong, NetworkInfo> _scanResults = new();
@@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
        private readonly Action _timeoutCallback;
        private CancellationTokenSource _cancel;

-        private readonly Lock _lock = new();
+        private readonly object _lock = new object();

        public NetworkTimeout(int idleTimeout, Action timeoutCallback)
        {
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading;

 namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 {
@@ -9,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy

        private readonly List<ushort> _ephemeralPorts = new List<ushort>();

-        private readonly Lock _lock = new();
+        private readonly object _lock = new object();

        public ushort Get()
        {
@@ -1,358 +0,0 @@
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
-using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
-using System;
-using System.IO;
-
-namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
-{
-    public class AmiiboBinReader
-    {
-        private static byte CalculateBCC0(byte[] uid)
-        {
-            return (byte)(uid[0] ^ uid[1] ^ uid[2] ^ 0x88);
-        }
-
-        private static byte CalculateBCC1(byte[] uid)
-        {
-            return (byte)(uid[3] ^ uid[4] ^ uid[5] ^ uid[6]);
-        }
-
-        public static VirtualAmiiboFile ReadBinFile(byte[] fileBytes)
-        {
-            string keyRetailBinPath = GetKeyRetailBinPath();
-            if (string.IsNullOrEmpty(keyRetailBinPath))
-            {
-                return new VirtualAmiiboFile();
-            }
-
-            byte[] initialCounter = new byte[16];
-
-            const int totalPages = 135;
-            const int pageSize = 4;
-            const int totalBytes = totalPages * pageSize;
-
-            if (fileBytes.Length == 532)
-            {
-                // add 8 bytes to the end of the file
-                byte[] newFileBytes = new byte[totalBytes];
-                Array.Copy(fileBytes, newFileBytes, fileBytes.Length);
-                fileBytes = newFileBytes;
-            }
-
-            AmiiboDecryptor amiiboDecryptor = new(keyRetailBinPath);
-            AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(fileBytes);
-
-            byte[] titleId = new byte[8];
-            byte[] usedCharacter = new byte[2];
-            byte[] variation = new byte[2];
-            byte[] amiiboID = new byte[2];
-            byte[] setID = new byte[1];
-            byte[] initDate = new byte[2];
-            byte[] writeDate = new byte[2];
-            byte[] writeCounter = new byte[2];
-            byte[] appId = new byte[8];
-            byte[] settingsBytes = new byte[2];
-            byte formData = 0;
-            byte[] applicationAreas = new byte[216];
-            byte[] dataFull = amiiboDump.GetData();
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Data Full Length: {dataFull.Length}");
-            byte[] uid = new byte[7];
-            Array.Copy(dataFull, 0, uid, 0, 7);
-
-            byte bcc0 = CalculateBCC0(uid);
-            byte bcc1 = CalculateBCC1(uid);
-            LogDebugData(uid, bcc0, bcc1);
-            for (int page = 0; page < 128; page++) // NTAG215 has 128 pages
-            {
-                int pageStartIdx = page * 4; // Each page is 4 bytes
-                byte[] pageData = new byte[4];
-                byte[] sourceBytes = dataFull;
-                Array.Copy(sourceBytes, pageStartIdx, pageData, 0, 4);
-                // Special handling for specific pages
-                switch (page)
-                {
-                    case 0: // Page 0 (UID + BCC0)
-                        Logger.Debug?.Print(LogClass.ServiceNfp, "Page 0: UID and BCC0.");
-                        break;
-                    case 2: // Page 2 (BCC1 + Internal Value)
-                        byte internalValue = pageData[1];
-                        Logger.Debug?.Print(LogClass.ServiceNfp, $"Page 2: BCC1 + Internal Value 0x{internalValue:X2} (Expected 0x48).");
-                        break;
-                    case 6:
-                        // Bytes 0 and 1 are init date, bytes 2 and 3 are write date
-                        Array.Copy(pageData, 0, initDate, 0, 2);
-                        Array.Copy(pageData, 2, writeDate, 0, 2);
-                        break;
-                    case 21:
-                        // Bytes 0 and 1 are used character, bytes 2 and 3 are variation
-                        Array.Copy(pageData, 0, usedCharacter, 0, 2);
-                        Array.Copy(pageData, 2, variation, 0, 2);
-                        break;
-                    case 22:
-                        // Bytes 0 and 1 are amiibo ID, byte 2 is set ID, byte 3 is form data
-                        Array.Copy(pageData, 0, amiiboID, 0, 2);
-                        setID[0] = pageData[2];
-                        formData = pageData[3];
-                        break;
-                    case 64:
-                    case 65:
-                        // Extract title ID
-                        int titleIdOffset = (page - 64) * 4;
-                        Array.Copy(pageData, 0, titleId, titleIdOffset, 4);
-                        break;
-                    case 66:
-                        // Bytes 0 and 1 are write counter
-                        Array.Copy(pageData, 0, writeCounter, 0, 2);
-                        break;
-                    // Pages 76 to 127 are application areas
-                    case >= 76 and <= 127:
-                        int appAreaOffset = (page - 76) * 4;
-                        Array.Copy(pageData, 0, applicationAreas, appAreaOffset, 4);
-                        break;
-                }
-            }
-
-            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 head = usedCharacterStr + variationStr;
-            string tail = amiiboIDStr + setIDStr + "02";
-            string finalID = head + tail;
-
-            ushort settingsValue = BitConverter.ToUInt16(settingsBytes, 0);
-            ushort initDateValue = BitConverter.ToUInt16(initDate, 0);
-            ushort writeDateValue = BitConverter.ToUInt16(writeDate, 0);
-            DateTime initDateTime = DateTimeFromTag(initDateValue);
-            DateTime writeDateTime = DateTimeFromTag(writeDateValue);
-            ushort writeCounterValue = BitConverter.ToUInt16(writeCounter, 0);
-            string nickName = amiiboDump.AmiiboNickname;
-            LogFinalData(titleId, appId, head, tail, finalID, nickName, initDateTime, writeDateTime, settingsValue, writeCounterValue, applicationAreas);
-
-            VirtualAmiiboFile virtualAmiiboFile = new VirtualAmiiboFile
-            {
-                FileVersion = 1,
-                TagUuid = uid,
-                AmiiboId = finalID,
-                NickName = nickName,
-                FirstWriteDate = initDateTime,
-                LastWriteDate = writeDateTime,
-                WriteCounter = writeCounterValue,
-            };
-            if (writeCounterValue > 0)
-            {
-                VirtualAmiibo.ApplicationBytes = applicationAreas;
-            }
-            VirtualAmiibo.NickName = nickName;
-            return virtualAmiiboFile;
-        }
-        public static bool SaveBinFile(string inputFile, byte[] appData)
-        {
-            Logger.Info?.Print(LogClass.ServiceNfp, "Saving bin file.");
-            byte[] readBytes;
-            try
-            {
-                readBytes = File.ReadAllBytes(inputFile);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, $"Error reading file: {ex.Message}");
-                return false;
-            }
-            string keyRetailBinPath = GetKeyRetailBinPath();
-            if (string.IsNullOrEmpty(keyRetailBinPath))
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Key retail path is empty.");
-                return false;
-            }
-
-            if (appData.Length != 216) // Ensure application area size is valid
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Invalid application data length. Expected 216 bytes.");
-                return false;
-            }
-
-            if (readBytes.Length == 532)
-            {
-                // add 8 bytes to the end of the file
-                byte[] newFileBytes = new byte[540];
-                Array.Copy(readBytes, newFileBytes, readBytes.Length);
-                readBytes = newFileBytes;
-            }
-
-            AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath);
-            AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes);
-
-            byte[] oldData = amiiboDump.GetData();
-            if (oldData.Length != 540) // Verify the expected length for NTAG215 tags
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Invalid tag data length. Expected 540 bytes.");
-                return false;
-            }
-
-            byte[] newData = new byte[oldData.Length];
-            Array.Copy(oldData, newData, oldData.Length);
-
-            // Replace application area with appData
-            int appAreaOffset = 76 * 4; // Starting page (76) times 4 bytes per page
-            Array.Copy(appData, 0, newData, appAreaOffset, appData.Length);
-
-            AmiiboDump encryptedDump = amiiboDecryptor.EncryptAmiiboDump(newData);
-            byte[] encryptedData = encryptedDump.GetData();
-
-            if (encryptedData == null || encryptedData.Length != readBytes.Length)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Failed to encrypt data correctly.");
-                return false;
-            }
-            inputFile = inputFile.Replace("_modified", string.Empty);
-            // Save the encrypted data to file or return it for saving externally
-            string outputFilePath = Path.Combine(Path.GetDirectoryName(inputFile), Path.GetFileNameWithoutExtension(inputFile) + "_modified.bin");
-            try
-            {
-                File.WriteAllBytes(outputFilePath, encryptedData);
-                Logger.Info?.Print(LogClass.ServiceNfp, $"Modified Amiibo data saved to {outputFilePath}.");
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, $"Error saving file: {ex.Message}");
-                return false;
-            }
-        }
-        public static bool SaveBinFile(string inputFile, string newNickName)
-        {
-            Logger.Info?.Print(LogClass.ServiceNfp, "Saving bin file.");
-            byte[] readBytes;
-            try
-            {
-                readBytes = File.ReadAllBytes(inputFile);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, $"Error reading file: {ex.Message}");
-                return false;
-            }
-            string keyRetailBinPath = GetKeyRetailBinPath();
-            if (string.IsNullOrEmpty(keyRetailBinPath))
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Key retail path is empty.");
-                return false;
-            }
-
-            if (readBytes.Length == 532)
-            {
-                // add 8 bytes to the end of the file
-                byte[] newFileBytes = new byte[540];
-                Array.Copy(readBytes, newFileBytes, readBytes.Length);
-                readBytes = newFileBytes;
-            }
-
-            AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath);
-            AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes);
-            amiiboDump.AmiiboNickname = newNickName;
-            byte[] oldData = amiiboDump.GetData();
-            if (oldData.Length != 540) // Verify the expected length for NTAG215 tags
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Invalid tag data length. Expected 540 bytes.");
-                return false;
-            }
-            byte[] encryptedData = amiiboDecryptor.EncryptAmiiboDump(oldData).GetData();
-
-            if (encryptedData == null || encryptedData.Length != readBytes.Length)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, "Failed to encrypt data correctly.");
-                return false;
-            }
-            inputFile = inputFile.Replace("_modified", string.Empty);
-            // Save the encrypted data to file or return it for saving externally
-            string outputFilePath = Path.Combine(Path.GetDirectoryName(inputFile), Path.GetFileNameWithoutExtension(inputFile) + "_modified.bin");
-            try
-            {
-                File.WriteAllBytes(outputFilePath, encryptedData);
-                Logger.Info?.Print(LogClass.ServiceNfp, $"Modified Amiibo data saved to {outputFilePath}.");
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.Print(LogClass.ServiceNfp, $"Error saving file: {ex.Message}");
-                return false;
-            }
-        }
-        private static void LogDebugData(byte[] uid, byte bcc0, byte bcc1)
-        {
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"UID: {BitConverter.ToString(uid)}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"BCC0: 0x{bcc0:X2}, BCC1: 0x{bcc1:X2}");
-        }
-
-        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, $"Head: {head}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Tail: {tail}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Final ID: {finalID}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Nickname: {nickName}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Init Date: {initDateTime}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Write Date: {writeDateTime}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Settings: 0x{settingsValue:X4}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Write Counter: {writeCounterValue}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, "Length of Application Areas: " + applicationAreas.Length);
-        }
-
-        private static uint CalculateCRC32(byte[] input)
-        {
-            uint[] table = new uint[256];
-            uint polynomial = 0xEDB88320;
-            for (uint i = 0; i < table.Length; ++i)
-            {
-                uint crc = i;
-                for (int j = 0; j < 8; ++j)
-                {
-                    if ((crc & 1) != 0)
-                        crc = (crc >> 1) ^ polynomial;
-                    else
-                        crc >>= 1;
-                }
-                table[i] = crc;
-            }
-
-            uint result = 0xFFFFFFFF;
-            foreach (byte b in input)
-            {
-                byte index = (byte)((result & 0xFF) ^ b);
-                result = (result >> 8) ^ table[index];
-            }
-            return ~result;
-        }
-
-        private static string GetKeyRetailBinPath()
-        {
-            return Path.Combine(AppDataManager.KeysDirPath, "key_retail.bin");
-        }
-
-        public static bool HasAmiiboKeyFile => File.Exists(GetKeyRetailBinPath());
-
-        
-        public static DateTime DateTimeFromTag(ushort value)
-        {
-            try
-            {
-                int day = value & 0x1F;
-                int month = (value >> 5) & 0x0F;
-                int year = (value >> 9) & 0x7F;
-
-                if (day == 0 || month == 0 || month > 12 || day > DateTime.DaysInMonth(2000 + year, month))
-                    throw new ArgumentOutOfRangeException();
-
-                return new DateTime(2000 + year, month, day);
-            }
-            catch
-            {
-                return DateTime.Now;
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
maxdlpee	92677125be	Merge branch 'master' into update-es-es	2024-12-12 09:18:21 -03:00
maxdlpee	b6239e5f57	Fixed an oopsies	2024-12-07 23:53:17 -03:00
maxdlpee	c665451f07	Update es_ES part 2	2024-12-07 23:49:39 -03:00
maxdlpee	666295dda2	Update es_ES part 1	2024-12-07 22:14:31 -03:00