Remove CefRedistCopyDllPak32 and CefRedistCopyDllPak64 targets - files are no longer copied as part of these packages

File copying will be added to CefSharp.Common.targets


Former-commit-id: 39c52c95937501b0acab2fa7ed4138fadd8bdb7d

Author: amaitland

NuGet/cef.redist.targets

@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Only execute if the Platform folder exists in this package -->
-  <Target Name="CefRedistCopyDllPak64" BeforeTargets="AfterBuild" Condition="Exists('$(MSBuildThisFileDirectory)..\CEF\$(Platform)')">
-    <ItemGroup>
-      <CefBinaries Include="$(MSBuildThisFileDirectory)..\CEF\$(Platform)\*.*" />
-      <CefPakFiles Include="$(MSBuildThisFileDirectory)..\CEF\*.*" />
-      <CefLocales Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
-    </ItemGroup>
-    <Message Importance="high" Text="-- cef.redist.targets at $(MSBuildThisFileDirectory)" />
-    <Message Importance="high" Text="Copying CEF .dll files from $(MSBuildThisFileDirectory)..\CEF\$(Platform) to $(TargetDir)" />
-    <Copy SourceFiles="@(CefBinaries)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="Copying CEF .pak files from $(MSBuildThisFileDirectory)..\CEF to $(TargetDir)" />
-    <Copy SourceFiles="@(CefPakFiles)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="Copying CEF locales    from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
-    <Copy SourceFiles="@(CefLocales)" DestinationFolder="$(TargetDir)\locales" SkipUnchangedFiles="true" />
-  </Target>
+  <!--
+    Files are no longer copied as part of this targets file.
+    For projects other than CefSharp define a target to copy the files.
+    Checkout the CefSharp.Common.targets file for an example
+    -->
+  
+  <!--
+    If this packages contains the x86 folder then set the 32bit properties, 
+	if it contains the x64 folder than set the 64bit properties.
+	Example if this is a x64 package, their will be a x64 folder in the CEF
+    directory, if that's the case this package contains the x64 files, so we'll
+	define those properties.
+    -->
+  <ItemGroup Condition="Exists('$(MSBuildThisFileDirectory)..\CEF\x86')">
+    <CefBinaries32 Include="$(MSBuildThisFileDirectory)..\CEF\x86\*.*" />
+    <CefPakFiles32 Include="$(MSBuildThisFileDirectory)..\CEF\*.*" />
+    <CefLocales32 Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="Exists('$(MSBuildThisFileDirectory)..\CEF\x64')">
+    <CefBinaries64 Include="$(MSBuildThisFileDirectory)..\CEF\x64\*.*" />
+    <CefPakFiles64 Include="$(MSBuildThisFileDirectory)..\CEF\*.*" />
+    <CefLocales64 Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
+  </ItemGroup>
 </Project>

NuGet/cef.sdk.props

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CefSdkVer>cef.sdk.3.2704.1418</CefSdkVer>
+    <CefSdkVer>cef.sdk.3.2704.1429</CefSdkVer>
   </PropertyGroup>
 </Project>

build.ps1

@@ -16,7 +16,7 @@ $Cef32vcx = Join-Path (Join-Path $Cef32 'libcef_dll_wrapper') 'libcef_dll_wrappe
 $Cef64 = Join-Path $WorkingDir  'cef_binary_3.y.z_windows64'
 $Cef64vcx = Join-Path (Join-Path $Cef64 'libcef_dll_wrapper') 'libcef_dll_wrapper.vcxproj'
 
-$CefVersion = "3.2704.1424.gc3f0a5b"
+$CefVersion = "3.2704.1429.g11ec9b6"
 # Take the cef version and strip the commit hash
 $CefPackageVersion = $CefVersion.SubString(0, $CefVersion.LastIndexOf('.'))
 
@@ -342,23 +342,10 @@ function Nupkg
         Die "Please install nuget. More information available at: http://docs.nuget.org/docs/start-here/installing-nuget"
     }
 
-    # Redist target
-    $RedistTargetsFilename = Resolve-Path ".\nuget\cef.redist.targets"
-
-    # Write 32bit redist target
-    [xml]$Xml = Get-Content $RedistTargetsFilename
-    $Xml.Project.Target | Foreach-Object { $_.Name = 'CefRedistCopyDllPak32'}
-    $Xml.Save($RedistTargetsFilename)
-
     # Build 32bit packages
     #. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Debug;DotConfiguration=.Debug;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
     . $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;DotConfiguration=;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
 
-    # Write 64bit redist target
-    [xml]$Xml = Get-Content $RedistTargetsFilename
-    $Xml.Project.Target | Foreach-Object { $_.Name = 'CefRedistCopyDllPak64'}
-    $Xml.Save($RedistTargetsFilename)
-
     # Build 64bit packages
     #. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Debug;DotConfiguration=.Debug;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
     . $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;DotConfiguration=;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget