Skip to content

Fixing binary reader on xplat #628

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
dsyme merged 2 commits into from
Aug 26, 2016
Merged

Fixing binary reader on xplat #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd7853
Fixing binary reader on xplat
ncave Aug 16, 2016
da6d0b6
Updated project version to 6.02
ncave Aug 16, 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
4 changes: 2 additions & 2 deletions src/absil/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3946,15 +3946,15 @@ let ClosePdbReader pdb =

let OpenILModuleReader infile opts =

if not runningOnMono then
try
let mmap = MemoryMappedFile.Create infile
let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mmap opts
{ modul = modul
ilAssemblyRefs=ilAssemblyRefs
dispose = (fun () ->
mmap.Close()
ClosePdbReader pdb) }
else
with _ ->
let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim)
let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
{ modul = modul
Expand Down
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 @@ -2602,8 +2602,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))
| _ ->
None, MSBuildResolver.HighestInstalledNetFrameworkVersionMajorMinor(), false

Expand Down Expand Up @@ -2657,8 +2657,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
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.0.1",
"version": "6.0.2",
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": false,
Expand Down Expand Up @@ -36,7 +36,7 @@
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
"System.Runtime.Serialization.Json": "4.0.2",
"FSharp.Compiler.Service": {
"version": "6.0.1",
"version": "6.0.2",
"target": "project"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.Service/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.0.1",
"version": "6.0.2",
"buildOptions": {
"debugType": "portable",
"compilerName": "fsc",
Expand Down
2 changes: 1 addition & 1 deletion tests/service/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
"NUnit": "3.4.1",
"dotnet-test-nunit": "3.4.0-beta-1",
"dotnet-test-nunit": "3.4.0-beta-2",
"FSharp.Compiler.Service": { "target": "project" }
},

Expand Down