From 0666c21748fde4a5df4eb1c22ffa47c5700b6d8d Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Wed, 8 Jan 2025 00:42:56 +1000
Subject: [PATCH] Cleaner fix for locale files

reverts 6db32e997
---
 src/BizHawk.Client.Common/BizHawk.Client.Common.csproj | 5 +----
 src/MainSlnCommon.props                                | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 7a9145d999..8a878ebfde 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -12,8 +12,8 @@
 		<PackageReference Include="Microsoft.Data.Sqlite.Core" />
 		<PackageReference Include="SharpCompress" />
 		<PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" />
-		<PackageReference Include="System.CommandLine" PrivateAssets="all" GeneratePathProperty="true" />
 		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
+		<PackageReference Include="System.CommandLine" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 		<EmbeddedResource Include="Resources/**/*" />
@@ -26,7 +26,4 @@
 		<Compile Update="movie/tasproj/TasMovie.Editing.cs" DependentUpon="TasMovie.cs" />
 		<Compile Update="movie/tasproj/TasMovie.IO.cs" DependentUpon="TasMovie.cs" />
 	</ItemGroup>
-	<Target Name="CopySystemCommandLineAssemblyOnly" AfterTargets="Build">
-		<Copy SourceFiles="$(PkgSystem_CommandLine)/lib/netstandard2.0/System.CommandLine.dll" DestinationFolder="$(OutputPath)" />
-	</Target>
 </Project>
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index b9e1a7606a..08de89c382 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -12,6 +12,7 @@
 		<NoWarn>$(NoWarn);CS1573;NU1702</NoWarn>
 		<Product>BizHawk</Product>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+		<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(SolutionDir)' != '' ">
 		<PathMap>$(SolutionDir)=/</PathMap>