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

Commit6b07a86

Browse files
committed
Merge branch 'fsharp4' into VS2015Support
2 parents7c05659 +517e5b0 commit6b07a86

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

‎appveyor-build.cmd‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,27 @@ REM @if ERRORLEVEL 1 echo Error: library net20 debug build failed && goto :eof
4848
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
4949
@if ERRORLEVEL1echo Error: library portable47 debug build failed&&goto :eof
5050

51-
REM Dropped for faster build
52-
REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
53-
REM @if ERRORLEVEL 1 echo Error: library portable7 debug build failed && goto :eof
51+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
52+
@if ERRORLEVEL1echo Error: library portable7 debug build failed&&goto :eof
5453

5554

5655
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
5756
@if ERRORLEVEL1echo Error: library portable78 debug build failed&&goto :eof
5857

59-
REM Dropped for faster build
60-
REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
61-
REM @if ERRORLEVEL 1 echo Error: library portable259 debug build failed && goto :eof
58+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
59+
@if ERRORLEVEL1echo Error: library portable259 debug build failed&&goto :eof
6260

6361

6462

6563

6664
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
6765
@if ERRORLEVEL1echo Error: library unittests debug build failed&&goto :eof
6866

69-
REM Dropped for faster build
70-
REM %_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
71-
@REM if ERRORLEVEL 1 echo Error: library unittests debug build failed portable47 && goto :eof
67+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
68+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable47&&goto :eof
7269

73-
REM Dropped for faster build
74-
REM %_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
75-
REM @if ERRORLEVEL 1 echo Error: library unittests debug build failed portable7 && goto :eof
70+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
71+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable7&&goto :eof
7672

7773
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
7874
@if ERRORLEVEL1echo Error: library unittests debug build failed portable78&&goto :eof

‎src/fsharp/FSharp.Core/prim-types.fsi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,8 +2304,7 @@ namespace Microsoft.FSharp.Core
23042304
val using:resource:('T:>System.IDisposable)->action:('T-> 'U)-> 'U
23052305

23062306

2307-
///<summary>Generate a System.Type runtime representation of a static type.
2308-
///The static type is still maintained on the value returned.</summary>
2307+
///<summary>Generate a System.Type runtime representation of a static type.</summary>
23092308
[<RequiresExplicitTypeArguments>]
23102309
[<CompiledName("TypeOf")>]
23112310
val inline typeof<'T>:System.Type

0 commit comments

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