Skip to content

Commit

Permalink
fully upgrade to NUnit 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@gasparnagy
gasparnagy committed May 31, 2012
1 parent bf26d30 commit 6da24cf
Show file tree
Hide file tree
Showing 101 changed files with 299 additions and 11,791 deletions.
1 change: 1 addition & 0 deletions .nuget/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.CommandLine" version="1.7.0" />
<package id="NUnit.Runners" version="2.6.0.12051" />
</packages>
15 changes: 4 additions & 11 deletions Tests/TechTalk.SpecFlow.IntegrationTests/TechTalk.SpecFlow.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Build" />
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
</Reference>
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Should">
<HintPath>..\..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
Expand Down Expand Up @@ -252,7 +244,8 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy $(SolutionDir)Installer\SpecFlowBinPackage\bin\package\*.* $(TargetDir)SpecFlow\ /s /y
xcopy $(SolutionDir)packages\NUnit.2.5.10.11092\*.* $(TargetDir)NUnit\ /s /y
xcopy $(SolutionDir)packages\NUnit.2.6.0.12054\*.* $(TargetDir)NUnit\ /s /y
xcopy $(SolutionDir)packages\NUnit.Runners.2.6.0.12051\*.* $(TargetDir)NUnit.Runners\ /s /y
xcopy $(SolutionDir)packages\xunit.1.8.0.1549\*.* $(TargetDir)xUnit\ /s /y
xcopy $(SolutionDir)packages\xunit.extensions.1.8.0.1549\*.* $(TargetDir)xUnit\ /s /y
xcopy $(SolutionDir)lib\mbunit.3.3.442.0\*.* $(TargetDir)mbUnit3\ /s /y</PostBuildEvent>
Expand Down
2 changes: 1 addition & 1 deletion Tests/TechTalk.SpecFlow.IntegrationTests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.5.10.11092" />
<package id="NUnit" version="2.6.0.12054" />
<package id="Should" version="1.1.12.0" />
<package id="SpecFlow" version="1.7.1" />
<package id="xunit" version="1.8.0.1549" />
Expand Down
2 changes: 1 addition & 1 deletion Tests/TechTalk.SpecFlow.Specs/Drivers/NUnitTestExecutionDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public NUnitTestExecutionDriver(InputProjectDriver inputProjectDriver, TestExecu

public TestRunSummary Execute()
{
var nunitConsolePath = Path.Combine(AssemblyFolderHelper.GetTestAssemblyFolder(), @"NUnit\tools\nunit-console-x86.exe");
var nunitConsolePath = Path.Combine(AssemblyFolderHelper.GetTestAssemblyFolder(), @"NUnit.Runners\tools\nunit-console-x86.exe");

string resultFilePath = Path.Combine(inputProjectDriver.DeploymentFolder, "nunit-result.xml");
string logFilePath = Path.Combine(inputProjectDriver.DeploymentFolder, "nunit-result.txt");
Expand Down
15 changes: 4 additions & 11 deletions Tests/TechTalk.SpecFlow.Specs/TechTalk.SpecFlow.Specs.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,9 @@
<ItemGroup>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
</Reference>
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Should">
<HintPath>..\..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
Expand Down Expand Up @@ -266,7 +258,8 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy $(SolutionDir)Installer\SpecFlowBinPackage\bin\package\*.* $(TargetDir)SpecFlow\ /s /y
xcopy $(SolutionDir)packages\NUnit.2.5.10.11092\*.* $(TargetDir)NUnit\ /s /y
xcopy $(SolutionDir)packages\NUnit.2.6.0.12054\*.* $(TargetDir)NUnit\ /s /y
xcopy $(SolutionDir)packages\NUnit.Runners.2.6.0.12051\*.* $(TargetDir)NUnit.Runners\ /s /y
xcopy "$(SolutionDir)lib\Microsoft F#\*.*" $(TargetDir)FSharp\ /s /y
</PostBuildEvent>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Tests/TechTalk.SpecFlow.Specs/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.5.10.11092" />
<package id="NUnit" version="2.6.0.12054" />
<package id="Should" version="1.1.12.0" />
<package id="SpecFlow" version="1.7.1" />
</packages>
Binary file removed packages/NUnit.2.5.10.11092/NUnit.2.5.10.11092.nupkg
View file
Binary file not shown.
277 changes: 0 additions & 277 deletions packages/NUnit.2.5.10.11092/NUnitFitTests.html
View file

This file was deleted.

Loading

0 comments on commit 6da24cf

Please sign in to comment.