Merge 647cc943f6 into 8e00cb5232

2024-12-22 11:56:36 +01:00 · 2024-12-17 01:54:53 +00:00
3 changed files with 5 additions and 10 deletions
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@ -9,10 +9,4 @@
    <PackageReference Include="Newtonsoft.Json" />
  </ItemGroup>

-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" AssemblyFile="$(ProjectDir)bin\$(Configuration)\netstandard2.0\Ryujinx.BuildValidationTasks.dll"/>
-
-  <Target Name="LocalesJsonValidation" AfterTargets="AfterBuild">
-    <LocaleValidationTask />
-  </Target>
-
 </Project>
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@ -21526,4 +21526,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@ -14,9 +14,10 @@
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

-  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Build">
-    </MSBuild>
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" AssemblyFile="..\Ryujinx.BuildValidationTasks\bin\debug\netstandard2.0\Ryujinx.BuildValidationTasks.dll" />
+
+  <Target Name="LocalesJsonValidation" BeforeTargets="BeforeBuild">
+    <LocaleValidationTask />
  </Target>

  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">