Merge pull request #314 from jornh/prepare-to-pack-31.0.0-pre1

For #137: Set the stage to pack and push 31.0.0-pre1 CefSharp NuGets

Author: perlun

LICENSE

@@ -1,4 +1,4 @@
-// Copyright � 2010-2013 The CefSharp Project
+// Copyright � 2010-2014 The CefSharp Project
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

NuGet/CefSharp.Common.nuspec

@@ -6,12 +6,13 @@
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
     <projectUrl>https://github.com/cefsharp/CefSharp</projectUrl>
+    <licenseUrl>https://raw.github.com/cefsharp/CefSharp/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>The CefSharp Chromium-based browser component ('Core' and common 'Element' components, needed by both WPF and WinForms).</description>
     <tags>chrome browser</tags>
     <copyright>Copyright © 2010-2014 The CefSharp Authors</copyright>
     <dependencies>
-      <dependency id="cef.redist" version="3.1650.1562-pre1" />
+      <dependency id="cef.redist" version="[3.1650.1562-pre3,3.1651)" />
     </dependencies>
 </metadata>
   <files>

NuGet/CefSharp.Common.targets

@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AfterBuild">
+  <Target Name="CefSharpCommonCopyBinaries" BeforeTargets="AfterBuild">
     <ItemGroup>
-<!--      <CefBinaries Include="$(MSBuildThisFileDirectory)..\packages\CEF\$(Platform)\*.*" />
-      <Locales Include="$(MSBuildThisFileDirectory)..\packages\CEF\locales\*.*" />
-      <CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\CefSharp\$(Platform)\*.*" /> -->
-
-      
-      <!-- TODO FIGURE out pro/con of $(SolutionDir) or $(MSBuildThisFileDirectory) ... 
-           guess difference is if everything is not flat - and SolutionDir is is not ROOT for everything?? -->
-      <CefBinaries Include="$(SolutionDir)packages\cef.redist.3.1650.1562-pre0\CEF\$(Platform)\*.*" />
-      <ResourceFiles Include="$(SolutionDir)packages\cef.redist.3.1650.1562-pre0\CEF\*.*" />
-      <LocaleFiles Include="$(SolutionDir)packages\cef.redist.3.1650.1562-pre0\CEF\locales\*.*" />
-
       <CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\CefSharp\$(Platform)\*.*" />
-
     </ItemGroup>
-    <Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CEF\$(Platform) to $(TargetDir)" />
-    <Copy SourceFiles="@(CefBinaries)" 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 locales from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
-    <Copy SourceFiles="@(Locales)" DestinationFolder="$(TargetDir)\locales" />
-
-    <Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CefSharp\$(Platform) to $(TargetDir)" />
+    <Message Importance="high" Text="-- CefSharp.Common.targets: Copying files from $(MSBuildThisFileDirectory)..\CefSharp\$(Platform) to $(TargetDir)" />
     <Copy SourceFiles="@(CefSharpBinaries)" DestinationFolder="$(TargetDir)" />
   </Target>
 </Project>

NuGet/CefSharp.Wpf.nuspec

@@ -6,6 +6,7 @@
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
     <projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
+    <licenseUrl>https://raw.github.com/cefsharp/CefSharp/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>The CefSharp Chromium-based browser component (WPF control).</description>
     <tags>wpf chrome browser</tags>

NuGet/pack.bat

@@ -1,4 +1,4 @@
-set version=3.31.0-pre1
+set version=31.0.0-pre1
 NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version%
 NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version%
 NuGet pack CefSharp.WinForms.nuspec -NoPackageAnalysis -Version %version%