Skip to content

Commit 0460ccc

Browse files
pruizpruiz
committed
Added a Win64 native bundle.
Upgraded all native bundles to v0.12.0.
1 parent 2a47d8a commit 0460ccc

20 files changed

+212
-19
lines changed

‎WkHtmlToXSharp.Linux32/Libs/libwkhtmltox0.so.gz

712 KB
Binary file not shown.

‎WkHtmlToXSharp.Linux32/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Pablo Ruiz García")]
1212
[assembly: AssemblyProduct("WkHtmlToXSharp")]
13-
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
13+
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎WkHtmlToXSharp.Linux64/Libs/libwkhtmltox0.so.gz

541 KB
Binary file not shown.

‎WkHtmlToXSharp.Linux64/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Microsoft")]
1212
[assembly: AssemblyProduct("WkHtmlToXSharp.Linux64")]
13-
[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
13+
[assembly: AssemblyCopyright("Copyright © Microsoft 2011~2014")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("0.0.0.0")]
36+
[assembly: AssemblyFileVersion("0.0.0.0")]

‎WkHtmlToXSharp.Tests/PdfConverterTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void ConvertFromString()
187187
}
188188

189189
[Test]
190-
[Ignore("This test requires (still to be released) wkhtmltopdf v0.12+")]
190+
// [Ignore("This test requires (still to be released) wkhtmltopdf v0.12+")]
191191
public void CanHandleAuthFailure()
192192
{
193193
using (var wk = new MultiplexingConverter())

‎WkHtmlToXSharp.Win32/Libs/libeay32.dll.gz

-531 KB
Binary file not shown.

‎WkHtmlToXSharp.Win32/Libs/libgcc_s_dw2-1.dll.gz

-19.9 KB
Binary file not shown.

‎WkHtmlToXSharp.Win32/Libs/mingwm10.dll.gz

-4.96 KB
Binary file not shown.

‎WkHtmlToXSharp.Win32/Libs/ssleay32.dll.gz

-106 KB
Binary file not shown.

‎WkHtmlToXSharp.Win32/Libs/wkhtmltox0.dll.gz

-3.93 MB
Binary file not shown.

‎WkHtmlToXSharp.Win32/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Pablo Ruiz García")]
1212
[assembly: AssemblyProduct("WkHtmlToXSharp")]
13-
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
13+
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj

-12
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,6 @@
4949
<Name>WkHtmlToXSharp</Name>
5050
</ProjectReference>
5151
</ItemGroup>
52-
<ItemGroup>
53-
<EmbeddedResource Include="Libs\libeay32.dll.gz" />
54-
</ItemGroup>
55-
<ItemGroup>
56-
<EmbeddedResource Include="Libs\libgcc_s_dw2-1.dll.gz" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<EmbeddedResource Include="Libs\mingwm10.dll.gz" />
60-
</ItemGroup>
61-
<ItemGroup>
62-
<EmbeddedResource Include="Libs\ssleay32.dll.gz" />
63-
</ItemGroup>
6452
<ItemGroup>
6553
<EmbeddedResource Include="Libs\wkhtmltox0.dll.gz" />
6654
</ItemGroup>

‎WkHtmlToXSharp.Win64/Libs/wkhtmltox0.dll.gz

8.67 MB
Binary file not shown.

‎WkHtmlToXSharp.Win64/Properties/AssemblyInfo.cs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("WkHtmlToXSharp.Win64")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("Pablo Ruiz García")]
12+
[assembly: AssemblyProduct("WkHtmlToXSharp")]
13+
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("61b0f5cc-4abe-427b-ab1f-cd5956fdd03c")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("0.0.0.0")]
36+
[assembly: AssemblyFileVersion("0.0.0.0")]

‎WkHtmlToXSharp.Win64/Win64NativeBundle.cs

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
using System;
2+
using System.IO;
3+
using System.Collections.Generic;
4+
using System.Text;
5+
using System.Reflection;
6+
7+
namespace WkHtmlToXSharp
8+
{
9+
public class Win64NativeBundle : INativeLibraryBundle
10+
{
11+
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
12+
private static readonly string ResourcesPath = typeof(Win64NativeBundle).Namespace + ".Libs.";
13+
14+
#region INativeLibraryBundle Members
15+
16+
public bool SupportsCurrentPlatform
17+
{
18+
get {
19+
return Environment.OSVersion.Platform == PlatformID.Win32NT && WkHtmlToXLibrariesManager.RunningIn64Bits;
20+
}
21+
}
22+
23+
private void DeployLibrary(WkHtmlToXLibrariesManager manager, string resource)
24+
{
25+
var fileName = resource.Substring(ResourcesPath.Length);
26+
27+
using (var stream = Assembly.GetManifestResourceStream(resource))
28+
{
29+
manager.DeployLibrary(stream, fileName, File.GetLastWriteTime(Assembly.Location));
30+
}
31+
}
32+
33+
public void DeployBundle(WkHtmlToXLibrariesManager manager)
34+
{
35+
if (manager == null) throw new ArgumentNullException("manager");
36+
37+
var resourcesList = Assembly.GetManifestResourceNames();
38+
39+
foreach (var res in resourcesList)
40+
{
41+
if (res.StartsWith(ResourcesPath))
42+
DeployLibrary(manager, res);
43+
}
44+
}
45+
46+
#endregion
47+
}
48+
}

