Skip to content

Commit

Permalink
Update nunit to V. 2.6.4
Browse files Browse the repository at this point in the history
fixes #3
closes #221

commit d0a610d5a51b40a6bb07be326b8cc40c0410c864
Author: latkin <latkin@microsoft.com>
Date:   Tue Feb 10 12:41:15 2015 -0800

    Revert stats file

commit 41176f7ff0a09228348b23d7fcb9d5d119bb33cb
Author: latkin <latkin@microsoft.com>
Date:   Tue Feb 10 12:40:21 2015 -0800

    Small modifications to fit into recent updates

commit 1da7c7d002d124b7e6961e2c1319e20b097166eb
Merge: 95bfc9e 19d6f8f
Author: latkin <latkin@microsoft.com>
Date:   Tue Feb 10 12:36:33 2015 -0800

    Merge branch 'updatenunit' of https://github.com/KevinRansom/visualfsharp into KevinRansom-updatenunit

    Conflicts:
    	src/FSharpSource.targets
    	tests/RunTests.cmd

commit 19d6f8f
Author: KevinRansom <kevinr@microsoft.com>
Date:   Sat Feb 7 09:43:22 2015 -0800

    merge upstream
  • Loading branch information
KevinRansom authored and latkin committed Feb 10, 2015
1 parent 95bfc9e commit 0b7bee8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions TESTGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ The test cases for this suite reside next to the Visual F# Tools code, at `vsint
In order to run all of the tests, you will need to install

* [Perl](http://www.perl.org/get.html) (ActiveState Perl 5.16.3 is known to work fine)
* [NUnit](http://nunit.org/?p=download) (2.6.3 is known to work fine)

Perl and NUnit must be included in the `%PATH%` for the below steps to work. It is also recommended that you run tests from an elevated command prompt, as there are a couple of test cases which modify the GAC, and this requires administrative privileges.
Perl must be included in the `%PATH%` for the below steps to work. It is also recommended that you run tests from an elevated command prompt, as there are a couple of test cases which modify the GAC, and this requires administrative privileges.

Before running tests, make sure you have successfully built all required projects as specified in the 'Prepare For Tests' section of the [DEVGUIDE](DEVGUIDE.md).

Expand Down
4 changes: 2 additions & 2 deletions packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="NUnit.Runners" version="2.6.3" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="NUnit.Runners" version="2.6.4" />
</packages>
4 changes: 2 additions & 2 deletions src/FSharpSource.targets
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
</PropertyGroup>

<PropertyGroup>
<NUnitVersion>2.6.3</NUnitVersion>
<NUnitFullVersion>2.6.3.13283</NUnitFullVersion>
<NUnitVersion>2.6.4</NUnitVersion>
<NUnitFullVersion>2.6.4.14350</NUnitFullVersion>
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\</NUnitLibDir>
<NunitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.Runners.$(NUnitVersion)\tools\lib\</NunitToolsLibDir>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/RunTests.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ goto :USAGE

:flavor_ok

set NUNITPATH=%~dp0%..\packages\NUnit.Runners.2.6.3\tools\
set NUNITPATH=%~dp0%..\packages\NUnit.Runners.2.6.4\tools\
if not exist "%NUNITPATH%" (
pushd %~dp0..
.\.nuget\nuget.exe restore packages.config -PackagesDirectory packages
Expand Down

0 comments on commit 0b7bee8

Please sign in to comment.