Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitefc744c

Browse files
KevinRansomlatkin
authored andcommitted
Update nunit to V. 2.6.4
fixesdotnet#3closesdotnet#221commit d0a610d5a51b40a6bb07be326b8cc40c0410c864Author: latkin <latkin@microsoft.com>Date: Tue Feb 10 12:41:15 2015 -0800 Revert stats filecommit 41176f7ff0a09228348b23d7fcb9d5d119bb33cbAuthor: latkin <latkin@microsoft.com>Date: Tue Feb 10 12:40:21 2015 -0800 Small modifications to fit into recent updatescommit 1da7c7d002d124b7e6961e2c1319e20b097166ebMerge:95bfc9e19d6f8fAuthor: latkin <latkin@microsoft.com>Date: Tue Feb 10 12:36:33 2015 -0800 Merge branch 'updatenunit' ofhttps://github.com/KevinRansom/visualfsharp into KevinRansom-updatenunit Conflicts: src/FSharpSource.targets tests/RunTests.cmdcommit19d6f8fAuthor: KevinRansom <kevinr@microsoft.com>Date: Sat Feb 7 09:43:22 2015 -0800 merge upstreamConflicts:src/FSharpSource.targetstests/RunTests.cmd
1 parentef07f6e commitefc744c

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

‎TESTGUIDE.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ The test cases for this suite reside next to the Visual F# Tools code, at `vsint
2222
In order to run all of the tests, you will need to install
2323

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

27-
Perland NUnitmust 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.
26+
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.
2827

2928
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).
3029

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="NUnit"version="2.6.3"targetFramework="net40" />
4-
<packageid="NUnit.Runners"version="2.6.3" />
3+
<packageid="NUnit"version="2.6.4"targetFramework="net40" />
4+
<packageid="NUnit.Runners"version="2.6.4" />
55
</packages>

‎src/FSharpSource.targets‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@
9595

9696
<PropertyGroup>
9797
<DefineConstants>$(DefineConstants);OPEN_BUILD</DefineConstants>
98+
</PropertyGroup>
99+
100+
<PropertyGroup>
101+
<NUnitVersion>2.6.4</NUnitVersion>
102+
<NUnitFullVersion>2.6.4.14350</NUnitFullVersion>
103+
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\</NUnitLibDir>
104+
<NunitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.Runners.$(NUnitVersion)\tools\lib\</NunitToolsLibDir>
98105
</PropertyGroup>
99106

100107
<!-- v2.0-specific flags-->

‎tests/RunTests.cmd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ goto :USAGE
88

99
:flavor_ok
1010

11+
setNUNITPATH=%~dp0%..\packages\NUnit.Runners.2.6.4\tools\
12+
ifnotexist"%NUNITPATH%" (
13+
pushd%~dp0..
14+
.\.nuget\nuget.exe restore packages.config -PackagesDirectory packages
15+
popd
16+
)
17+
1118
rem "ttags" indicates what test areas will be run, based on the tags in the test.lst files
1219
setTTAGS_ARG=
1320
set_tmp=%3

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp