From 748e93ba65df5a1182334ed3d23a3af8608cc51d Mon Sep 17 00:00:00 2001
From: LotP1 <68976644+LotP1@users.noreply.github.com>
Date: Wed, 25 Dec 2024 17:09:57 +0100
Subject: [PATCH] lets give this another shot

moved from netstandard to netframework
---
 .../LocalesValidationTask.cs                     |  13 ++++++++++++-
 .../LocalesValidationTask.dll                    | Bin 0 -> 7680 bytes
 .../Ryujinx.BuildValidationTasks.csproj          |  15 ++++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll

diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
index d58531960..29dd6314f 100644
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -32,8 +32,19 @@ namespace Ryujinx.BuildValidationTasks
                 data = sr.ReadToEnd();
             }
 
+            LocalesJson json;
 
-            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
+            try
+            {
+                json = JsonConvert.DeserializeObject<LocalesJson>(data);
+
+            }
+            catch (Exception e)
+            {
+                Log.LogError($"Json Validation failed! {e.Message}");
+
+                return false;
+            }
 
 
             for (int i = 0; i < json.Locales.Count; i++)
diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.dll
new file mode 100644
index 0000000000000000000000000000000000000000..13e9f7769dc4ad0884221151dcf07260e23f69e6
GIT binary patch
literal 7680
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
NU+&OX_5S}e@K1nkzx@CJ

literal 0
HcmV?d00001

diff --git a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
index ea86eeb0f..d36c2a945 100644
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
     <temp_assemblies>$(MSBuildThisFileDirectory)temp_assemblies/</temp_assemblies>
@@ -14,17 +13,19 @@
   </ItemGroup>
 
   <Target Name="ValidationTask">
-    <Message Text="dir $(FrameworkDir)" Importance="high" />
-
     <Message Text="Running Validations..." Importance="high" />
 
+    <Message Text="Copying Assemblies To Intermediate Folder: $(temp_assemblies)" Importance="high" />
+    <!--Copy needed assemblies to the intermediate folder, only copy assemblies that are needed to run the validation dlls-->
+    <Copy SourceFiles="$(PkgNewtonsoft_Json)/lib/netstandard2.0/Newtonsoft.Json.dll" DestinationFolder="$(temp_assemblies)" />
+
     <!--Run Validation Targets Here-->
     <CallTarget Targets="MasterLocalesValidationTask" />
 
     <Message Text="Validations Succeeded!" Importance="high" />
   </Target>
   
-  <!--__________________________________________________LocalesValidation Task__________________________________________________-->
+  <!--__________________________________________________Start LocalesValidation Task__________________________________________________-->
 
   <PropertyGroup>
     <!--Name of Validation Task. <Name> refers to this name-->
@@ -48,10 +49,10 @@
              $(PkgMicrosoft_Build_Framework)/ref/netstandard2.0/Microsoft.Build.Framework.dll;
              $(PkgMicrosoft_Build_Utilities_Core)/ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll;
              $(PkgNewtonsoft_Json)/lib/netstandard2.0/Newtonsoft.Json.dll"
-         TargetType="Library" OutputAssembly="$(MSBuildThisFileDirectory)temp_assemblies/$(Dll)"/>
+         TargetType="Library" OutputAssembly="$(temp_assemblies)$(Dll)"/>
   </Target>
 
-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.$(Name)Task" TaskFactory="TaskHostFactory" AssemblyFile="temp_assemblies/$(Dll)"/>
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.$(Name)Task" TaskFactory="TaskHostFactory" AssemblyFile="$(temp_assemblies)$(Dll)"/>
 
   <!--Name should be "Master<Name>Task"-->
   <Target Name="MasterLocalesValidationTask" DependsOnTargets="Build$(Name)TaskDll">
@@ -61,4 +62,4 @@
     <Message Text="$(Name)Task finished!" Importance="high" />
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file