Upgrade to 3.2704.1429 - Required for following changes as cef.redist targets files have changed

Update CefSharp.Common.targets so it copies the cef.redist packages
Add support for Win32 target (obviously uses x86 files)
Update CefSharp.Native.props to copy the files also for local builds
Add AnyCPU target
Add CefLoader helper class for AssemblyResolver

Author: amaitland

CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.2704.1429\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1429\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <NuGetPackageImportStamp>e9271c37</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>bd305cd7</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>

CefSharp.BrowserSubprocess.Core/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.2704.1418" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2704.1429" targetFramework="Native" />
 </packages>

CefSharp.Core/CefSharp.Core.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.2704.1429\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1429\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
-    <NuGetPackageImportStamp>2ebb2af2</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>dac520a5</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>

CefSharp.Core/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.2704.1418" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2704.1429" targetFramework="Native" />
 </packages>

CefSharp.Native.props

@@ -7,4 +7,22 @@
         </ItemGroup>
         <Copy SourceFiles="@(SubProcessFiles)" DestinationFolder="$(TargetDir)" />
     </Target>
-</Project>
+  
+  <Target Name="CefSharpCopyLibs86" BeforeTargets="AfterBuild" Condition="'$(Platform)' == 'x86'">
+    <Message Importance="high" Text="Copying cef.redist x86 binaries" />
+    <Copy SourceFiles="@(CefBinaries32)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <Message Importance="high" Text="Copying cef.redist x86 pak files" />
+    <Copy SourceFiles="@(CefPakFiles32)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <Message Importance="high" Text="Copying cef.redist x86 locales " />
+    <Copy SourceFiles="@(CefLocales32)" DestinationFolder="$(TargetDir)\locales" SkipUnchangedFiles="true" />
+  </Target>
+  
+  <Target Name="CefSharpCopyLibs64" BeforeTargets="AfterBuild" Condition="'$(Platform)' == 'x64'">
+    <Message Importance="high" Text="Copying cef.redist x64 binaries" />
+    <Copy SourceFiles="@(CefBinaries64)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <Message Importance="high" Text="Copying cef.redist x64 pak files" />
+    <Copy SourceFiles="@(CefPakFiles64)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <Message Importance="high" Text="Copying cef.redist x64 locales " />
+    <Copy SourceFiles="@(CefLocales64)" DestinationFolder="$(TargetDir)\locales" SkipUnchangedFiles="true" />
+  </Target>  
+</Project>

CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj

@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <NuGetPackageImportStamp>f7c3e354</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>6a989588</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -94,6 +94,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets')" />
 </Project>

CefSharp.OffScreen.Example/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2704.1418" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2704.1418" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2704.1429" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2704.1429" targetFramework="net452" />
 </packages>

CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj

@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>b35484a6</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>39ab83f1</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -182,6 +182,6 @@
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
   <Import Project="..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets')" />
   <Import Project="..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets')" />
 </Project>

CefSharp.WinForms.Example/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2704.1418" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2704.1418" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2704.1429" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2704.1429" targetFramework="net452" />
 </packages>

CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj

@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>e08d0872</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>73c79eb8</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -180,6 +180,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1429\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1429\build\cef.redist.x64.targets')" />
 </Project>