Skip to content

Commit 05eee52

Browse files
committed
Adde ViewportSize setting to GlobalSettings.cs, added project documentation xml to nuget package.
1 parent 1745f5c commit 05eee52

File tree

4 files changed

+43
-4
lines changed

4 files changed

+43
-4
lines changed

.gitignore

+14
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,17 @@ src/DinkToPdf.ThreadSafe/bin/
88
src/DinkToPdf.ThreadSafe/Properties/
99
src/DinkToPdf.ThreadSafe/Files/
1010
src/DinkToPdf.ThreadSafe/obj/
11+
DinkToPdf.TestWebServer/bin/
12+
DinkToPdf.TestWebServer/obj/
13+
DinkToPfd.TestConsoleApp/Files/636281092862553384.pdf
14+
DinkToPfd.TestConsoleApp/bin/Debug/
15+
DinkToPfd.TestConsoleApp/libwkhtmltox.so
16+
DinkToPfd.TestConsoleApp/obj/
17+
DinkToPdf.TestWebServer/libwkhtmltox.so
18+
DinkToPdf.TestWebServer/libwkhtmltox.dylib
19+
DinkToPdf.TestThreadSafe/obj/
20+
DinkToPdf.TestThreadSafe/bin/
21+
DinkToPdf.TestThreadSafe/Files/
22+
DinkToPdf.TestThreadSafe/Properties/
23+
DinkToPdf.TestThreadSafe/libwkhtmltox.so
24+
DinkToPfd.TestConsoleApp/Files/

.vs/restore.dg

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
#:C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf.ThreadSafe\DinkToPdf.ThreadSafe.xproj
2-
C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf.ThreadSafe\DinkToPdf.ThreadSafe.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj
1+
#:C:\Users\admin\Documents\DinkToPdf\DinkToPfd.TestConsoleApp\DinkToPdf.TestConsoleApp.xproj
2+
C:\Users\admin\Documents\DinkToPdf\DinkToPfd.TestConsoleApp\DinkToPdf.TestConsoleApp.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj
3+
#:C:\Users\admin\Documents\DinkToPdf\DinkToPdf.TestThreadSafe\DinkToPdf.TestThreadSafe.xproj
4+
C:\Users\admin\Documents\DinkToPdf\DinkToPdf.TestThreadSafe\DinkToPdf.TestThreadSafe.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj

src/DinkToPdf/Settings/GlobalSettings.cs

+6
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,11 @@ private string MarginBottom
198198
return margins.GetMarginValue(margins.Bottom);
199199
}
200200
}
201+
202+
/// <summary>
203+
/// Set viewport size. Not supported in wkhtmltopdf API since v0.12.2.4
204+
/// </summary>
205+
[WkHtml("viewportSize")]
206+
public string ViewportSize { get; set; }
201207
}
202208
}

src/DinkToPdf/project.json

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"version": "1.0.7-*",
2+
"version": "1.0.8-*",
33

44
"buildOptions": {
5-
"allowUnsafe": true
5+
"allowUnsafe": true,
6+
"xmlDoc": true,
7+
"nowarn": [ "1591" ]
68
},
79

810
"dependencies": {
@@ -22,6 +24,21 @@
2224
}
2325
},
2426

27+
"packOptions": {
28+
"files": {
29+
"mappings": {
30+
"lib/netstandard1.6/": {
31+
"includeFiles": [
32+
"bin/Debug/netstandard1.6/DinkToPdf.pdb",
33+
"bin/Debug/netstandard1.6/DinkToPdf.xml",
34+
"bin/Debug/netstandard1.6/DinkToPdf.dll"
35+
]
36+
}
37+
}
38+
}
39+
},
40+
41+
2542
"scripts": {
2643
"postcompile": [ "dotnet pack --no-build --configuration %compile:Configuration%" ]
2744
}

0 commit comments

Comments
 (0)