Skip to content

Fixed binary reader error message #1468

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

Merged
merged 3 commits into from
Aug 25, 2016
Merged

Fixed binary reader error message #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75392d3
Fixed binary reader error message
ncave Aug 22, 2016
1aff9d4
Fixed tests
ncave Aug 24, 2016
d1f6fb6
No-op
ncave Aug 24, 2016
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
8 changes: 4 additions & 4 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,8 +2565,8 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
clrRoot, (int v1, sprintf "v%d.%d" v1 v2), (v1=5us && v2=0us && v3=5us) // SL5 mscorlib is 5.0.5.0
| _ ->
failwith (FSComp.SR.buildCouldNotReadVersionInfoFromMscorlib())
with _ ->
error(Error(FSComp.SR.buildCannotReadAssembly(filename),rangeStartup))
with e ->
error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message), rangeStartup))
| _ ->
#if !ENABLE_MONO_SUPPORT
// TODO: we have to get msbuild out of this
Expand Down Expand Up @@ -2626,8 +2626,8 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
checkFSharpBinaryCompatWithMscorlib filename ilReader.ILAssemblyRefs ilReader.ILModuleDef.ManifestOfAssembly.Version rangeStartup;
let fslibRoot = Path.GetDirectoryName(FileSystem.GetFullPathShim(filename))
fslibRoot (* , sprintf "v%d.%d" v1 v2 *)
with _ ->
error(Error(FSComp.SR.buildCannotReadAssembly(filename),rangeStartup))
with e ->
error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message), rangeStartup))
| _ ->
data.defaultFSharpBinariesDir

Expand Down
2 changes: 1 addition & 1 deletion tests/fsharpqa/Source/MultiTargeting/E_BadPathToFSharpCore.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// #Regression #Multitargeting #NoMono #NETFX40Only
// Regression test for FSHARP1.0:6026
// Just a dummy file...
//<Expects status="error" id="FS0218">Unable to read assembly '.+I_DO_NOT_EXIST\\FSharp\.Core\.dll'$</Expects>
//<Expects status="error" id="FS0229">Error opening binary file '.+I_DO_NOT_EXIST\\FSharp\.Core\.dll'</Expects>

exit 0
2 changes: 1 addition & 1 deletion tests/fsharpqa/Source/MultiTargeting/E_BadPathToFSharpCore.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// #Regression #Multitargeting #NoMono #NETFX40Only
// Regression test for FSHARP1.0:6026
// Just a dummy file...
//<Expects status="error" id="FS0218">Unable to read assembly '.+I_DO_NOT_EXIST\\FSharp\.Core\.dll'$</Expects>
//<Expects status="error" id="FS0229">Error opening binary file '.+I_DO_NOT_EXIST\\FSharp\.Core\.dll'</Expects>

exit 0