diff --git a/WkHtmlToXSharp.Linux32/Libs/libwkhtmltox0.so.gz b/WkHtmlToXSharp.Linux32/Libs/libwkhtmltox0.so.gz index 86168a6..f63a6a4 100755 Binary files a/WkHtmlToXSharp.Linux32/Libs/libwkhtmltox0.so.gz and b/WkHtmlToXSharp.Linux32/Libs/libwkhtmltox0.so.gz differ diff --git a/WkHtmlToXSharp.Linux32/Properties/AssemblyInfo.cs b/WkHtmlToXSharp.Linux32/Properties/AssemblyInfo.cs index 286ea8f..3b4e438 100755 --- a/WkHtmlToXSharp.Linux32/Properties/AssemblyInfo.cs +++ b/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("")] diff --git a/WkHtmlToXSharp.Linux64/Libs/libwkhtmltox0.so.gz b/WkHtmlToXSharp.Linux64/Libs/libwkhtmltox0.so.gz index 3d2c864..f41131f 100755 Binary files a/WkHtmlToXSharp.Linux64/Libs/libwkhtmltox0.so.gz and b/WkHtmlToXSharp.Linux64/Libs/libwkhtmltox0.so.gz differ diff --git a/WkHtmlToXSharp.Linux64/Properties/AssemblyInfo.cs b/WkHtmlToXSharp.Linux64/Properties/AssemblyInfo.cs index de124af..66b0398 100755 --- a/WkHtmlToXSharp.Linux64/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/WkHtmlToXSharp.Tests/PdfConverterTests.cs b/WkHtmlToXSharp.Tests/PdfConverterTests.cs index ef7be5a..6250e9e 100755 --- a/WkHtmlToXSharp.Tests/PdfConverterTests.cs +++ b/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()) diff --git a/WkHtmlToXSharp.Win32/Libs/libeay32.dll.gz b/WkHtmlToXSharp.Win32/Libs/libeay32.dll.gz deleted file mode 100755 index 3abdf9e..0000000 Binary files a/WkHtmlToXSharp.Win32/Libs/libeay32.dll.gz and /dev/null differ diff --git a/WkHtmlToXSharp.Win32/Libs/libgcc_s_dw2-1.dll.gz b/WkHtmlToXSharp.Win32/Libs/libgcc_s_dw2-1.dll.gz deleted file mode 100755 index 63b7da6..0000000 Binary files a/WkHtmlToXSharp.Win32/Libs/libgcc_s_dw2-1.dll.gz and /dev/null differ diff --git a/WkHtmlToXSharp.Win32/Libs/mingwm10.dll.gz b/WkHtmlToXSharp.Win32/Libs/mingwm10.dll.gz deleted file mode 100755 index c81ca2f..0000000 Binary files a/WkHtmlToXSharp.Win32/Libs/mingwm10.dll.gz and /dev/null differ diff --git a/WkHtmlToXSharp.Win32/Libs/ssleay32.dll.gz b/WkHtmlToXSharp.Win32/Libs/ssleay32.dll.gz deleted file mode 100755 index b8081e4..0000000 Binary files a/WkHtmlToXSharp.Win32/Libs/ssleay32.dll.gz and /dev/null differ diff --git a/WkHtmlToXSharp.Win32/Libs/wkhtmltox0.dll.gz b/WkHtmlToXSharp.Win32/Libs/wkhtmltox0.dll.gz index d4a117f..1fb73f5 100755 Binary files a/WkHtmlToXSharp.Win32/Libs/wkhtmltox0.dll.gz and b/WkHtmlToXSharp.Win32/Libs/wkhtmltox0.dll.gz differ diff --git a/WkHtmlToXSharp.Win32/Properties/AssemblyInfo.cs b/WkHtmlToXSharp.Win32/Properties/AssemblyInfo.cs index 42e08f3..028e39c 100755 --- a/WkHtmlToXSharp.Win32/Properties/AssemblyInfo.cs +++ b/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("")] diff --git a/WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj b/WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj index b639462..f9c756f 100755 --- a/WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj +++ b/WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj @@ -49,18 +49,6 @@ WkHtmlToXSharp - - - - - - - - - - - - diff --git a/WkHtmlToXSharp.Win64/Libs/wkhtmltox0.dll.gz b/WkHtmlToXSharp.Win64/Libs/wkhtmltox0.dll.gz new file mode 100755 index 0000000..66bb293 Binary files /dev/null and b/WkHtmlToXSharp.Win64/Libs/wkhtmltox0.dll.gz differ diff --git a/WkHtmlToXSharp.Win64/Properties/AssemblyInfo.cs b/WkHtmlToXSharp.Win64/Properties/AssemblyInfo.cs new file mode 100755 index 0000000..b04f175 --- /dev/null +++ b/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")] diff --git a/WkHtmlToXSharp.Win64/Win64NativeBundle.cs b/WkHtmlToXSharp.Win64/Win64NativeBundle.cs new file mode 100755 index 0000000..f49e628 --- /dev/null +++ b/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 + } +} diff --git a/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.csproj b/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.csproj new file mode 100755 index 0000000..f4a7c7d --- /dev/null +++ b/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.csproj @@ -0,0 +1,78 @@ + + + + + Debug + AnyCPU + {811C3340-4E30-498B-BC67-8EEAB18DE477} + Library + Properties + WkHtmlToXSharp + WkHtmlToXSharp.Win64 + v3.5 + 512 + + ..\ + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + ..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll + + + + + + + + + + + + Designer + + + + + {3dadecbf-6d08-4090-9a1d-2064d0466381} + WkHtmlToXSharp + + + + + + + + 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}. + + + + + \ No newline at end of file diff --git a/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.nuspec b/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.nuspec new file mode 100755 index 0000000..eaf6e15 --- /dev/null +++ b/WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.nuspec @@ -0,0 +1,25 @@ + + + + WkHtmlToXSharp.Win64 + 0.0.0.0 + pruiz + pruiz + https://github.com/pruiz/WkHtmlToXSharp + http://www.gnu.org/licenses/lgpl-2.1.html + + false + See changes for this revision at: http://github.com/pruiz/WkHtmlToXSharp/commit/GIT_COMMIT + WkHtmlToXSharp's Windows 64Bits natible library bundle. + Copyright Pablo Ruiz García 2010-2013 + PDF HTML WkHtmlToPdf WkHtmlToXSharp html2pdf htmltopdf wkhtmltopdf + + + + + + + + + + diff --git a/WkHtmlToXSharp.Win64/packages.config b/WkHtmlToXSharp.Win64/packages.config new file mode 100755 index 0000000..8aca085 --- /dev/null +++ b/WkHtmlToXSharp.Win64/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/WkHtmlToXSharp.sln b/WkHtmlToXSharp.sln index 14293cd..a30b405 100755 --- a/WkHtmlToXSharp.sln +++ b/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 diff --git a/WkHtmlToXSharp/Properties/AssemblyInfo.cs b/WkHtmlToXSharp/Properties/AssemblyInfo.cs index f50a419..372260e 100755 --- a/WkHtmlToXSharp/Properties/AssemblyInfo.cs +++ b/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("")]