Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to feature/witness-passing #9072

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Merge master to feature/witness-passing #9072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 0 additions & 14 deletions tests/fsharp/regression/5531/compilation.output.test.txt
View file
Open in desktop

This file was deleted.