Skip to content

Commit 64b8575

Browse files
committed
fix build
1 parent 92b9bf0 commit 64b8575

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

tests/service/ExprTests.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ let ``Test Declarations project1`` () =
448448
"let tyfuncEx1 = Operators.TypeOf<'T> () @ (26,20--26,26)";
449449
"let testILCall1 = new Object() @ (27,18--27,27)";
450450
"let testILCall2 = Console.WriteLine (\"176\") @ (28,18--28,49)";
451-
"let recFuncIgnoresFirstArg(g) (v) = v @ (32,33--32,34)";
452451
"let recValNeverUsedAtRuntime = recValNeverUsedAtRuntime@31.Force<Microsoft.FSharp.Core.int>(()) @ (31,8--31,32)";
452+
"let recFuncIgnoresFirstArg(g) (v) = v @ (32,33--32,34)";
453453
"let testFun4(unitVar0) = let rec ... in recValNeverUsedAtRuntime @ (36,4--39,28)";
454454
"type ClassWithImplicitConstructor";
455455
"member .ctor(compiledAsArg) = (Object..ctor (); (this.compiledAsArg <- compiledAsArg; (this.compiledAsField <- 1; let compiledAsLocal: Microsoft.FSharp.Core.int = 1 in let compiledAsLocal2: Microsoft.FSharp.Core.int = Operators.op_Addition<Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (compiledAsLocal,compiledAsLocal) in ()))) @ (41,5--41,33)";
@@ -520,7 +520,7 @@ let ``Test Declarations project1`` () =
520520
"let badLoop = badLoop@240.Force<Microsoft.FSharp.Core.int -> Microsoft.FSharp.Core.int>(()) @ (240,8--240,15)";
521521
"type LetLambda";
522522
"let f = ((); fun a -> fun b -> Operators.op_Addition<Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (a,b)) @ (246,8--247,24)";
523-
"let letLambdaRes = Operators.op_PipeRight<(Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int) Microsoft.FSharp.Collections.list,Microsoft.FSharp.Core.int Microsoft.FSharp.Collections.list> (Cons((1,2),Empty()),let mapping: Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int -> Microsoft.FSharp.Core.int = fun tupledArg -> let a: Microsoft.FSharp.Core.int = tupledArg.Item0 in let b: Microsoft.FSharp.Core.int = tupledArg.Item1 in (LetLambda.f () a) b in fun list -> ListModule.Map<Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (mapping,list)) @ (249,19--249,71)"]
523+
"let letLambdaRes = Operators.op_PipeRight<(Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int) Microsoft.FSharp.Collections.list,Microsoft.FSharp.Core.int Microsoft.FSharp.Collections.list> (Cons((1,2),Empty()),let mapping: Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int -> Microsoft.FSharp.Core.int = fun tupledArg -> let a: Microsoft.FSharp.Core.int = tupledArg.Item0 in let b: Microsoft.FSharp.Core.int = tupledArg.Item1 in (LetLambda.f () a) b in fun list -> ListModule.Map<Microsoft.FSharp.Core.int * Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (mapping,list)) @ (249,19--249,71)"]
524524
()
525525

526526
//---------------------------------------------------------------------------------------------------------

tests/service/FileSystemTests.fs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ let ``FileSystem compilation test``() =
9191
yield "--fullpaths";
9292
yield "--flaterrors";
9393
yield "--target:library";
94-
for r in [ @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll";
95-
@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll";
96-
@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll"] do
97-
yield "-r:" + r |]
94+
for r in [ sysLib "mscorlib"; sysLib "System"; sysLib "System.Core"; fsCoreDefaultReference() ] do
95+
yield "-r:" + r |]
9896

9997
{ ProjectFileName = @"c:\mycode\compilation.fsproj" // Make a name that is unique in this directory.
10098
ProjectFileNames = [| fileName1; fileName2 |]

tests/service/FsiTests.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ let ``EvalExpression parse failure nothrow``() =
151151
|> shouldEqual
152152
["exception Operation could not be completed due to earlier error";
153153
"error 1,5 - 1,8; Unexpected keyword 'let' or 'use' in binding";
154-
"error 1,1 - 1,4; Block following this 'let' is unfinished. Expect an expression."]
154+
"error 1,1 - 1,4; The block following this 'let' is unfinished. Expect an expression."]
155155

156156
[<Test>]
157157
let ``EvalInteraction typecheck failure``() =

0 commit comments

Comments
 (0)