Skip to content

Commit

Permalink
Merge branch 'release-2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Rombauts committed Jan 27, 2016
2 parents f21c242 + 35266a7 commit 6f35f35
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ This project adheres to [Semantic Versioning](http://semver.org). We consider th

This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).

## [Unreleased]
## [2.3.0] - 2016-01-27

### Added

- Support for SpecFlow v2 ([#276](https://github.com/picklesdoc/pickles/issues/276)) (by [@dirkrombauts](https://github.com/dirkrombauts)).

## [2.2.1] - 2016-01-25

Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set "picklesVersion=2.2.1"
set "picklesVersion=2.3.0"

cls

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ where FeatureNamePropertyExistsWith(queriedFeatureName, among: scenarioPropertie
select scenario;

var scenarioOutlineExecutionIds = from scenario in allScenariosForAFeature
where NameOf(scenario) == queriedScenarioOutlineName
where NameOf(scenario).StartsWith(queriedScenarioOutlineName)
select ScenarioExecutionIdOf(scenario);

TestResult result = scenarioOutlineExecutionIds.Select(this.GetExecutionResult).Merge();
Expand Down
6 changes: 3 additions & 3 deletions src/Pickles/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyVersionAttribute("2.2.1")]
[assembly: AssemblyFileVersionAttribute("2.2.1")]
[assembly: AssemblyVersionAttribute("2.3.0")]
[assembly: AssemblyFileVersionAttribute("2.3.0")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "2.2.1";
internal const string Version = "2.3.0";
}
}

0 comments on commit 6f35f35

Please sign in to comment.