Skip to content

Commit d14b5d3

Browse files
authored
fix probing issue (#9016)
1 parent 97a154c commit d14b5d3

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,6 @@ msbuild.binlog
130130
/fcs/FSharp.Compiler.Service.netstandard/*.fsi
131131
/.ionide/
132132
**/.DS_Store
133+
/tests/fsharp/regression/5531/compilation.output.test.txt
134+
/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.txt
135+
/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.txt

src/fsharp/CompileOps.fs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2880,8 +2880,11 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
28802880
[
28812881
// Check if we are given an explicit framework root - if so, use that
28822882
match tcConfig.clrRoot with
2883-
| Some x ->
2884-
yield tcConfig.MakePathAbsolute x
2883+
| Some x ->
2884+
let clrRoot = tcConfig.MakePathAbsolute x
2885+
yield clrRoot
2886+
let clrFacades = Path.Combine(clrRoot, "Facades")
2887+
if Directory.Exists(clrFacades) then yield clrFacades
28852888

28862889
| None ->
28872890
// "there is no really good notion of runtime directory on .NETCore"

tests/fsharp/regression/5531/compilation.output.test.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)