Skip to content

Commit 0dd084c

Browse files
pruizpruiz
committed
Upgraded solution to net4 client profile.
1 parent 7caf3fd commit 0dd084c

15 files changed

+132
-45
lines changed

‎WkHtmlToXSharp.Linux32/WkHtmlToXSharp.Linux32.csproj

100755100644
+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WkHtmlToXSharp</RootNamespace>
1111
<AssemblyName>WkHtmlToXSharp.Linux32</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
1717
</PropertyGroup>
@@ -23,6 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2829
<DebugType>pdbonly</DebugType>
@@ -31,11 +32,16 @@
3132
<DefineConstants>TRACE</DefineConstants>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
37-
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
38+
<Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
42+
<Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
44+
<Private>True</Private>
3945
</Reference>
4046
<Reference Include="System" />
4147
<Reference Include="System.Core" />

‎WkHtmlToXSharp.Linux32/packages.config

100755100644
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging" version="2.1.2" targetFramework="net35" />
3+
<package id="Common.Logging" version="3.3.1" targetFramework="net40-client" />
4+
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net40-client" />
45
</packages>

‎WkHtmlToXSharp.Linux64/WkHtmlToXSharp.Linux64.csproj

100755100644
+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WkHtmlToXSharp</RootNamespace>
1111
<AssemblyName>WkHtmlToXSharp.Linux64</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
1717
</PropertyGroup>
@@ -23,6 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2829
<DebugType>pdbonly</DebugType>
@@ -31,11 +32,16 @@
3132
<DefineConstants>TRACE</DefineConstants>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
37-
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
38+
<Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
42+
<Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
44+
<Private>True</Private>
3945
</Reference>
4046
<Reference Include="System" />
4147
<Reference Include="System.Core" />

‎WkHtmlToXSharp.Linux64/packages.config

100755100644
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging" version="2.1.2" targetFramework="net35" />
3+
<package id="Common.Logging" version="3.3.1" targetFramework="net40-client" />
4+
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net40-client" />
45
</packages>

‎WkHtmlToXSharp.Tests/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
</factoryAdapter>
1717
</logging>
1818
</common>
19-
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>

‎WkHtmlToXSharp.Tests/PdfConverterTests.cs

100755100644
+9-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ private void TryRegisterLibraryBundles()
2929
WkHtmlToXLibrariesManager.Register(new Linux32NativeBundle());
3030
WkHtmlToXLibrariesManager.Register(new Linux64NativeBundle());
3131
WkHtmlToXLibrariesManager.Register(new Win32NativeBundle());
32+
WkHtmlToXLibrariesManager.Register(new Win64NativeBundle());
3233
}
3334
}
3435

@@ -89,7 +90,13 @@ private void _SimpleConversion()
8990
Assert.IsNotEmpty(tmp);
9091
var number = 0;
9192
lock (this) number = count++;
92-
File.WriteAllBytes(@"c:\temp\tmp" + (number) + ".pdf", tmp);
93+
94+
var tempfname = Path.GetTempFileName();
95+
var tempPath = Path.Combine(
96+
Path.GetDirectoryName(tempfname),
97+
Path.GetFileNameWithoutExtension(tempfname) + "." + (number) + ".pdf"
98+
);
99+
File.WriteAllBytes(tempPath, tmp);
93100
}
94101
}
95102

@@ -206,7 +213,7 @@ public void CanHandleAuthFailure()
206213
wk.ObjectSettings.Web.EnablePlugins = false;
207214
wk.ObjectSettings.Web.EnableJavascript = false;
208215

209-
wk.ObjectSettings.Page = @"http://192.236.37.129/"; // Some misg site requiring HTTP Basic auth.
216+
wk.ObjectSettings.Page = @"https://httpbin.org/basic-auth/user/passwd"; // Some misg site requiring HTTP Basic auth.
210217

211218
wk.Begin += (s, e) => { Console.WriteLine("==>> Begin: {0}", e.Value); };
212219
wk.PhaseChanged += (s, e) => { Console.WriteLine("==>> New Phase: {0} ({1})", e.Value, e.Value2); };

‎WkHtmlToXSharp.Tests/Properties/Resources.Designer.cs

100755100644
+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WkHtmlToXSharp.Tests/WkHtmlToXSharp.Tests.csproj

