Nuget - Include <None/> entries for x86 before the x64 (using the property with both means the x64 are imported first)

amaitland · amaitland · commit 43e61fe150d8 · 2018-03-08T12:30:49.000+10:00
It appears that VS is ignoring the HintPath and using the x64 binary even though we tell it to use the x86 This hopefully resolves #2276
diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
@@ -55,8 +55,12 @@
       <Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="@(CefSharpCommonBinariesAnyCPU)">
-      <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    <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>
diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets
@@ -21,8 +21,12 @@
   <Choose>
     <When Condition="'$(Platform)' == 'AnyCPU'">
       <ItemGroup>
-        <None Include="@(CefSharpOffscreenBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <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.targets b/NuGet/CefSharp.WinForms.targets
@@ -21,8 +21,12 @@
   <Choose>
     <When Condition="'$(Platform)' == 'AnyCPU'">
       <ItemGroup>
-        <None Include="@(CefSharpWinFormsBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <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.targets b/NuGet/CefSharp.Wpf.targets
@@ -21,8 +21,12 @@
   <Choose>
     <When Condition="'$(Platform)' == 'AnyCPU'">
       <ItemGroup>
-        <None Include="@(CefSharpWpfBinariesAnyCPU)">
-          <Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        <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>
