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

Commit19d6f8f

Browse files
committed
merge upstream
1 parent73db1c0 commit19d6f8f

File tree

7 files changed

+14
-20
lines changed

7 files changed

+14
-20
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -746,10 +746,11 @@
746746
<ExecCommand=".\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages"WorkingDirectory="$(FSharpSourcesRoot)\.."/>
747747
</Target>
748748

749-
<TargetName="BeforeResolveReferences">
750-
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
751-
<OutputTaskParameter="Value"
752-
PropertyName="AssemblySearchPaths" />
753-
</CreateProperty>
754-
</Target>
749+
<PropertyGroup>
750+
<AssemblySearchPaths>
751+
$(ProjectDir)..\..\..\packages\NUNIT.2.6.4\lib\;
752+
$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\;
753+
$(AssemblySearchPaths);
754+
</AssemblySearchPaths>
755+
</PropertyGroup>
755756
</Project>

‎src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@
4343
<WarningLevel>3</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47-->
47-
<ReferenceInclude="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
48-
<SpecificVersion>true</SpecificVersion>
49-
<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
50-
</Reference>
46+
<ReferenceInclude="nunit.framework"Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'"><Private>true</Private></Reference>
5147
<ReferenceInclude="NUnitFramework"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
5248
</ItemGroup>
5349
<ItemGroupCondition="!$(TargetFramework.Contains('portable'))">

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@
4848
</PropertyGroup>
4949
<ItemGroup>
5050
<!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47-->
51-
<ReferenceInclude="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
52-
<SpecificVersion>true</SpecificVersion>
53-
<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
54-
</Reference>
51+
<ReferenceInclude="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>
5552
<ReferenceInclude="NUnitFramework"Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
5653
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
5754
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

‎tests/RunTests.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ goto :USAGE
1010

1111
:flavor_ok
1212

13-
setnunitpath=%~dp0%..\packages\NUnit.Runners.2.6.3\tools\
13+
setnunitpath=%~dp0%..\packages\NUnit.Runners.2.6.4\tools\
1414
ifnotexist"%nunitpath%" (
1515
pushd%~dp0..
1616
.\.nuget\nuget.exe restore packages.config -PackagesDirectory packages

‎tests/fsharp/optimize/stats/stats.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,3 +452,4 @@ Tue 07/14/2009, 9:26:43.59, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-clas
452452
20/01/2010, 19:59:48.26, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 1368, Microsoft.FSharp-methods, 5716, , Microsoft.FSharp-fields, 1933,
453453
21/04/2010, 21:42:44.95, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 1376, Microsoft.FSharp-methods, 5730, , Microsoft.FSharp-fields, 1945,
454454
Sun 11/09/2014, 17:38:09.23, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 2504, Microsoft.FSharp-methods, 8641, , Microsoft.FSharp-fields, 3827,
455+
Sat 02/07/2015, 0:35:46.24, Microsoft.FSharp-TypeFunc, 0, Microsoft.FSharp-classes, 2557, Microsoft.FSharp-methods, 8939, , Microsoft.FSharp-fields, 4018,

0 commit comments

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