Merge pull request #9072 from dotnet/merges/master-to-feature/witness…

…-passing Merge master to feature/witness-passing
dotnet · Apr 29, 2020 · b969432 · b969432
2 parents cceb94e + d14b5d3
commit b969432
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -130,3 +130,6 @@ msbuild.binlog
 /fcs/FSharp.Compiler.Service.netstandard/*.fsi
 /.ionide/
 **/.DS_Store
+/tests/fsharp/regression/5531/compilation.output.test.txt
+/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.txt
+/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.txt
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
@@ -2880,8 +2880,11 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
           [ 
             // Check if we are given an explicit framework root - if so, use that
             match tcConfig.clrRoot with 
-            | Some x -> 
-                yield tcConfig.MakePathAbsolute x
+            | Some x ->
+                let clrRoot = tcConfig.MakePathAbsolute x
+                yield clrRoot
+                let clrFacades = Path.Combine(clrRoot, "Facades")
+                if Directory.Exists(clrFacades) then yield clrFacades
 
             | None -> 
 // "there is no really good notion of runtime directory on .NETCore"

diff --git a/tests/fsharp/regression/5531/compilation.output.test.txt b/tests/fsharp/regression/5531/compilation.output.test.txt