From 864dc92e4d9eaaa3c2c620b6f9928e85deaf73c4 Mon Sep 17 00:00:00 2001
From: jornh <jornhansen@gmail.com>
Date: Fri, 4 Apr 2014 09:09:32 +0200
Subject: [PATCH] cef.redist 3.1650.1562-pre3 NuGet ... currently only with x86
 .dll files

---
 NuGet/cef.redist.nuspec  | 15 +++++++--------
 NuGet/cef.redist.targets | 22 ++++++++++++----------
 NuGet/pack.bat           |  4 +++-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/NuGet/cef.redist.nuspec b/NuGet/cef.redist.nuspec
index cff0fb9..decb23e 100644
--- a/NuGet/cef.redist.nuspec
+++ b/NuGet/cef.redist.nuspec
@@ -6,27 +6,26 @@
     <authors>The Chromium Embedded Framework Authors</authors>
     <owners>The CefSharp Authors</owners>
     <projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
-    <iconUrl>https://raw.github.com/jornh/cef-binary/fdc5894d5eb456ec3f389c37b2eeb6458e47a115/NuGet/cef32x32.gif</iconUrl>
+    <iconUrl>https://raw.github.com/cefsharp/cef-binary/master/NuGet/cef128x128.gif</iconUrl>
+    <licenseUrl>https://raw.github.com/cefsharp/cef-binary/master/cef_binary_3.y.z_windows32/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>CEF - the Chromium Embedded Framework.
     NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
     <tags>chrome chromium native embedded browser CEF nativepackage</tags>
-    <copyright>Copyright © 2008-2013</copyright>
+    <copyright>Copyright © 2008-2014</copyright>
   </metadata>
   <files>
 <!-- 
   CEF/Chromium files 
 -->
-    <file src="..\cef_binary_3.y.z_windows32\Release\icudt.dll" target="CEF\x86" />
-    <file src="..\cef_binary_3.y.z_windows64\Release\icudt.dll" target="CEF\x64" />
-    <file src="..\cef_binary_3.y.z_windows32\Release\libcef.dll" target="CEF\x86"/>
-    <file src="..\cef_binary_3.y.z_windows64\Release\libcef.dll" target="CEF\x64"/>
-
+    <file src="..\cef_binary_3.y.z_windows32\Release\*.dll" target="CEF\x86" />
+<!--    <file src="..\cef_binary_3.y.z_windows64\Release\*.dll" target="CEF\x64" />
+-->
     <file src="..\cef_binary_3.y.z_windows32\Resources\cef.pak" target="CEF\"/>
     <file src="..\cef_binary_3.y.z_windows32\Resources\devtools_resources.pak" target="CEF\"/>
     <file src="..\cef_binary_3.y.z_windows32\Resources\locales\en-US.pak" target="CEF\locales"/>
 
 <!--    <file src="Cef.props" target="build" /> -->
-    <file src="Cef.targets" target="build" />
+    <file src="cef.redist.targets" target="build" />
   </files>
 </package>
diff --git a/NuGet/cef.redist.targets b/NuGet/cef.redist.targets
index 4e21f24..aa82dfe 100644
--- a/NuGet/cef.redist.targets
+++ b/NuGet/cef.redist.targets
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AfterBuild">
+  <Target Name="CefRedistCopyDllPak" BeforeTargets="AfterBuild">
     <ItemGroup>
       <CefBinaries Include="$(MSBuildThisFileDirectory)..\CEF\$(Platform)\*.*" />
-      <Locales Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
-      <CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\CefSharp\$(Platform)\*.*" />
+      <CefPakFiles Include="$(MSBuildThisFileDirectory)..\CEF\*.*" />
+      <CefLocales Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
     </ItemGroup>
-    <Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CEF\$(Platform) to $(TargetDir)" />
+    <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)" />
-    <Message Importance="high" Text="Copying locales from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
-    <Copy SourceFiles="@(PakResources)" DestinationFolder="$(TargetDir)" />
-    <Message Importance="high" Text="Copying .pak files from $(MSBuildThisFileDirectory)..\CEF to $(TargetDir)" />
-    <Copy SourceFiles="@(Locales)" DestinationFolder="$(TargetDir)\locales" />
-    <Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CefSharp\$(Platform) to $(TargetDir)" />
-    <Copy SourceFiles="@(CefSharpBinaries)" DestinationFolder="$(TargetDir)" />
+
+    <Message Importance="high" Text="Copying CEF .pak files from $(MSBuildThisFileDirectory)..\CEF to $(TargetDir)" />
+    <Copy SourceFiles="@(CefPakFiles)" DestinationFolder="$(TargetDir)" />
+
+    <Message Importance="high" Text="Copying CEF locales    from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
+    <Copy SourceFiles="@(CefLocales)" DestinationFolder="$(TargetDir)\locales" />
   </Target>
 </Project>
diff --git a/NuGet/pack.bat b/NuGet/pack.bat
index 4e5af14..8e28e45 100644
--- a/NuGet/pack.bat
+++ b/NuGet/pack.bat
@@ -1,3 +1,5 @@
-set version=3.1650.1562-pre2
+set version=3.1650.1562-pre3
 NuGet pack cef.redist.nuspec -NoPackageAnalysis -Version %version%
+NuGet pack cef.redist.x86.nuspec -NoPackageAnalysis -Version %version%
+NuGet pack cef.redist.x64.nuspec -NoPackageAnalysis -Version %version%
 NuGet pack cef.sdk.nuspec    -NoPackageAnalysis -Version %version%