Skip to content

Don't go looking for MSBuild v12 in SimulatedMSBuildReferenceResolver #6934

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
KevinRansom merged 1 commit into from
Jun 3, 2019
Merged

Don't go looking for MSBuild v12 in SimulatedMSBuildReferenceResolver #6934

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
19 changes: 2 additions & 17 deletions src/fsharp/SimulatedMSBuildReferenceResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ open System
open System.IO
open System.Reflection
open Microsoft.Win32
open FSharp.Compiler
open FSharp.Compiler.ReferenceResolver
open FSharp.Compiler.AbstractIL.Internal.Library

let internal SimulatedMSBuildResolver =
let private SimulatedMSBuildResolver =
let supportedFrameworks = [|
"v4.7.2"
"v4.7.1"
Expand Down Expand Up @@ -183,21 +182,7 @@ let internal SimulatedMSBuildResolver =

results.ToArray() }

let internal GetBestAvailableResolver() =
#if !FX_RESHAPED_MSBUILD
let tryMSBuild v =
// Detect if MSBuild is on the machine, if so use the resolver from there
let mb = try Assembly.Load(sprintf "Microsoft.Build.Framework, Version=%s.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" v) |> Option.ofObj with _ -> None
let assembly = mb |> Option.bind (fun _ -> try Assembly.Load(sprintf "FSharp.Compiler.Service.MSBuild.v%s" v) |> Option.ofObj with _ -> None)
let ty = assembly |> Option.bind (fun a -> a.GetType("FSharp.Compiler.MSBuildReferenceResolver") |> Option.ofObj)
let obj = ty |> Option.bind (fun ty -> ty.InvokeMember("get_Resolver", BindingFlags.Static ||| BindingFlags.Public ||| BindingFlags.InvokeMethod ||| BindingFlags.NonPublic, null, null, [| |]) |> Option.ofObj)
let resolver = obj |> Option.bind (fun obj -> match obj with :? Resolver as r -> Some r | _ -> None)
resolver
match tryMSBuild "12" with
| Some r -> r
| None ->
#endif
SimulatedMSBuildResolver
let internal getResolver () = SimulatedMSBuildResolver


#if INTERACTIVE
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsi/fsi.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2415,7 +2415,7 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i

let legacyReferenceResolver =
match legacyReferenceResolver with
| None -> SimulatedMSBuildReferenceResolver.GetBestAvailableResolver()
| None -> SimulatedMSBuildReferenceResolver.getResolver()
| Some rr -> rr

let tcConfigB =
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/service/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2946,7 +2946,7 @@ type FSharpChecker(legacyReferenceResolver, projectCacheSize, keepAssemblyConten
let legacyReferenceResolver =
match legacyReferenceResolver with
| Some rr -> rr
| None -> SimulatedMSBuildReferenceResolver.GetBestAvailableResolver()
| None -> SimulatedMSBuildReferenceResolver.getResolver()

let keepAssemblyContents = defaultArg keepAssemblyContents false
let keepAllBackgroundResolutions = defaultArg keepAllBackgroundResolutions true
Expand Down