Skip to content

Commit 4e56324

Browse files
committed
fix test
1 parent caed8aa commit 4e56324

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

tests/service/CSharpProjectAnalysis.fs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,6 @@ open Microsoft.FSharp.Compiler.SourceCodeServices
2222

2323
open FSharp.Compiler.Service.Tests.Common
2424

25-
let internal getProjectReferences (content, dllFiles) =
26-
let fileName, options =
27-
mkTestFileAndOptions content
28-
[| for dllFile in dllFiles do
29-
yield "-r:"+dllFile |]
30-
let results = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
31-
if results.HasCriticalErrors then
32-
let builder = new System.Text.StringBuilder()
33-
for err in results.Errors do
34-
builder.AppendLine(sprintf "**** %s: %s" (if err.Severity = FSharpErrorSeverity.Error then "error" else "warning") err.Message)
35-
|> ignore
36-
failwith (builder.ToString())
37-
let assemblies =
38-
results.ProjectContext.GetReferencedAssemblies()
39-
|> List.map(fun x -> x.SimpleName, x)
40-
|> dict
41-
results, assemblies
42-
4325
#if !FCS // disabled in FCS testing because the CSharp_Analysis.dll is not put in the right place
4426
[<Test>]
4527
#if NETCOREAPP2_0

tests/service/Common.fs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,30 @@ let mkTestFileAndOptions source additionalArgs =
158158
let project = Path.GetTempFileName()
159159
let dllName = Path.ChangeExtension(project, ".dll")
160160
let projFileName = Path.ChangeExtension(project, ".fsproj")
161-
let fileSource1 = "module M"
162-
File.WriteAllText(fileName, fileSource1)
161+
File.WriteAllText(fileName, source)
163162

164163
let args = Array.append (mkProjectCommandLineArgs (dllName, [fileName])) additionalArgs
165164
let options = checker.GetProjectOptionsFromCommandLineArgs (projFileName, args)
166165
fileName, options
167166

167+
let getProjectReferences (content, dllFiles) =
168+
let fileName, options =
169+
mkTestFileAndOptions content
170+
[| for dllFile in dllFiles do
171+
yield "-r:"+dllFile |]
172+
let results = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
173+
if results.HasCriticalErrors then
174+
let builder = new System.Text.StringBuilder()
175+
for err in results.Errors do
176+
builder.AppendLine(sprintf "**** %s: %s" (if err.Severity = FSharpErrorSeverity.Error then "error" else "warning") err.Message)
177+
|> ignore
178+
failwith (builder.ToString())
179+
let assemblies =
180+
results.ProjectContext.GetReferencedAssemblies()
181+
|> List.map(fun x -> x.SimpleName, x)
182+
|> dict
183+
results, assemblies
184+
168185
let parseAndCheckFile fileName source options =
169186
match checker.ParseAndCheckFileInProject(fileName, 0, source, options) |> Async.RunSynchronously with
170187
| parseResults, FSharpCheckFileAnswer.Succeeded(checkResults) -> parseResults, checkResults

0 commit comments

Comments
 (0)