diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs index 29dd6314f..d599ca7ef 100644 --- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs +++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs @@ -3,8 +3,9 @@ using Microsoft.Build.Utilities; using System.Collections.Generic; using System.Linq; using System.IO; -using Newtonsoft.Json; +using System.Text.Json; using Microsoft.Build.Framework; +using System.Text.Encodings.Web; namespace Ryujinx.BuildValidationTasks { @@ -34,9 +35,10 @@ namespace Ryujinx.BuildValidationTasks LocalesJson json; + try { - json = JsonConvert.DeserializeObject(data); + json = JsonSerializer.Deserialize(data); } catch (Exception e) @@ -61,7 +63,13 @@ namespace Ryujinx.BuildValidationTasks json.Locales[i] = locale; } - string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented); + JsonSerializerOptions jsonOptions = new JsonSerializerOptions() + { + WriteIndented = true, + Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping + }; + + string jsonString = JsonSerializer.Serialize(json, jsonOptions); using (StreamWriter sw = new(path)) { diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll deleted file mode 100644 index 13e9f7769..000000000 Binary files a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll and /dev/null differ diff --git a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj index d36c2a945..a9ca04a60 100644 --- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj +++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj @@ -1,6 +1,7 @@ + net9.0 true $(MSBuildThisFileDirectory)temp_assemblies/ @@ -9,16 +10,11 @@ - - - - - @@ -36,6 +32,11 @@ + + + + +