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 release/dev16.8 #9729

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Merge master to release/dev16.8 #9729

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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,7 @@ msbuild.binlog
/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
*ncrunch*.user
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
7 changes: 6 additions & 1 deletion src/fsharp/ErrorLogger.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ exception PossibleUnverifiableCode of range

exception UnresolvedReferenceNoRange of (*assemblyName*) string
exception UnresolvedReferenceError of (*assemblyName*) string * range
exception UnresolvedPathReferenceNoRange of (*assemblyName*) string * (*path*) string
exception UnresolvedPathReferenceNoRange of (*assemblyName*) string * (*path*) string with
override this.Message =
match this :> exn with
| UnresolvedPathReferenceNoRange(assemblyName, path) -> sprintf "Assembly: %s, full path: %s" assemblyName path
| _ -> "impossible"

exception UnresolvedPathReference of (*assemblyName*) string * (*path*) string * range


Expand Down
1 change: 1 addition & 0 deletions tests/service/Common.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ let mkStandardProjectReferences () =
[ yield sysLib "mscorlib"
yield sysLib "System"
yield sysLib "System.Core"
yield sysLib "System.Numerics"
yield fsCoreDefaultReference() ]
#endif

Expand Down
Loading