Merge pull request #11 from peters/master

Add support for building 3.1750.1738 Former-commit-id: 6c07fd71e747b5e72e167b7c69e1940c5ffcb257
cefsharp · Sep 24, 2014 · 78a6066 · 78a6066
2 parents e992c24 + eff8ed1
commit 78a6066
Show file tree

Hide file tree

Showing 6 changed files with 401 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,11 @@
+.tools/*
+cef/*
+cef_binary_3.y.z_windows32/*
+!cef_binary_3.y.z_windows32/.empty
+cef_binary_3.y.z_windows64/*
+!cef_binary_3.y.z_windows64/.empty
+
+*.nupkg
 *.sdf
 *.opensdf
 *.suo

diff --git a/NuGet/NuGet.exe b/NuGet/NuGet.exe
diff --git a/NuGet/cef.redist.nuspec b/NuGet/cef.redist.nuspec
@@ -15,17 +15,13 @@
     <copyright>Copyright © 2008-2014</copyright>
   </metadata>
   <files>
-<!-- 
-  CEF/Chromium files 
--->
     <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_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.redist.targets" target="build" />
   </files>
 </package>
diff --git a/NuGet/cef.sdk.props b/NuGet/cef.sdk.props
@@ -8,7 +8,7 @@
                Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.dll" />
   </ItemGroup>
   <PropertyGroup>
-    <CefSdkVer>cef.sdk.3.1650.1562-pre2</CefSdkVer>
+    <CefSdkVer>cef.sdk.3.1750.1738-pre0</CefSdkVer>
   </PropertyGroup>
 
 </Project>
diff --git a/Rakefile b/Rakefile