From 837506dd91575b4858d97b7729381b3c0a90e823 Mon Sep 17 00:00:00 2001
From: amaitland <alex@maitlandcomputing.com.au>
Date: Wed, 7 Mar 2018 16:43:52 +1000
Subject: [PATCH] Nuget - Copy the x86 libs before the x64 libs for AnyCPU
 target

Hopefully this resolves the issue with the VS Designer picking up the x64 ones.

Issue #2276
---
 NuGet/CefSharp.Common.props    | 38 ++++++++++++++++++++--------------
 NuGet/CefSharp.OffScreen.props | 16 +++++++++-----
 NuGet/CefSharp.WinForms.props  | 16 +++++++++-----
 NuGet/CefSharp.Wpf.props       | 16 +++++++++-----
 4 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/NuGet/CefSharp.Common.props b/NuGet/CefSharp.Common.props
index f1ff286a3d..3216dbe105 100644
--- a/NuGet/CefSharp.Common.props
+++ b/NuGet/CefSharp.Common.props
@@ -3,7 +3,6 @@
   <ItemGroup>
     <CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
     <CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -11,18 +10,6 @@
   </PropertyGroup>
 
   <Choose>
-    <When Condition="'$(Platform)' == 'x64'">
-      <ItemGroup>
-        <Reference Include="CefSharp">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-        <Reference Include="CefSharp.Core">
-          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Core.dll</HintPath>
-          <Private>True</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="'$(Platform)' == 'AnyCPU'">
       <ItemGroup>
         <Reference Include="CefSharp">
@@ -33,12 +20,33 @@
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Core.dll</HintPath>
           <Private>False</Private>
         </Reference>
-        <None Include="@(CefSharpCommonBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <!--
+        We include CefSharp and CefSharp.Core as private false then copy the files using a
+        None entry. The 32bit libs must be included first or VS will use the x64
+        ones for the VS Designer.
+        -->
+        <None Include="@(CefSharpCommonBinaries32)">
+          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="@(CefSharpCommonBinaries64)">
+          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
       </ItemGroup>
     </When>
+    <When Condition="'$(Platform)' == 'x64'">
+      <ItemGroup>
+        <Reference Include="CefSharp">
+          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.dll</HintPath>
+          <Private>True</Private>
+        </Reference>
+        <Reference Include="CefSharp.Core">
+          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Core.dll</HintPath>
+          <Private>True</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
     <!-- x86, Win32 and AnyCPU -->
     <Otherwise>
       <ItemGroup>
diff --git a/NuGet/CefSharp.OffScreen.props b/NuGet/CefSharp.OffScreen.props
index a76bc74d5e..7766ee1d37 100644
--- a/NuGet/CefSharp.OffScreen.props
+++ b/NuGet/CefSharp.OffScreen.props
@@ -5,11 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <CefSharpOffscreenBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
   <Choose>
@@ -19,8 +16,17 @@
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
           <Private>False</Private>
         </Reference>
-        <None Include="@(CefSharpOffscreenBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <!--
+        We include CefSharp.OffScreen as private false then copy the files using a
+        None entry. The 32bit libs are included first for consistency with the WinForms
+        and WPF versions which is required by the VS Designer.
+        -->
+        <None Include="@(CefSharpOffScreenBinaries32)">
+          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="@(CefSharpOffScreenBinaries64)">
+          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
       </ItemGroup>
diff --git a/NuGet/CefSharp.WinForms.props b/NuGet/CefSharp.WinForms.props
index abf43b0919..acc46b9c4a 100644
--- a/NuGet/CefSharp.WinForms.props
+++ b/NuGet/CefSharp.WinForms.props
@@ -5,11 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />    
-    <CefSharpWinFormsBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
   <Choose>
@@ -19,8 +16,17 @@
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
           <Private>False</Private>
         </Reference>
-        <None Include="@(CefSharpWinFormsBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <!--
+        We include CefSharp.WinForms as private false then copy the files using a
+        None entry. The 32bit libs must be included first or VS will use the x64
+        ones for the VS Designer.
+        -->
+        <None Include="@(CefSharpWinFormsBinaries32)">
+          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="@(CefSharpWinFormsBinaries64)">
+          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
       </ItemGroup>
diff --git a/NuGet/CefSharp.Wpf.props b/NuGet/CefSharp.Wpf.props
index 3c98205cb4..cf1bc7b24d 100644
--- a/NuGet/CefSharp.Wpf.props
+++ b/NuGet/CefSharp.Wpf.props
@@ -5,11 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <!-- Not currently used, might come in handy for someone though -->
     <CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <CefSharpWpfBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
   </ItemGroup>
 
   <Choose>
@@ -19,8 +16,17 @@
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
           <Private>False</Private>
         </Reference>
-        <None Include="@(CefSharpWpfBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <!--
+        We include CefSharp.Wpf as private false then copy the files using a
+        None entry. The 32bit libs must be included first or VS will use the x64
+        ones for the VS Designer.
+        -->
+        <None Include="@(CefSharpWpfBinaries32)">
+          <Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="@(CefSharpWpfBinaries64)">
+          <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
       </ItemGroup>