From ffd7853ace8103e1f243c11690875a7d9aeaa067 Mon Sep 17 00:00:00 2001 From: ncave Date: Mon, 15 Aug 2016 23:19:10 -0700 Subject: [PATCH 1/2] Fixing binary reader on xplat --- src/absil/ilread.fs | 4 ++-- src/fsharp/CompileOps.fs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 3f59e03b88..353b3b114d 100755 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -3946,7 +3946,7 @@ 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 @@ -3954,7 +3954,7 @@ let OpenILModuleReader infile opts = dispose = (fun () -> mmap.Close() ClosePdbReader pdb) } - else + with _ -> let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim) let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts { modul = modul diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index f05e435761..84b3225f89 100755 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -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 @@ -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 From da6d0b6074b78ca5cd97fabfb79d91fea1e52ba8 Mon Sep 17 00:00:00 2001 From: ncave Date: Tue, 16 Aug 2016 00:06:19 -0700 Subject: [PATCH 2/2] Updated project version to 6.02 --- .../FSharp.Compiler.Service.ProjectCracker/project.json | 4 ++-- src/fsharp/FSharp.Compiler.Service/project.json | 2 +- tests/service/project.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json index a0d28dc878..b14d3476ee 100644 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json @@ -1,5 +1,5 @@ { - "version": "6.0.1", + "version": "6.0.2", "buildOptions": { "debugType": "portable", "emitEntryPoint": false, @@ -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" } }, diff --git a/src/fsharp/FSharp.Compiler.Service/project.json b/src/fsharp/FSharp.Compiler.Service/project.json index 90563a0719..e762191f70 100644 --- a/src/fsharp/FSharp.Compiler.Service/project.json +++ b/src/fsharp/FSharp.Compiler.Service/project.json @@ -1,5 +1,5 @@ { - "version": "6.0.1", + "version": "6.0.2", "buildOptions": { "debugType": "portable", "compilerName": "fsc", diff --git a/tests/service/project.json b/tests/service/project.json index e1f22e2f22..9696af7fea 100644 --- a/tests/service/project.json +++ b/tests/service/project.json @@ -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" } },