‎WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.csproj

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{811C3340-4E30-498B-BC67-8EEAB18DE477}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>WkHtmlToXSharp</RootNamespace>
11+
<AssemblyName>WkHtmlToXSharp.Win64</AssemblyName>
12+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PlatformTarget>AnyCPU</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>bin\Debug\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
</PropertyGroup>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<PlatformTarget>AnyCPU</PlatformTarget>
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<StartupObject />
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="Common.Logging">
41+
<HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
42+
</Reference>
43+
<Reference Include="System" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<Compile Include="Properties\AssemblyInfo.cs" />
47+
<Compile Include="Win64NativeBundle.cs" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<EmbeddedResource Include="Libs\wkhtmltox0.dll.gz" />
51+
<None Include="packages.config" />
52+
<None Include="WkHtmlToXSharp.Win64.nuspec">
53+
<SubType>Designer</SubType>
54+
</None>
55+
</ItemGroup>
56+
<ItemGroup>
57+
<ProjectReference Include="..\WkHtmlToXSharp\WkHtmlToXSharp.csproj">
58+
<Project>{3dadecbf-6d08-4090-9a1d-2064d0466381}</Project>
59+
<Name>WkHtmlToXSharp</Name>
60+
</ProjectReference>
61+
</ItemGroup>
62+
<ItemGroup />
63+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
65+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
66+
<PropertyGroup>
67+
<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>
68+
</PropertyGroup>
69+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
70+
</Target>
71+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
72+
Other similar extension points exist, see Microsoft.Common.targets.
73+
<Target Name="BeforeBuild">
74+
</Target>
75+
<Target Name="AfterBuild">
76+
</Target>
77+
-->
78+
</Project>

‎WkHtmlToXSharp.Win64/WkHtmlToXSharp.Win64.nuspec

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package>
3+
<metadata>
4+
<id>WkHtmlToXSharp.Win64</id>
5+
<version>0.0.0.0</version>
6+
<authors>pruiz</authors>
7+
<owners>pruiz</owners>
8+
<projectUrl>https://github.com/pruiz/WkHtmlToXSharp</projectUrl>
9+
<licenseUrl>http://www.gnu.org/licenses/lgpl-2.1.html</licenseUrl>
10+
<!-- iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl -->
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<releaseNotes>See changes for this revision at: http://github.com/pruiz/WkHtmlToXSharp/commit/GIT_COMMIT </releaseNotes>
13+
<description>WkHtmlToXSharp's Windows 64Bits natible library bundle.</description>
14+
<copyright>Copyright Pablo Ruiz García 2010-2013</copyright>
15+
<tags>PDF HTML WkHtmlToPdf WkHtmlToXSharp html2pdf htmltopdf wkhtmltopdf</tags>
16+
17+
<dependencies>
18+
<dependency id="WkHtmlToXSharp" version="0.0.0.0" />
19+
</dependencies>
20+
</metadata>
21+
<files>
22+
<file src="bin\Release\WkHtmlToXSharp.Win64.*" target="lib" />
23+
<file src="**\*.cs" target="src" />
24+
</files>
25+
</package>

‎WkHtmlToXSharp.Win64/packages.config

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

‎WkHtmlToXSharp.sln

+14
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Win32", "WkH
2929
EndProject
3030
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Linux64", "WkHtmlToXSharp.Linux64\WkHtmlToXSharp.Linux64.csproj", "{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}"
3131
EndProject
32+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WkHtmlToXSharp.Win64", "WkHtmlToXSharp.Win64\WkHtmlToXSharp.Win64.csproj", "{811C3340-4E30-498B-BC67-8EEAB18DE477}"
33+
EndProject
3234
Global
3335
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3436
Debug|Any CPU = Debug|Any CPU
@@ -111,6 +113,18 @@ Global
111113
{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x64.ActiveCfg = Release|Any CPU
112114
{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x86.ActiveCfg = Release|Any CPU
113115
{23B0D174-40F4-4BB3-A5AA-02F7E3D8A420}.Release|x86.Build.0 = Release|Any CPU
116+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Any CPU.Build.0 = Debug|Any CPU
118+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
119+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
120+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|x64.ActiveCfg = Debug|Any CPU
121+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Debug|x86.ActiveCfg = Debug|Any CPU
122+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Any CPU.ActiveCfg = Release|Any CPU
123+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Any CPU.Build.0 = Release|Any CPU
124+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
125+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|Mixed Platforms.Build.0 = Release|Any CPU
126+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|x64.ActiveCfg = Release|Any CPU
127+
{811C3340-4E30-498B-BC67-8EEAB18DE477}.Release|x86.ActiveCfg = Release|Any CPU
114128
EndGlobalSection
115129
GlobalSection(SolutionProperties) = preSolution
116130
HideSolutionNode = FALSE

‎WkHtmlToXSharp/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Pablo Ruiz García")]
1212
[assembly: AssemblyProduct("WkHtmlToXSharp")]
13-
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2013")]
13+
[assembly: AssemblyCopyright("Copyright © Pablo Ruiz García 2011~2014")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

0 commit comments

Comments
 (0)