Adde ViewportSize setting to GlobalSettings.cs, added project documen…

…tation xml to nuget package.
rdvojmoc · Apr 18, 2017 · 05eee52 · 05eee52
1 parent 1745f5c
commit 05eee52
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,17 @@ src/DinkToPdf.ThreadSafe/bin/
 src/DinkToPdf.ThreadSafe/Properties/
 src/DinkToPdf.ThreadSafe/Files/
 src/DinkToPdf.ThreadSafe/obj/
+DinkToPdf.TestWebServer/bin/
+DinkToPdf.TestWebServer/obj/
+DinkToPfd.TestConsoleApp/Files/636281092862553384.pdf
+DinkToPfd.TestConsoleApp/bin/Debug/
+DinkToPfd.TestConsoleApp/libwkhtmltox.so
+DinkToPfd.TestConsoleApp/obj/
+DinkToPdf.TestWebServer/libwkhtmltox.so
+DinkToPdf.TestWebServer/libwkhtmltox.dylib
+DinkToPdf.TestThreadSafe/obj/
+DinkToPdf.TestThreadSafe/bin/
+DinkToPdf.TestThreadSafe/Files/
+DinkToPdf.TestThreadSafe/Properties/
+DinkToPdf.TestThreadSafe/libwkhtmltox.so
+DinkToPfd.TestConsoleApp/Files/
diff --git a/.vs/restore.dg b/.vs/restore.dg
@@ -1,2 +1,4 @@
-#:C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf.ThreadSafe\DinkToPdf.ThreadSafe.xproj
-C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf.ThreadSafe\DinkToPdf.ThreadSafe.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj
+#:C:\Users\admin\Documents\DinkToPdf\DinkToPfd.TestConsoleApp\DinkToPdf.TestConsoleApp.xproj
+C:\Users\admin\Documents\DinkToPdf\DinkToPfd.TestConsoleApp\DinkToPdf.TestConsoleApp.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj
+#:C:\Users\admin\Documents\DinkToPdf\DinkToPdf.TestThreadSafe\DinkToPdf.TestThreadSafe.xproj
+C:\Users\admin\Documents\DinkToPdf\DinkToPdf.TestThreadSafe\DinkToPdf.TestThreadSafe.xproj|C:\Users\admin\Documents\DinkToPdf\src\DinkToPdf\DinkToPdf.xproj
diff --git a/src/DinkToPdf/Settings/GlobalSettings.cs b/src/DinkToPdf/Settings/GlobalSettings.cs
@@ -198,5 +198,11 @@ private string MarginBottom
                 return margins.GetMarginValue(margins.Bottom);
             }
         }
+
+        /// <summary>
+        /// Set viewport size. Not supported in wkhtmltopdf API since v0.12.2.4 
+        /// </summary>
+        [WkHtml("viewportSize")]
+        public string ViewportSize { get; set; }
     }
 }
diff --git a/src/DinkToPdf/project.json b/src/DinkToPdf/project.json
@@ -1,8 +1,10 @@
 {
-  "version": "1.0.7-*",
+  "version": "1.0.8-*",
 
   "buildOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "xmlDoc": true,
+    "nowarn": [ "1591" ]
   },
 
   "dependencies": {
@@ -22,6 +24,21 @@
     }
   },
 
+  "packOptions": {
+    "files": {
+      "mappings": {
+        "lib/netstandard1.6/": {
+          "includeFiles": [
+            "bin/Debug/netstandard1.6/DinkToPdf.pdb",
+            "bin/Debug/netstandard1.6/DinkToPdf.xml",
+            "bin/Debug/netstandard1.6/DinkToPdf.dll"
+          ]
+        }
+      }
+    }
+  },
+
+
   "scripts": {
     "postcompile": [ "dotnet pack --no-build --configuration %compile:Configuration%" ]
   }