Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nunit to V. 2.6.4 #221

Closed
wants to merge 1 commit into from
Closed

Update nunit to V. 2.6.4 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions TESTGUIDE.md
View file
Open in desktop
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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

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
View file
Open in desktop
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>
13 changes: 7 additions & 6 deletions src/FSharpSource.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,11 @@
<Exec Command=".\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages" WorkingDirectory="$(FSharpSourcesRoot)\.."/>
</Target>

<Target Name="BeforeResolveReferences">
<CreateProperty Value="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
<Output TaskParameter="Value"
PropertyName="AssemblySearchPaths" />
</CreateProperty>
</Target>
<PropertyGroup>
<AssemblySearchPaths>
$(ProjectDir)..\..\..\packages\NUNIT.2.6.4\lib\;
$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\;
$(AssemblySearchPaths);
</AssemblySearchPaths>
</PropertyGroup>
</Project>
6 changes: 1 addition & 5 deletions src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
<WarningLevel>3</WarningLevel>
</PropertyGroup>
<ItemGroup>
<!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
<SpecificVersion>true</SpecificVersion>
<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'"><Private>true</Private></Reference>
<Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
</ItemGroup>
<ItemGroup Condition="!$(TargetFramework.Contains('portable'))">
Expand Down
5 changes: 1 addition & 4 deletions src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
</PropertyGroup>
<ItemGroup>
<!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
<SpecificVersion>true</SpecificVersion>
<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'"><Private>true</Private><SpecificVersion>true</SpecificVersion></Reference>
<Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
Expand Down
2 changes: 1 addition & 1 deletion tests/RunTests.cmd
View file
Open in desktop
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
1 change: 1 addition & 0 deletions tests/fsharp/optimize/stats/stats.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,3 +452,4 @@ Tue 07/14/2009, 9:26:43.59, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-clas
20/01/2010, 19:59:48.26, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 1368, Microsoft.FSharp-methods, 5716, , Microsoft.FSharp-fields, 1933,
21/04/2010, 21:42:44.95, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 1376, Microsoft.FSharp-methods, 5730, , Microsoft.FSharp-fields, 1945,
Sun 11/09/2014, 17:38:09.23, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 2504, Microsoft.FSharp-methods, 8641, , Microsoft.FSharp-fields, 3827,
Sat 02/07/2015, 0:35:46.24, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 2557, Microsoft.FSharp-methods, 8939, , Microsoft.FSharp-fields, 4018,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Interesting. What's the purpose of this stats files?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an old tracking file that gets updated whenever you runs all the tests, isn't related to the PR at all. Should probably be added to .gitignore at some point, since it doesn't serve much purpose any more. As you can see, only 1 update in the past 5 years :)