Merge 2.10.0

picklesdoc · Oct 22, 2016 · 7723bcf · 7723bcf
1 parent d43fe48
commit 7723bcf
Show file tree

Hide file tree

Showing 339 changed files with 5,404 additions and 1,909 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,4 @@ node_modules/
 
 #include output docs
 !docs/Output/
+src/Pickles/.vs/config/applicationhost.config
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,13 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.10.0] - 2016-10-22
+
+### Changed
+
+- Enable Pickles to with cultures in the language setting ([308](https://github.com/picklesdoc/pickles/pull/308)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+- Improve Markdown Parsing to Reduce Unintended Block Quotes ([302](https://github.com/picklesdoc/pickles/pull/302)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+
 ## [2.9.0] - 2016-10-07
 
 ### Changed

diff --git a/DeployArtifacts.cmd b/DeployArtifacts.cmd
@@ -1,4 +1,4 @@
 @ECHO OFF
-call DeployOutput.cmd %1
+REM call DeployOutput.cmd %1
 call DeployToChocolatey.cmd %1
 call DeployToNuget.cmd %1
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.9.0"
+set "picklesVersion=2.10.0"
 
 cls
 

diff --git a/build.fsx b/build.fsx
@@ -69,6 +69,36 @@ Target "BuildTest.TestFrameworks" (fun _ ->
       |> Log "AppBuild-Output: "
 )
 
+Target "BuildTest.DocumentationBuilders.Dhtml" (fun _ ->
+    !! "src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
+Target "BuildTest.DocumentationBuilders.Excel" (fun _ ->
+    !! "src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/Pickles.DocumentationBuilders.Excel.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
+Target "BuildTest.DocumentationBuilders.Html" (fun _ ->
+    !! "src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/Pickles.DocumentationBuilders.Html.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
+Target "BuildTest.DocumentationBuilders.Json" (fun _ ->
+    !! "src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/Pickles.DocumentationBuilders.Json.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
+Target "BuildTest.DocumentationBuilders.Word" (fun _ ->
+    !! "src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/Pickles.DocumentationBuilders.Word.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
 let createZip (packageType : string) =
     !! (buildDir + "/" + packageType + "/*.*") -- "*.zip"
         |> Zip (buildDir + packageType) (deployDir + "Pickles-" + packageType + "-" + version + ".zip")
@@ -94,6 +124,11 @@ Target "Default" (fun _ ->
   ==> "BuildGui"
   ==> "BuildTest"
   ==> "BuildTest.TestFrameworks"
+  ==> "BuildTest.DocumentationBuilders.Dhtml"
+  ==> "BuildTest.DocumentationBuilders.Excel"
+  ==> "BuildTest.DocumentationBuilders.Html"
+  ==> "BuildTest.DocumentationBuilders.Json"
+  ==> "BuildTest.DocumentationBuilders.Word"
   ==> "Zip"
   ==> "Default"
 

diff --git a/chocolatey.fsx b/chocolatey.fsx
@@ -30,6 +30,11 @@ Target "CreatePackage CMD" (fun _ ->
         cmdDir + "PicklesDoc.Pickles.Library.dll";
         cmdDir + "PicklesDoc.Pickles.ObjectModel.dll";
         cmdDir + "PicklesDoc.Pickles.TestFrameworks.dll";
+        cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Word.dll";
+        cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Excel.dll";
+        cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Json.dll";
+        cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Html.dll";
+        cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Dhtml.dll";
         cmdDir + "System.IO.Abstractions.dll";
         cmdDir + "FeatureSwitcher.dll";
         cmdDir + "Strike.Jint.dll";
@@ -68,6 +73,11 @@ Target "CreatePackage GUI" (fun _ ->
         guiDir + "PicklesDoc.Pickles.Library.dll";
         guiDir + "PicklesDoc.Pickles.ObjectModel.dll";
         guiDir + "PicklesDoc.Pickles.TestFrameworks.dll";
+        guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Word.dll";
+        guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Excel.dll";
+        guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Json.dll";
+        guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Html.dll";
+        guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Dhtml.dll";
         guiDir + "System.IO.Abstractions.dll";
         guiDir + "FeatureSwitcher.dll";
         guiDir + "Strike.Jint.dll";

diff --git a/chocolatey/pickles.nuspec b/chocolatey/pickles.nuspec
@@ -47,6 +47,11 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
         <file src="PicklesDoc.Pickles.ObjectModel.dll" target="tools" />
         <file src="PicklesDoc.Pickles.TestFrameworks.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Word.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Excel.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Json.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Html.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Dhtml.dll" target="tools" />
         <file src="System.IO.Abstractions.dll" target="tools" />
         <file src="FeatureSwitcher.dll" target="tools" />
         <file src="Strike.Jint.dll" target="tools" />

diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec
@@ -54,6 +54,11 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
         <file src="PicklesDoc.Pickles.ObjectModel.dll" target="tools" />
         <file src="PicklesDoc.Pickles.TestFrameworks.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Word.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Excel.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Json.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Html.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.DocumentationBuilders.Dhtml.dll" target="tools" />
         <file src="System.IO.Abstractions.dll" target="tools" />
         <file src="FeatureSwitcher.dll" target="tools" />
         <file src="Strike.Jint.dll" target="tools" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,3 +97,4 @@ node_modules/

		#include output docs
		!docs/Output/
		src/Pickles/.vs/config/applicationhost.config