100755100644
+37-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>WkHtmlToXSharp.Tests</RootNamespace>
1313
<AssemblyName>WkHtmlToXSharp.Tests</AssemblyName>
14-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<FileUpgradeFlags>
1717
</FileUpgradeFlags>
@@ -32,7 +32,7 @@
3232
<IsWebBootstrapper>false</IsWebBootstrapper>
3333
<UseApplicationTrust>false</UseApplicationTrust>
3434
<BootstrapperEnabled>true</BootstrapperEnabled>
35-
<TargetFrameworkProfile />
35+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
3636
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
3737
<RestorePackages>true</RestorePackages>
3838
</PropertyGroup>
@@ -45,6 +45,7 @@
4545
<ErrorReport>prompt</ErrorReport>
4646
<WarningLevel>4</WarningLevel>
4747
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
48+
<Prefer32Bit>false</Prefer32Bit>
4849
</PropertyGroup>
4950
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5051
<DebugType>pdbonly</DebugType>
@@ -55,6 +56,7 @@
5556
<WarningLevel>4</WarningLevel>
5657
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5758
<PlatformTarget>AnyCPU</PlatformTarget>
59+
<Prefer32Bit>false</Prefer32Bit>
5860
</PropertyGroup>
5961
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
6062
<DebugSymbols>true</DebugSymbols>
@@ -71,6 +73,7 @@
7173
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
7274
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
7375
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
76+
<Prefer32Bit>false</Prefer32Bit>
7477
</PropertyGroup>
7578
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
7679
<OutputPath>bin\x86\Release\</OutputPath>
@@ -87,16 +90,37 @@
8790
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
8891
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
8992
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
93+
<Prefer32Bit>false</Prefer32Bit>
9094
</PropertyGroup>
9195
<ItemGroup>
92-
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
93-
<SpecificVersion>False</SpecificVersion>
94-
<HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
96+
<Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
98+
<Private>True</Private>
99+
</Reference>
100+
<Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
102+
<Private>True</Private>
103+
</Reference>
104+
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
105+
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
106+
<Private>False</Private>
107+
</Reference>
108+
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
109+
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
110+
<Private>False</Private>
95111
</Reference>
96112
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
97113
<SpecificVersion>False</SpecificVersion>
98114
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
99115
</Reference>
116+
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
117+
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
118+
<Private>False</Private>
119+
</Reference>
120+
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
121+
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
122+
<Private>False</Private>
123+
</Reference>
100124
<Reference Include="System" />
101125
<Reference Include="System.Data" />
102126
<Reference Include="System.Xml" />
@@ -126,6 +150,10 @@
126150
<Project>{eff2501d-d316-40a9-9362-9f771fb6ca98}</Project>
127151
<Name>WkHtmlToXSharp.Win32</Name>
128152
</ProjectReference>
153+
<ProjectReference Include="..\WkHtmlToXSharp.Win64\WkHtmlToXSharp.Win64.csproj">
154+
<Project>{811c3340-4e30-498b-bc67-8eeab18de477}</Project>
155+
<Name>WkHtmlToXSharp.Win64</Name>
156+
</ProjectReference>
129157
<ProjectReference Include="..\WkHtmlToXSharp\WkHtmlToXSharp.csproj">
130158
<Project>{3DADECBF-6D08-4090-9A1D-2064D0466381}</Project>
131159
<Name>WkHtmlToXSharp</Name>
@@ -159,6 +187,9 @@
159187
<None Include="packages.config" />
160188
<None Include="Resources\page.xhtml" />
161189
</ItemGroup>
190+
<ItemGroup>
191+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
192+
</ItemGroup>
162193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
163194
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
164195
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎WkHtmlToXSharp.Tests/packages.config

100755100644
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging" version="2.1.2" targetFramework="net35" />
3+
<package id="Common.Logging" version="3.3.1" targetFramework="net40-client" />
4+
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net40-client" />
45
<package id="NUnit" version="2.6.3" targetFramework="net35" />
6+
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40-client" />
57
</packages>

‎WkHtmlToXSharp.Win32/WkHtmlToXSharp.Win32.csproj

100755100644
+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WkHtmlToXSharp</RootNamespace>
1111
<AssemblyName>WkHtmlToXSharp.Win32</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
14+
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
1717
</PropertyGroup>
@@ -23,6 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2829
<DebugType>pdbonly</DebugType>
@@ -31,11 +32,16 @@
3132
<DefineConstants>TRACE</DefineConstants>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
37-
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Common.Logging.2.1.2\lib\net35\Common.Logging.dll</HintPath>
38+
<Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
42+
<Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
44+
<Private>True</Private>
3945
</Reference>
4046
<Reference Include="System" />
4147
</ItemGroup>

‎WkHtmlToXSharp.Win32/packages.config

100755100644
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging" version="2.1.2" targetFramework="net35" />
3+
<package id="Common.Logging" version="3.3.1" targetFramework="net40-client" />
4+
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net40-client" />
45
</packages>

0 commit comments

Comments
 (0)