Skip to content

Commit

Permalink
Merge branch 'release/1.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
jole78 committed Sep 24, 2013
2 parents 628b856 + f7309c2 commit bde012c
Show file tree
Hide file tree
Showing 82 changed files with 3,012 additions and 705 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ build/
[Bb]in/
[Oo]bj/

!lib/Pester*/**/*

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
Expand Down Expand Up @@ -95,7 +97,7 @@ publish/

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
packages/

# Windows Azure Build Output
csx
Expand Down
Binary file removed examples/BowlingKata/.nuget/NuGet.exe
Binary file not shown.
133 changes: 0 additions & 133 deletions examples/BowlingKata/.nuget/NuGet.targets

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="Execute-Tests.ps1" />
<None Include="packages.config" />
<None Include="ScoreCalculation.feature">
<Generator>SpecFlowSingleFileGenerator</Generator>
Expand All @@ -81,7 +82,6 @@
<None Include="TeamCity.SpecFlow.Reporting.psm1" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Set-Location $PSScriptRoot

Import-Module .\TeamCity.SpecFlow.Reporting.psm1

Set-Properties @{
PathToPackagesFolder = '..\..\'
}

Invoke-TeamCitySpecFlowReport
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="NUnit" version="2.6.2" targetFramework="net40" />
<package id="SpecFlow" version="1.9.0" targetFramework="net40" />
<package id="SpecFlow.NUnit" version="1.1.1" targetFramework="net40" />
<package id="TeamCity.SpecFlow.Reporting" version="1.1.2.1" targetFramework="net40" />
<package id="TeamCity.SpecFlow.Reporting" version="1.3.3" targetFramework="net40" />
</packages>
2 changes: 0 additions & 2 deletions examples/BowlingKata/BowlingKata.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B0A86AB8-4CFA-40B8-A870-549E53045784}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authors>Charlie Poole</authors>
<owners>Charlie Poole</owners>
<licenseUrl>http://nunit.org/nuget/license.html</licenseUrl>
<projectUrl>http://nunit.org/</projectUrl>
<projectUrl>http://nunit.org</projectUrl>
<iconUrl>http://nunit.org/nuget/nunit_32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible. A number of runners, both from the NUnit project and by third parties, are able to execute NUnit tests.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<authors>TechTalk</authors>
<owners>TechTalk</owners>
<licenseUrl>http://specflow.org/about/license.aspx</licenseUrl>
<projectUrl>http://www.specflow.org/</projectUrl>
<projectUrl>http://www.specflow.org</projectUrl>
<iconUrl>http://techtalk.github.com/SpecFlow/specflow.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>SpecFlow aims at bridging the communication gap between domain experts and developers by binding business readable behavior specifications to the underlying implementation. Our mission is to provide a pragmatic and frictionless approach to Acceptance Test Driven Development and Behavior Driven Development for .NET projects today.</description>
<summary>SpecFlow aims at bridging the communication gap between domain experts and developers by binding business readable behavior specifications to the underlying implementation. Our mission is to provide a pragmatic and frictionless approach to Acceptance Test Driven Development and Behavior Driven Development for .NET projects today.</summary>
<language>en-US</language>
<tags>specflow bdd gherkin cucumber</tags>
</metadata>
</package>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
<authors>TechTalk</authors>
<owners>TechTalk</owners>
<licenseUrl>http://specflow.org/about/license.aspx</licenseUrl>
<projectUrl>http://www.specflow.org/</projectUrl>
<projectUrl>http://www.specflow.org</projectUrl>
<iconUrl>http://techtalk.github.com/SpecFlow/specflow.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Combined package to setup SpecFlow with NUnit v2.6+ easily. For running tests with NUnit runners, use SpecFlow.NUnit.Runners package!</description>
<summary>Combined package to setup SpecFlow with NUnit v2.6+ easily. For running tests with NUnit runners, use SpecFlow.NUnit.Runners package!</summary>
<releaseNotes />
<copyright />
<language />
<language>en-US</language>
<tags>specflow nunit</tags>
<dependencies>
<dependency id="SpecFlow" />
Expand Down
Binary file not shown.

This file was deleted.

Loading

0 comments on commit bde012c

Please sign in to comment.