Merge 7cb8a474dc into 05b4bd8c61

UI: Use a new repo for amiibo stuff specifically
Update global.json
2025-03-12 23:23:24 +01:00 · 2025-03-12 14:17:14 -05:00 · 2025-03-07 10:04:50 -03:00 · 2025-03-07 10:04:50 -03:00
4 changed files with 5 additions and 5 deletions
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -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 10.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/10.0).
 Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).

 ### Step 2
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
 </Project>
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100-preview.1.25120.13",
    "rollForward": "latestFeature"
  }
 }
--- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"));

                if (response.IsSuccessStatusCode)
                {
@@ -451,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
+                HttpResponseMessage response = await _httpClient.GetAsync("https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json");

                if (response.IsSuccessStatusCode)
                {
Author	SHA1	Message	Date
Marco Carvalho	ea4519162b	Merge `7cb8a474dc` into `05b4bd8c61`	2025-03-12 23:23:24 +01:00
Evan Husted	05b4bd8c61	UI: Use a new repo for amiibo stuff specifically	2025-03-12 14:17:14 -05:00
Marco Carvalho	7cb8a474dc	Update global.json	2025-03-07 10:04:50 -03:00
Marco Carvalho	d1907a5375	Migrate to .NET 10	2025-03-07 10:04:50 -03:00