Update nunit to V. 2.6.4

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: 95bfc9e3 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 19d6f8f39b3808874c5fbb95af1a9783ff4fdbab
Author: KevinRansom <kevinr@microsoft.com>
Date:   Sat Feb 7 09:43:22 2015 -0800

    merge upstream

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

TESTGUIDE.md

@@ -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).
 

packages.config

 <?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>
\ No newline at end of file

src/FSharpSource.targets

@@ -95,6 +95,13 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);OPEN_BUILD</DefineConstants>
+  </PropertyGroup>  
+  
+  <PropertyGroup>
+    <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>
 
   <!-- v2.0-specific flags -->

tests/RunTests.cmd

@@ -8,6 +8,13 @@ goto :USAGE
 
 :flavor_ok
 
+set NUNITPATH=%~dp0%..\packages\NUnit.Runners.2.6.4\tools\
+if not exist "%NUNITPATH%" (
+    pushd %~dp0..
+    .\.nuget\nuget.exe restore packages.config -PackagesDirectory packages
+    popd
+)    
+
 rem "ttags" indicates what test areas will be run, based on the tags in the test.lst files
 set TTAGS_ARG=
 set _tmp=%3