From 8c8c1b73db5a60cd08c25820b69b1f5a5ca410ea Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Mon, 5 Feb 2024 19:11:14 +1000
Subject: [PATCH] Simplify .props properties and targets

---
 .../chromiumembeddedframework.runtime.win-arm64.props  | 10 +++-------
 NuGet/chromiumembeddedframework.runtime.win-x64.props  | 10 +++-------
 NuGet/chromiumembeddedframework.runtime.win-x86.props  | 10 +++-------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/NuGet/chromiumembeddedframework.runtime.win-arm64.props b/NuGet/chromiumembeddedframework.runtime.win-arm64.props
index 3a1af39..a143464 100644
--- a/NuGet/chromiumembeddedframework.runtime.win-arm64.props
+++ b/NuGet/chromiumembeddedframework.runtime.win-arm64.props
@@ -8,16 +8,15 @@
 
   <ItemGroup>
 	<CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
-	<_CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
+	<_CefRuntimeWinArm64Additional Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\**\*.*" />
 	
 	<CefRedistArm64 Include="@(CefRuntimeWinArm64)" />
-	<CefRedistArm64 Include="@(_CefRuntimeWinArm64Locales->'locales\%(Filename)%(Extension)')" />
+	<CefRedistArm64 Include="@(_CefRuntimeWinArm64Additional)" />
   </ItemGroup>
   
   <Target Name="CefRedistArm64CopyResources">
     <PropertyGroup>
       <CefRedistArm64TargetDir Condition="'$(CefRedistArm64TargetDir)' == ''">$(TargetDir)</CefRedistArm64TargetDir>
-	  <_CefRedistArm64LocalesTargetDir>$(CefRedistArm64TargetDir)\locales</_CefRedistArm64LocalesTargetDir>
     </PropertyGroup>
     <!--
     Cannot gurantee access to the main CefRuntimeWinArm64 ItemGroup here
@@ -26,12 +25,9 @@
     -->
     <ItemGroup>
       <_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
-	  <_CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
+	  <_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\**\*.*" />
     </ItemGroup>
     <Message Importance="high" Text="Copying Chromium Embedded Framework Runtime arm64 files from $(MSBuildThisFileDirectory)..\runtimes\win-arm64\native to $(CefRedistArm64TargetDir)" />
     <Copy SourceFiles="@(_CefRuntimeWinArm64)" DestinationFiles="@(_CefRuntimeWinArm64->'$(CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-	
-	<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedistArm64LocalesTargetDir)" />
-    <Copy SourceFiles="@(_CefRuntimeWinArm64Locales)" DestinationFiles="@(_CefRuntimeWinArm64Locales->'$(_CefRedistArm64LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/NuGet/chromiumembeddedframework.runtime.win-x64.props b/NuGet/chromiumembeddedframework.runtime.win-x64.props
index 99f0c4b..f6c0006 100644
--- a/NuGet/chromiumembeddedframework.runtime.win-x64.props
+++ b/NuGet/chromiumembeddedframework.runtime.win-x64.props
@@ -8,16 +8,15 @@
   
   <ItemGroup>
 	<CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
-	<_CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
+	<_CefRuntimeWin64Additional Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\**\*.*" />
 	
 	<CefRedist64 Include="@(CefRuntimeWin64)" />
-	<CefRedist64 Include="@(_CefRuntimeWin64Locales->'locales\%(Filename)%(Extension)')" />
+	<CefRedist64 Include="@(_CefRuntimeWin64Additional)" />
   </ItemGroup>
   
   <Target Name="CefRedist64CopyResources">
     <PropertyGroup>
       <CefRedist64TargetDir Condition="'$(CefRedist64TargetDir)' == ''">$(TargetDir)</CefRedist64TargetDir>
-	  <_CefRedist64LocalesTargetDir>$(CefRedist64TargetDir)\locales</_CefRedist64LocalesTargetDir>
     </PropertyGroup>
     <!--
     Cannot gurantee access to the main CefRuntimeWin64 ItemGroup here
@@ -26,12 +25,9 @@
     -->
     <ItemGroup>
       <_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
-	  <_CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
+	  <_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\**\*.*" />
     </ItemGroup>
     <Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x64 files from $(MSBuildThisFileDirectory)..\runtimes\win-x64\native to $(CefRedist64TargetDir)" />
     <Copy SourceFiles="@(_CefRuntimeWin64)" DestinationFiles="@(_CefRuntimeWin64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-	
-	<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedist64LocalesTargetDir)" />
-    <Copy SourceFiles="@(_CefRuntimeWin64Locales)" DestinationFiles="@(_CefRuntimeWin64Locales->'$(_CefRedist64LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/NuGet/chromiumembeddedframework.runtime.win-x86.props b/NuGet/chromiumembeddedframework.runtime.win-x86.props
index 46adcf0..bc910c4 100644
--- a/NuGet/chromiumembeddedframework.runtime.win-x86.props
+++ b/NuGet/chromiumembeddedframework.runtime.win-x86.props
@@ -8,16 +8,15 @@
   
   <ItemGroup>
     <CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
-	<_CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
+	<_CefRuntimeWin32Additional Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\**\*.*" />
 	
 	<CefRedist32 Include="@(CefRuntimeWin32)" />
-	<CefRedist32 Include="@(_CefRuntimeWin32Locales->'locales\%(Filename)%(Extension)')" />
+	<CefRedist32 Include="@(_CefRuntimeWin32Additional)" />
   </ItemGroup>
   
   <Target Name="CefRedist32CopyResources">
     <PropertyGroup>
       <CefRedist32TargetDir Condition="'$(CefRedist32TargetDir)' == ''">$(TargetDir)</CefRedist32TargetDir>
-	  <_CefRedist32LocalesTargetDir>$(CefRedist32TargetDir)\locales</_CefRedist32LocalesTargetDir>
     </PropertyGroup>
     <!--
     Cannot gurantee access to the main CefRuntimeWin32 ItemGroup here
@@ -26,12 +25,9 @@
     -->
     <ItemGroup>
       <_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
-	  <_CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
+	  <_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\**\*.*" />
     </ItemGroup>
     <Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x86 files from $(MSBuildThisFileDirectory)..\runtimes\win-x86\native to $(CefRedist32TargetDir)" />
     <Copy SourceFiles="@(_CefRuntimeWin32)" DestinationFiles="@(_CefRuntimeWin32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-	
-	<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedist32LocalesTargetDir)" />
-    <Copy SourceFiles="@(_CefRuntimeWin32Locales)" DestinationFiles="@(_CefRuntimeWin32Locales->'$(_CefRedist32LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
 </Project>
\ No newline at end of file