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

Commitf32f672

Browse files
committed
Merge branch 'fsharp4' into VS2015Support
2 parentsdd37a1a +1f7f85a commitf32f672

File tree

19 files changed

+541
-167
lines changed

19 files changed

+541
-167
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/pr)](http://issuestats.com/github/microsoft/visualfsharp)
22
[![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/issue)](http://issuestats.com/github/microsoft/visualfsharp)
3+
[![Build status](https://ci.appveyor.com/api/projects/status/sf3s485t5utl31b7/branch/fsharp4?svg=true)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/fsharp4)
34

45
#Visual F# Tools
56

‎appveyor-build.cmd‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see h
1212
set_gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
1313
ifnotexist%_gacutilexe%echo Error: Could not find gacutil.exe.&&goto :eof
1414

15+
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
16+
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :eof
17+
1518
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
1619
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
1720

@@ -22,7 +25,7 @@ if not exist %_gacutilexe% echo Error: Could not find gacutil.exe. && goto :eof
2225
%_msbuildexe% src\fsharp-proto-build.proj
2326
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
2427

25-
ngen install lib\proto\fsc-proto.exe
28+
%_ngenexe% install lib\proto\fsc-proto.exe
2629

2730
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true
2831
@if ERRORLEVEL1echo Error: library debug build failed&&goto :eof
@@ -49,10 +52,12 @@ REM Dropped for faster build
4952
REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
5053
REM @if ERRORLEVEL 1 echo Error: library portable259 debug build failed && goto :eof
5154

55+
56+
57+
5258
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
5359
@if ERRORLEVEL1echo Error: library unittests debug build failed&&goto :eof
5460

55-
5661
REM Dropped for faster build
5762
REM %_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
5863
@REM if ERRORLEVEL 1 echo Error: library unittests debug build failed portable47 && goto :eof
@@ -61,9 +66,8 @@ REM Dropped for faster build
6166
REM %_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
6267
REM @if ERRORLEVEL 1 echo Error: library unittests debug build failed portable7 && goto :eof
6368

64-
REM Dropped for faster build
65-
REM %_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
66-
REM @if ERRORLEVEL 1 echo Error: library unittests debug build failed portable78 && goto :eof
69+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
70+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable78&&goto :eof
6771

6872

6973
@echoon

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@
7878
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\HashIdentityModule.fs" />
7979
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\ListModule.fs" />
8080
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\ListModule2.fs" />
81+
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteListFunctions.fs" />
8182
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\ListType.fs" />
8283
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\MapModule.fs" />
8384
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\MapType.fs" />
8485
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\SetModule.fs" />
8586
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\SetType.fs" />
8687
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\SeqModule.fs" />
8788
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\SeqModule2.fs" />
89+
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteSeqFunctions.fs" />
8890
<CompileInclude="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
8991
<CompileInclude="FSharp.Core\PrimTypes.fs" />
9092
<CompileInclude="FSharp.Core\DiscrimantedUnionType.fs" />

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Various tests for the:
44
// Microsoft.FSharp.Collections.List module
55

6-
#nowarn"44"// This construct is deprecated. please use List.item
76
namespaceFSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
87

98
openSystem
@@ -318,21 +317,6 @@ type ListModule02() =
318317
CheckThrowsArgumentException(fun()-> List.minBy funcEpt List.empty)
319318

320319
()
321-
322-
[<Test>]
323-
memberthis.Nth()=
324-
// integer List
325-
letresultInt= List.nth[3;7;9;4;8;1;1;2]3
326-
Assert.AreEqual(4, resultInt)
327-
328-
// string List
329-
letresultStr= List.nth["a";"b";"c";"d"]3
330-
Assert.AreEqual("d", resultStr)
331-
332-
// empty List
333-
CheckThrowsArgumentException(fun()-> List.nth List.empty1)
334-
335-
()
336320

337321
[<Test>]
338322
memberthis.Item()=
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
#nowarn"44"// This construct is deprecated. please use List.item
4+
namespaceFSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
5+
6+
openSystem
7+
openFSharp.Core.Unittests.LibraryTestFx
8+
openNUnit.Framework
9+
10+
[<TestFixture>]
11+
typeObsoleteListFunctions()=
12+
[<Test>]
13+
memberthis.Nth()=
14+
// integer List
15+
letresultInt= List.nth[3;7;9;4;8;1;1;2]3
16+
Assert.AreEqual(4, resultInt)
17+
18+
// string List
19+
letresultStr= List.nth["a";"b";"c";"d"]3
20+
Assert.AreEqual("d", resultStr)
21+
22+
// empty List
23+
CheckThrowsArgumentException(fun()-> List.nth List.empty1)
24+
25+
()
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
#nowarn"44"// This construct is deprecated. please use Seq.item
4+
namespaceFSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
5+
6+
openSystem
7+
openNUnit.Framework
8+
9+
openFSharp.Core.Unittests.LibraryTestFx
10+
11+
[<TestFixture>]
12+
typeObsoleteSeqFunctions()=
13+
14+
[<Test>]
15+
memberthis.Nth()=
16+
17+
// Negative index
18+
for i=-1downto-10do
19+
CheckThrowsArgumentException(fun()-> Seq.nth i{10..20}|> ignore)
20+
21+
// Out of range
22+
for i=11to20do
23+
CheckThrowsArgumentException(fun()-> Seq.nth i{10..20}|> ignore)
24+
25+
// integer Seq
26+
letresultInt= Seq.nth3{10..20}
27+
Assert.AreEqual(13, resultInt)
28+
29+
// string Seq
30+
letresultStr= Seq.nth3(seq["Lists";"Are";"nthString";"List"])
31+
Assert.AreEqual("List",resultStr)
32+
33+
// empty Seq
34+
CheckThrowsArgumentException(fun()-> Seq.nth0(Seq.empty: seq<decimal>)|> ignore)
35+
36+
// null Seq
37+
letnullSeq:seq<'a>=null
38+
CheckThrowsArgumentNullException(fun()->Seq.nth3 nullSeq|> ignore)
39+
40+
()

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

3-
#nowarn"44"// This construct is deprecated. please use Seq.item
43
namespaceFSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
54

65
openSystem
@@ -896,35 +895,6 @@ type SeqModule2() =
896895

897896
()
898897

899-
900-
[<Test>]
901-
memberthis.Nth()=
902-
903-
// Negative index
904-
for i=-1downto-10do
905-
CheckThrowsArgumentException(fun()-> Seq.nth i{10..20}|> ignore)
906-
907-
// Out of range
908-
for i=11to20do
909-
CheckThrowsArgumentException(fun()-> Seq.nth i{10..20}|> ignore)
910-
911-
// integer Seq
912-
letresultInt= Seq.nth3{10..20}
913-
Assert.AreEqual(13, resultInt)
914-
915-
// string Seq
916-
letresultStr= Seq.nth3(seq["Lists";"Are";"nthString";"List"])
917-
Assert.AreEqual("List",resultStr)
918-
919-
// empty Seq
920-
CheckThrowsArgumentException(fun()-> Seq.nth0(Seq.empty: seq<decimal>)|> ignore)
921-
922-
// null Seq
923-
letnullSeq:seq<'a>=null
924-
CheckThrowsArgumentNullException(fun()->Seq.nth3 nullSeq|> ignore)
925-
926-
()
927-
928898
[<Test>]
929899
memberthis.Item()=
930900
// integer Seq

0 commit comments

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