Added a Win64 native bundle.

Upgraded all native bundles to v0.12.0.

WkHtmlToXSharp.Linux32/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Pablo Ruiz García")]
 [assembly: AssemblyProduct("WkHtmlToXSharp")]
-[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
+[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

WkHtmlToXSharp.Linux64/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("WkHtmlToXSharp.Linux64")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011~2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

WkHtmlToXSharp.Tests/PdfConverterTests.cs

@@ -187,7 +187,7 @@ public void ConvertFromString()
 		}
 
 		[Test]
-		[Ignore("This test requires (still to be released) wkhtmltopdf v0.12+")]
+//		[Ignore("This test requires (still to be released) wkhtmltopdf v0.12+")]
 		public void CanHandleAuthFailure()
 		{
 			using (var wk = new MultiplexingConverter())

WkHtmlToXSharp.Win32/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Pablo Ruiz García")]
 [assembly: AssemblyProduct("WkHtmlToXSharp")]
-[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
+[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj

@@ -49,18 +49,6 @@
       <Name>WkHtmlToXSharp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Libs\libeay32.dll.gz" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Libs\libgcc_s_dw2-1.dll.gz" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Libs\mingwm10.dll.gz" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Libs\ssleay32.dll.gz" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Libs\wkhtmltox0.dll.gz" />
   </ItemGroup>

WkHtmlToXSharp.Win64/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WkHtmlToXSharp.Win64")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Pablo Ruiz García")]
+[assembly: AssemblyProduct("WkHtmlToXSharp")]
+[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("61b0f5cc-4abe-427b-ab1f-cd5956fdd03c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

WkHtmlToXSharp.Win64/Win64NativeBundle.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+
+namespace WkHtmlToXSharp
+{
+	public class Win64NativeBundle : INativeLibraryBundle
+	{
+		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
+		private static readonly string ResourcesPath = typeof(Win64NativeBundle).Namespace + ".Libs.";
+
+		#region INativeLibraryBundle Members
+
+		public bool SupportsCurrentPlatform
+		{
+			get {
+				return Environment.OSVersion.Platform == PlatformID.Win32NT && WkHtmlToXLibrariesManager.RunningIn64Bits;
+			}
+		}
+
+		private void DeployLibrary(WkHtmlToXLibrariesManager manager, string resource)
+		{
+			var fileName = resource.Substring(ResourcesPath.Length);
+
+			using (var stream = Assembly.GetManifestResourceStream(resource))
+			{
+				manager.DeployLibrary(stream, fileName, File.GetLastWriteTime(Assembly.Location));
+			}
+		}
+
+		public void DeployBundle(WkHtmlToXLibrariesManager manager)
+		{
+			if (manager == null) throw new ArgumentNullException("manager");
+
+			var resourcesList = Assembly.GetManifestResourceNames();
+
+			foreach (var res in resourcesList)
+			{
+				if (res.StartsWith(ResourcesPath))
+					DeployLibrary(manager, res);
+			}
+		}
+
+		#endregion
+	}
+}

WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.csproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{811C3340-4E30-498B-BC67-8EEAB18DE477}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WkHtmlToXSharp</RootNamespace>
+    <AssemblyName>WkHtmlToXSharp.Win64</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging">
+      <HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Win64NativeBundle.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Libs\wkhtmltox0.dll.gz" />
+    <None Include="packages.config" />
+    <None Include="WkHtmlToXSharp.Win64.nuspec">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\WkHtmlToXSharp\WkHtmlToXSharp.csproj">
+      <Project>{3dadecbf-6d08-4090-9a1d-2064d0466381}</Project>
+      <Name>WkHtmlToXSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.nuspec

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+	<metadata>
+		<id>WkHtmlToXSharp.Win64</id>
+		<version>0.0.0.0</version>
+		<authors>pruiz</authors>
+		<owners>pruiz</owners>
+		<projectUrl>https://github.com/pruiz/WkHtmlToXSharp</projectUrl>
+		<licenseUrl>http://www.gnu.org/licenses/lgpl-2.1.html</licenseUrl>
+		<!-- iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl -->
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<releaseNotes>See changes for this revision at: http://github.com/pruiz/WkHtmlToXSharp/commit/GIT_COMMIT </releaseNotes>
+		<description>WkHtmlToXSharp's Windows 64Bits natible library bundle.</description>
+		<copyright>Copyright Pablo Ruiz García  2010-2013</copyright>
+		<tags>PDF HTML WkHtmlToPdf WkHtmlToXSharp html2pdf htmltopdf wkhtmltopdf</tags>
+
+		<dependencies>
+			<dependency id="WkHtmlToXSharp" version="0.0.0.0" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="bin\Release\WkHtmlToXSharp.Win64.*" target="lib" />
+		<file src="**\*.cs" target="src" />
+	</files>
+</package>

WkHtmlToXSharp.Win64/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Common.Logging" version="2.1.2" targetFramework="net35" />
+</packages>

WkHtmlToXSharp.sln

@@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Win32", "WkH
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Linux64", "WkHtmlToXSharp.Linux64\WkHtmlToXSharp.Linux64.csproj", "{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Win64", "WkHtmlToXSharp.Win64\WkHtmlToXSharp.Win64.csproj", "{811C3340-4E30-498B-BC67-8EEAB18DE477}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -111,6 +113,18 @@ Global
 		{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x64.ActiveCfg = Release|Any CPU
 		{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x86.ActiveCfg = Release|Any CPU
 		{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x86.Build.0 = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Any CPU.Build.0 = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|x64.ActiveCfg = Release|Any CPU
+		{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

WkHtmlToXSharp/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Pablo Ruiz García")]
 [assembly: AssemblyProduct("WkHtmlToXSharp")]
-[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
+[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]