From 6cb98ec81e8fd62978ad01744fdbe20d62776aa3 Mon Sep 17 00:00:00 2001
From: amaitland <alex@maitlandcomputing.com.au>
Date: Tue, 23 Jan 2018 09:25:20 +1000
Subject: [PATCH] Nupkg Restructure

Resolves #2156

Nuget packages updated to use ItemGroup None instead of Copy target
Nuget props restructure to support Win32 target
x86 and Win32 targets are exactly the same in content, they differ in name only, so switched to using an <Otherwise/> block
Remove AnyCpu <When/> option from props files and consolidate with x86 and Win32. Set Private to false and rely on the
<None/> entires to copy the files to the output folder

Ideally would move the OffScreen, WinForms and WPF targets file content to the props (as they're actually props now), unfortunately
we need guaranteed ordering and Nuget 2.8.x doesn't provide that, if we leave them as .targets it'll happen late enough to make sure
the cef.redist list of files is provided.
https://github.com/NuGet/Home/issues/4229#issuecomment-271387190
---
 NuGet/CefSharp.Common.props      | 21 +++-------
 NuGet/CefSharp.Common.targets    | 69 +++++++++++++++++++-------------
 NuGet/CefSharp.OffScreen.props   | 15 ++-----
 NuGet/CefSharp.OffScreen.targets | 48 +++++++++++++++++-----
 NuGet/CefSharp.WinForms.props    | 15 ++-----
 NuGet/CefSharp.WinForms.targets  | 46 +++++++++++++++++----
 NuGet/CefSharp.Wpf.props         | 15 ++-----
 NuGet/CefSharp.Wpf.targets       | 46 +++++++++++++++++----
 8 files changed, 174 insertions(+), 101 deletions(-)

diff --git a/NuGet/CefSharp.Common.props b/NuGet/CefSharp.Common.props
index 4109cd200b..59ebd23b70 100644
--- a/NuGet/CefSharp.Common.props
+++ b/NuGet/CefSharp.Common.props
@@ -1,31 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Choose>
-    <When Condition="'$(Platform)' == 'x86'">
-      <ItemGroup>
-        <Reference Include="CefSharp">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-        <Reference Include="CefSharp.Core">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Core.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
         <Reference Include="CefSharp">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.dll</HintPath>
-          <Private>True</Private>
+          <Private>False</Private>
         </Reference>
         <Reference Include="CefSharp.Core">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Core.dll</HintPath>
-          <Private>True</Private>
+          <Private>False</Private>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
+    <!-- x86, Win32 and AnyCpu -->
+    <Otherwise>
       <ItemGroup>
         <Reference Include="CefSharp">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.dll</HintPath>
@@ -36,6 +25,6 @@
           <Private>False</Private>
         </Reference>
       </ItemGroup>
-    </When>
+    </Otherwise>
   </Choose>
 </Project>
diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
index a74f37424d..ec72e26de3 100644
--- a/NuGet/CefSharp.Common.targets
+++ b/NuGet/CefSharp.Common.targets
@@ -11,38 +11,53 @@
   <ItemGroup>
     <CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
     <CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <CefSharpCommonBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
   <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">$(TargetDir)</CefSharpTargetDir>
+    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
-  <Target Name="CefSharpCopyLibs86" BeforeTargets="BeforeBuild" Condition="('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
-    <Message Importance="high" Text="Copying cef.redist x86 files" />
-    <Copy SourceFiles="@(CefRedist32)" DestinationFiles="@(CefRedist32->'$(CefSharpTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-
-    <Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x86 to $(CefSharpTargetDir)" />
-    <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(CefSharpTargetDir)" SkipUnchangedFiles="true" />
-  </Target>
-
-  <Target Name="CefSharpCopyLibs64" BeforeTargets="BeforeBuild" Condition="'$(Platform)' == 'x64'">
-    <Message Importance="high" Text="Copying cef.redist x64 files" />
-    <Copy SourceFiles="@(CefRedist64)" DestinationFiles="@(CefRedist64->'$(CefSharpTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-
-    <Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x64 to $(CefSharpTargetDir)" />
-    <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(CefSharpTargetDir)" SkipUnchangedFiles="true" />
-  </Target>
-
-  <Target Name="CefSharpCopyLibsAnyCPU" BeforeTargets="BeforeBuild" Condition="'$(Platform)' == 'AnyCPU'">
-    <Message Importance="high" Text="Copying cef.redist x86 files" />
-    <Copy SourceFiles="@(CefRedist32)" DestinationFiles="@(CefRedist32->'$(CefSharpTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+  <!--
+    These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
+    correct ordering .props imports, which we require as this depends on the cef.redist packages
+    exporting an ItemGroup
+   -->
+
+  <ItemGroup Condition="('$(Platform)' == 'x86') OR ('$(Platform)' == 'Win32')">
+    <None Include="@(CefRedist32)">
+      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="@(CefSharpCommonBinaries32)">
+      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-    <Message Importance="high" Text="Copying cef.redist x64 files" />
-    <Copy SourceFiles="@(CefRedist64)" DestinationFiles="@(CefRedist64->'$(CefSharpTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+  <ItemGroup Condition="'$(Platform)' == 'x64'">
+    <None Include="@(CefRedist64)">
+      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="@(CefSharpCommonBinaries64)">
+      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-    <Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x86 to $(CefSharpTargetDir)\x86" />
-    <Copy SourceFiles="@(CefSharpCommonBinaries32)" DestinationFolder="$(CefSharpTargetDir)\x86" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x64 to $(CefSharpTargetDir)\x64" />
-    <Copy SourceFiles="@(CefSharpCommonBinaries64)" DestinationFolder="$(CefSharpTargetDir)\x64" SkipUnchangedFiles="true" />
-  </Target>
+  <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
+    <None Include="@(CefRedist32)">
+      <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="@(CefRedist64)">
+      <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="@(CefSharpCommonBinariesAnyCpu)">
+      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/NuGet/CefSharp.OffScreen.props b/NuGet/CefSharp.OffScreen.props
index c2c511f902..f832972a2f 100644
--- a/NuGet/CefSharp.OffScreen.props
+++ b/NuGet/CefSharp.OffScreen.props
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Choose>
-    <When Condition="'$(Platform)' == 'x86'">
-      <ItemGroup>
-        <Reference Include="CefSharp.OffScreen">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
         <Reference Include="CefSharp.OffScreen">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.OffScreen.dll</HintPath>
-          <Private>True</Private>
+          <Private>False</Private>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
+    <!-- x86, Win32 and AnyCpu -->
+    <Otherwise>
       <ItemGroup>
         <Reference Include="CefSharp.OffScreen">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
           <Private>False</Private>
         </Reference>
       </ItemGroup>
-    </When>
+    </Otherwise>
   </Choose>
 </Project>
diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets
index bb9b276ad8..9a726da2af 100644
--- a/NuGet/CefSharp.OffScreen.targets
+++ b/NuGet/CefSharp.OffScreen.targets
@@ -1,18 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">$(TargetDir)</CefSharpTargetDir>
+    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
   <ItemGroup>
-    <CefSharpOffscreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <CefSharpOffscreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
+    <CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpOffscreenBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
-  <Target Name="CefSharpCopyOffScreenAnyCPU" BeforeTargets="BeforeBuild" Condition="'$(Platform)' == 'AnyCPU'">
-    <Message Importance="high" Text="-- CefSharp.OffScreen.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x86 to $(CefSharpTargetDir)\x86" />
-    <Copy SourceFiles="@(CefSharpOffscreenBinaries32)" DestinationFolder="$(CefSharpTargetDir)\x86" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="-- CefSharp.OffScreen.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x64 to $(CefSharpTargetDir)\x64" />
-    <Copy SourceFiles="@(CefSharpOffscreenBinaries64)" DestinationFolder="$(CefSharpTargetDir)\x64" SkipUnchangedFiles="true" />
-  </Target>
+  <!--
+    These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
+    correct ordering .props imports, which we require as this depends on the cef.redist packages
+    exporting an ItemGroup
+   -->
+
+  <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
+  <Choose>
+    <When Condition="'$(Platform)' == 'AnyCpu'">
+      <ItemGroup>
+        <None Include="@(CefSharpOffscreenBinariesAnyCpu)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Platform)' == 'x64'">
+      <ItemGroup>
+        <None Include="@(CefSharpOffScreenBinaries64)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>
+    <!-- x86, and Win32 -->
+    <Otherwise>
+      <ItemGroup>
+        <None Include="@(CefSharpOffScreenBinaries32)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/NuGet/CefSharp.WinForms.props b/NuGet/CefSharp.WinForms.props
index c048375805..bb3a356a1b 100644
--- a/NuGet/CefSharp.WinForms.props
+++ b/NuGet/CefSharp.WinForms.props
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Choose>
-    <When Condition="'$(Platform)' == 'x86'">
-      <ItemGroup>
-        <Reference Include="CefSharp.WinForms">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
         <Reference Include="CefSharp.WinForms">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.WinForms.dll</HintPath>
-          <Private>True</Private>
+          <Private>False</Private>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
+    <!-- x86, Win32 and AnyCpu -->
+    <Otherwise>
       <ItemGroup>
         <Reference Include="CefSharp.WinForms">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
           <Private>False</Private>
         </Reference>
       </ItemGroup>
-    </When>
+    </Otherwise>
   </Choose>
 </Project>
diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets
index 5a5c2dbca5..82b8a44634 100644
--- a/NuGet/CefSharp.WinForms.targets
+++ b/NuGet/CefSharp.WinForms.targets
@@ -1,18 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">$(TargetDir)</CefSharpTargetDir>
+    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
   <ItemGroup>
     <CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
     <CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpWinFormsBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
-  
-  <Target Name="CefSharpCopyWinFormsAnyCPU" BeforeTargets="BeforeBuild" Condition="'$(Platform)' == 'AnyCPU'">
-    <Message Importance="high" Text="-- CefSharp.WinForms.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x86 to $(CefSharpTargetDir)\x86" />
-    <Copy SourceFiles="@(CefSharpWinFormsBinaries32)" DestinationFolder="$(CefSharpTargetDir)\x86" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="-- CefSharp.WinForms.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x64 to $(CefSharpTargetDir)\x64" />
-    <Copy SourceFiles="@(CefSharpWinFormsBinaries64)" DestinationFolder="$(CefSharpTargetDir)\x64" SkipUnchangedFiles="true" />
-  </Target>
+
+  <!--
+    These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
+    correct ordering .props imports, which we require as this depends on the cef.redist packages
+    exporting an ItemGroup
+   -->
+
+  <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
+  <Choose>
+    <When Condition="'$(Platform)' == 'AnyCpu'">
+      <ItemGroup>
+        <None Include="@(CefSharpWinFormsBinariesAnyCpu)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Platform)' == 'x64'">
+      <ItemGroup>
+        <None Include="@(CefSharpWinFormsBinaries64)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>
+    <!-- x86, and Win32 -->
+    <Otherwise>
+      <ItemGroup>
+        <None Include="@(CefSharpWinFormsBinaries32)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/NuGet/CefSharp.Wpf.props b/NuGet/CefSharp.Wpf.props
index 8755e8cc3a..ec81383ea5 100644
--- a/NuGet/CefSharp.Wpf.props
+++ b/NuGet/CefSharp.Wpf.props
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Choose>
-    <When Condition="'$(Platform)' == 'x86'">
-      <ItemGroup>
-        <Reference Include="CefSharp.Wpf">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
         <Reference Include="CefSharp.Wpf">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll</HintPath>
-          <Private>True</Private>
+          <Private>False</Private>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="'$(Platform)' == 'AnyCPU'">
+    <!-- x86, Win32 and AnyCpu -->
+    <Otherwise>
       <ItemGroup>
         <Reference Include="CefSharp.Wpf">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
           <Private>False</Private>
         </Reference>
       </ItemGroup>
-    </When>
+    </Otherwise>
   </Choose>
 </Project>
diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets
index f070921e4a..f1033f1a3a 100644
--- a/NuGet/CefSharp.Wpf.targets
+++ b/NuGet/CefSharp.Wpf.targets
@@ -1,18 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' ">$(TargetDir)</CefSharpTargetDir>
+    <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
   <ItemGroup>
     <CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
     <CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpWpfBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
-  
-  <Target Name="CefSharpCopyWpfAnyCPU" BeforeTargets="BeforeBuild" Condition="'$(Platform)' == 'AnyCPU'">
-    <Message Importance="high" Text="-- CefSharp.Wpf.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x86 to $(CefSharpTargetDir)\x86" />
-    <Copy SourceFiles="@(CefSharpWpfBinaries32)" DestinationFolder="$(CefSharpTargetDir)\x86" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="-- CefSharp.Wpf.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\x64 to $(CefSharpTargetDir)\x64" />
-    <Copy SourceFiles="@(CefSharpWpfBinaries64)" DestinationFolder="$(CefSharpTargetDir)\x64" SkipUnchangedFiles="true" />
-  </Target>
+
+  <!--
+    These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
+    correct ordering .props imports, which we require as this depends on the cef.redist packages
+    exporting an ItemGroup
+   -->
+
+  <!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
+  <Choose>
+    <When Condition="'$(Platform)' == 'AnyCpu'">
+      <ItemGroup>
+        <None Include="@(CefSharpWpfBinariesAnyCpu)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Platform)' == 'x64'">
+      <ItemGroup>
+        <None Include="@(CefSharpWpfBinaries64)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </When>    
+    <!-- x86, and Win32 -->
+    <Otherwise>
+      <ItemGroup>
+        <None Include="@(CefSharpWpfBinaries32)">
+          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>