diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dde8e23f..020ee33d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,24 @@ 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.16.0] - 2017-06-06 + +### Added + +- Add handling to guess some encodings ([457](https://github.com/picklesdoc/pickles/pull/457)) (by [@s991116](https://github.com/s991116) and [@dirkrombauts](https://github.com/dirkrombauts)) + +### Fixed + +- Show inconclusive results in DHTML output ([463](https://github.com/picklesdoc/pickles/pull/463)) (by [@dirkrombauts](https://github.com/dirkrombauts)) + +### Changed + +- Under the hood: Move NDesk.Options dependency to command line runner ([459](https://github.com/picklesdoc/pickles/pull/459)) (by [@dirkrombauts](https://github.com/dirkrombauts)) +- Under the hood: update several third party packages ([462](https://github.com/picklesdoc/pickles/pull/462)) (by [@dirkrombauts](https://github.com/dirkrombauts)) + ## [2.15.0] - 2017-03-09 -## Added +### Added - Continue loading feature files after parsing errors ([445](https://github.com/picklesdoc/pickles/pull/445)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill)) diff --git a/DeployToChocolatey.cmd b/DeployToChocolatey.cmd index da005298a..8109e932a 100644 --- a/DeployToChocolatey.cmd +++ b/DeployToChocolatey.cmd @@ -1,7 +1,7 @@ @ECHO OFF REM this script supposes you set the chocolatey API key by running this command: -REM choco apikey -s"https://chocolatey.org/" -k="" +REM choco apikey -s"https://push.chocolatey.org/" -k="" REM Mind the trailing slash! .\packages\chocolatey\tools\chocolateyInstall\choco push .\deploy\chocolatey\pickles.%1.nupkg diff --git a/build.bat b/build.bat index 905f46acc..941c34c87 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ @echo off -set "picklesVersion=2.15.0" +set "picklesVersion=2.16.0" cls diff --git a/build.fsx b/build.fsx index 7372cdfc4..1910e1dac 100644 --- a/build.fsx +++ b/build.fsx @@ -105,6 +105,12 @@ Target "BuildTest.DocumentationBuilders.Word" (fun _ -> |> Log "AppBuild-Output: " ) +Target "BuildTest.Runners.CommandLine" (fun _ -> + !! "src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj" + |> MSBuildRelease testDir "Build" + |> Log "AppBuild-Output: " +) + let createZip (packageType : string) = !! (buildDir + "/" + packageType + "/*.*") -- "*.zip" |> Zip (buildDir + packageType) (deployDir + "Pickles-" + packageType + "-" + version + ".zip") @@ -136,6 +142,7 @@ Target "Default" (fun _ -> ==> "BuildTest.DocumentationBuilders.Html" ==> "BuildTest.DocumentationBuilders.Json" ==> "BuildTest.DocumentationBuilders.Word" + ==> "BuildTest.Runners.CommandLine" ==> "Zip" ==> "Default" diff --git a/chocolatey.fsx b/chocolatey.fsx index 44ddcfc60..a5be9923d 100644 --- a/chocolatey.fsx +++ b/chocolatey.fsx @@ -66,7 +66,6 @@ Target "CreatePackage GUI" (fun _ -> guiDir + "MahApps.Metro.dll"; guiDir + "MarkdownDeep.dll"; guiDir + "Microsoft.Practices.ServiceLocation.dll"; - guiDir + "NDesk.Options.dll"; guiDir + "Newtonsoft.Json.dll"; guiDir + "NLog.dll"; guiDir + "NlogViewer.dll"; diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec index 0e20f38b0..00e75d262 100644 --- a/chocolatey/picklesui.nuspec +++ b/chocolatey/picklesui.nuspec @@ -46,7 +46,6 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders - diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html index be4fc7695..52d0d283b 100644 --- a/docs/Output/Dhtml/Index.html +++ b/docs/Output/Dhtml/Index.html @@ -49,9 +49,9 @@
- +