Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push 2.12.0 to master #418

Merged
merged 4 commits into from
Jan 26, 2017
Merged

Push 2.12.0 to master #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3798ae6
Merge branch 'master' into develop
Dec 21, 2016
ddd1f08
Fixes hiding topnav when printing. (#411)
bliles Jan 17, 2017
5769fa5
Adding Cucumber JSON Documentation Builder (#413)
dgrekov Jan 25, 2017
2336130
Release 2.12.0 (#416)
dirkrombauts Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ 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.12.0] - 2017-01-26

### Added

- Adding Cucumber JSON Documentation Builder ([413](https://github.com/picklesdoc/pickles/pull/413)) (by [armsteadj1](https://github.com/armsteadj1), [jgrossrieder](https://github.com/jgrossrieder) and [dgrekov](https://github.com/dgrekov))

### Fixed

- Fixes hiding topnav when printing ([411](https://github.com/picklesdoc/pickles/pull/411)) (by [bliles](https://github.com/bliles))

## [2.11.1] - 2016-12-16

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set "picklesVersion=2.11.1"
set "picklesVersion=2.12.0"

cls

Expand Down
7 changes: 7 additions & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ Target "BuildTest.TestFrameworks" (fun _ ->
|> Log "AppBuild-Output: "
)

Target "BuildTest.DocumentationBuilders.Cucumber" (fun _ ->
!! "src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj"
|> MSBuildRelease testDir "Build"
|> Log "AppBuild-Output: "
)

Target "BuildTest.DocumentationBuilders.Dhtml" (fun _ ->
!! "src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj"
|> MSBuildRelease testDir "Build"
Expand Down Expand Up @@ -124,6 +130,7 @@ Target "Default" (fun _ ->
==> "BuildGui"
==> "BuildTest"
==> "BuildTest.TestFrameworks"
==> "BuildTest.DocumentationBuilders.Cucumber"
==> "BuildTest.DocumentationBuilders.Dhtml"
==> "BuildTest.DocumentationBuilders.Excel"
==> "BuildTest.DocumentationBuilders.Html"
Expand Down
2 changes: 2 additions & 0 deletions chocolatey.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Target "CreatePackage CMD" (fun _ ->
cmdDir + "PicklesDoc.Pickles.Library.dll";
cmdDir + "PicklesDoc.Pickles.ObjectModel.dll";
cmdDir + "PicklesDoc.Pickles.TestFrameworks.dll";
cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Cucumber.dll";
cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Word.dll";
cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Excel.dll";
cmdDir + "PicklesDoc.Pickles.DocumentationBuilders.Json.dll";
Expand Down Expand Up @@ -73,6 +74,7 @@ Target "CreatePackage GUI" (fun _ ->
guiDir + "PicklesDoc.Pickles.Library.dll";
guiDir + "PicklesDoc.Pickles.ObjectModel.dll";
guiDir + "PicklesDoc.Pickles.TestFrameworks.dll";
guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Cucumber.dll";
guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Word.dll";
guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Excel.dll";
guiDir + "PicklesDoc.Pickles.DocumentationBuilders.Json.dll";
Expand Down
1 change: 1 addition & 0 deletions chocolatey/pickles.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ 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.Cucumber.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" />
Expand Down
1 change: 1 addition & 0 deletions chocolatey/picklesui.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ 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.Cucumber.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" />
Expand Down
Loading