Skip to content

Trial the use of MSBuild resolution on latest Mono #610

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

Closed
wants to merge 2 commits into from
Closed

Trial the use of MSBuild resolution on latest Mono #610

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
a53c321
test using MSBuild resoution on Mono
dsyme Jul 17, 2016
1f198c6
Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Se…
dsyme Jul 17, 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
2 changes: 1 addition & 1 deletion src/absil/ilwrite.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@ module FileSystemUtilites =
#if ENABLE_MONO_SUPPORT
if runningOnMono then
try
let monoPosix = Assembly.Load("Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756")
let monoPosix = Assembly.Load("Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756")
if progress then eprintf "loading type Mono.Unix.UnixFileInfo...\n"
let monoUnixFileInfo = monoPosix.GetType("Mono.Unix.UnixFileSystemInfo")
let fileEntry = monoUnixFileInfo.InvokeMember("GetFileSystemEntry", (BindingFlags.InvokeMethod ||| BindingFlags.Static ||| BindingFlags.Public), null, null, [| box filename |],System.Globalization.CultureInfo.InvariantCulture)
Expand Down
4 changes: 0 additions & 4 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,11 +2218,7 @@ type TcConfigBuilder =
resolutionAssemblyFoldersConditions = ""
platform = None
prefer32Bit = false
#if ENABLE_MONO_SUPPORT
useSimpleResolution = runningOnMono
#else
useSimpleResolution = false
#endif
target = ConsoleExe
debuginfo = false
testFlagEmitFeeFeeAs100001 = false
Expand Down
7 changes: 1 addition & 6 deletions src/fsharp/vs/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2525,12 +2525,7 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
let useFsiAuxLib = defaultArg useFsiAuxLib true
// Do we use a "FSharp.Core, 4.3.0.0" reference by default?
let otherFlags = defaultArg otherFlags [| |]
let useSimpleResolution =
#if ENABLE_MONO_SUPPORT
runningOnMono || otherFlags |> Array.exists (fun x -> x = "--simpleresolution")
#else
true
#endif
let useSimpleResolution = otherFlags |> Array.exists (fun x -> x = "--simpleresolution")
let loadedTimeStamp = defaultArg loadedTimeStamp DateTime.MaxValue // Not 'now', we don't want to force reloading
let applyCompilerOptions tcConfigB =
let collect _name = ()
Expand Down