Skip to content

Commit f6b24b5

Browse files
committed
fix build after integration
1 parent 2aa51c9 commit f6b24b5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

tests/service/ExprTests.fs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
#if INTERACTIVE
33
#r "../../bin/v4.5/FSharp.Compiler.Service.dll"
4+
#r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll"
45
#r "../../packages/NUnit/lib/nunit.framework.dll"
56
#load "FsUnit.fs"
67
#load "Common.fs"
@@ -16,6 +17,7 @@ open System.IO
1617
open System.Collections.Generic
1718
open Microsoft.FSharp.Compiler
1819
open Microsoft.FSharp.Compiler.SourceCodeServices
20+
open FSharp.Compiler.Service
1921
open FSharp.Compiler.Service.Tests.Common
2022

2123
// Create an interactive checker instance
@@ -678,7 +680,7 @@ let ``Test expressions of declarations stress big expressions`` () =
678680
[<Test>]
679681
let ``Check use of type provider that provides calls to F# code`` () =
680682
let res =
681-
checker.GetProjectOptionsFromProjectFile (Path.Combine(Path.Combine(__SOURCE_DIRECTORY__, "TestProject"),"TestProject.fsproj"))
683+
ProjectCracker.GetProjectOptionsFromProjectFile (Path.Combine(Path.Combine(__SOURCE_DIRECTORY__, "TestProject"),"TestProject.fsproj"))
682684
|> checker.ParseAndCheckProject
683685
|> Async.RunSynchronously
684686

@@ -716,7 +718,7 @@ let ``Check use of type provider that provides calls to F# code`` () =
716718
let ``Test Declarations selfhost`` () =
717719
let projectFile = __SOURCE_DIRECTORY__ + @"/FSharp.Compiler.Service.Tests.fsproj"
718720
// Check with Configuration = Release
719-
let options = checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
721+
let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
720722
let wholeProjectResults = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
721723

722724
wholeProjectResults.Errors.Length |> shouldEqual 0
@@ -735,7 +737,7 @@ let ``Test Declarations selfhost whole compiler`` () =
735737
let projectFile = __SOURCE_DIRECTORY__ + @"/../../src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj"
736738

737739
//let v = FSharpProjectFileInfo.Parse(projectFile, [("Configuration", "Debug"); ("NoFsSrGenTask", "true")],enableLogging=true)
738-
let options = checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug"); ("NoFsSrGenTask", "true")])
740+
let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug"); ("NoFsSrGenTask", "true")])
739741

740742
// For subsets of the compiler:
741743
//let options = { options with OtherOptions = options.OtherOptions.[0..51] }
@@ -773,7 +775,7 @@ let ``Test Declarations selfhost FSharp.Core`` () =
773775
Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ + @"/../../../fsharp/src/fsharp/FSharp.Core"
774776
let projectFile = __SOURCE_DIRECTORY__ + @"/../../../fsharp/src/fsharp/FSharp.Core/FSharp.Core.fsproj"
775777

776-
let options = checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
778+
let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
777779

778780
let wholeProjectResults = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
779781

tests/service/ProjectOptionsTests.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#if INTERACTIVE
22
#r "../../bin/v4.5/FSharp.Compiler.Service.dll"
3+
#r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll"
34
#r "../../packages/NUnit/lib/nunit.framework.dll"
45
#load "FsUnit.fs"
56
#load "Common.fs"

0 commit comments

Comments
 (0)