Merge branch 'develop'

picklesdoc · Feb 2, 2018 · cbc2dc8 · cbc2dc8
2 parents 4f17109 + 9ecbfdb
commit cbc2dc8
Show file tree

Hide file tree

Showing 86 changed files with 1,402 additions and 499 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,11 +28,23 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 
 ### Security
 
+## [2.18.0] - 2018-02-02
+
+### Added
+
+- Dhtml reports and Scenario outline support (includes extension of the JSON output) ([502](https://github.com/picklesdoc/pickles/pull/502)) (by [@DominikBaran](https://github.com/DominikBaran))
+
+### Fixed
+
+- Cache the NUnit feature scan results to improve performance on large solutions ([503](https://github.com/picklesdoc/pickles/pull/503)) (by [@tlecomte](https://github.com/tlecomte))
+- Use lookups in JSONDocumentation Builder to improve performance on large solutions ([504](https://github.com/picklesdoc/pickles/pull/504)) (by [@tlecomte](https://github.com/tlecomte))
+- Cache LanguageServices and GherkinDialectProvider in FeatureParser to improve performance on large solutions ([505](https://github.com/picklesdoc/pickles/pull/505)) (by [@tlecomte](https://github.com/tlecomte))
+
 ## [2.17.0] - 2017-11-06
 
 ### Added
 
-- Added error handling for Markdown parsing exceptions ([497](https://github.com/picklesdoc/pickles/pull/497)) (by [@joebuschmann](https://github.com/joebuschmann)) 
+- Added error handling for Markdown parsing exceptions ([497](https://github.com/picklesdoc/pickles/pull/497)) (by [@joebuschmann](https://github.com/joebuschmann))
 
 ### Changed
 

diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/VERIFICATION.txt b/VERIFICATION.txt
@@ -0,0 +1,8 @@
+
+VERIFICATION
+Verification is intended to assist the Chocolatey moderators and community
+in verifying that this package's contents are trustworthy.
+
+This package is published by the Pickles project itself. The binaries are identical to other
+package types published by the project, for example the nuget.org packages or the releases
+on the GitHub project page.
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.17.0"
+set "picklesVersion=2.18.0"
 
 cls
 

diff --git a/chocolatey.fsx b/chocolatey.fsx
@@ -41,7 +41,9 @@ Target "CreatePackage CMD" (fun _ ->
         cmdDir + "Strike.Jint.dll";
         cmdDir + "Jint.dll";
         cmdDir + "pickles.exe";
-        cmdDir + "NLog.config" ]
+        cmdDir + "NLog.config";
+        "./LICENSE.txt";
+        "./VERIFICATION.txt";]
 
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     NuGet (fun p ->
@@ -86,7 +88,9 @@ Target "CreatePackage GUI" (fun _ ->
         guiDir + "System.Windows.Interactivity.dll";
         guiDir + "picklesui.exe";
         guiDir + "NLog.config";
-        guiDir + "PicklesUI.exe.config"]
+        guiDir + "PicklesUI.exe.config";
+        "./LICENSE.txt";
+        "./VERIFICATION.txt";]
 
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     WriteFile (packagingDir + "picklesui.exe.gui") [("")]

diff --git a/chocolatey/pickles.nuspec b/chocolatey/pickles.nuspec
@@ -58,6 +58,8 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <file src="Strike.Jint.dll" target="tools" />
         <file src="Jint.dll" target="tools" />
         <file src="pickles.exe" target="tools" />
+        <file src="VERIFICATION.txt" target="tools" />
+        <file src="LICENSE.txt" target="tools" />
     </files>
 </package>
 
diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec
@@ -68,6 +68,8 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <file src="picklesui.exe.gui" target="tools" />
         <file src="NLog.config" target="tools" />
         <file src="PicklesUI.exe.config" target="tools" />
+        <file src="VERIFICATION.txt" target="tools" />
+        <file src="LICENSE.txt" target="tools" />
     </files>
 </package>
 
diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
@@ -93,7 +93,14 @@
 
                     <tbody data-bind="foreach: DataRows, visible:IsShown">
                         <tr data-bind="foreach: $data">
-                            <td data-bind="text: $data"></td>
+                            <td>
+                                <div data-bind="if: typeof($data) === 'string'">
+                                    <div data-bind="text: $data"></div>
+                                </div>
+                                <div data-bind="if: typeof($data) === 'object'">
+                                    <div data-bind="template: { name: 'testResults-template', if: $data, data: $data }"></div>
+                                </div>						
+                            </td>
                         </tr>
                     </tbody>