Skip to content

Add detection of the VisualStudioVersion #515

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 1 commit into from
Jan 19, 2016
Merged

Add detection of the VisualStudioVersion #515

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
22 changes: 20 additions & 2 deletions src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ module internal Program =
else
None

// Use the old API on Mono, with ToolsVersion = 12.0
let CrackProjectUsingOldBuildAPI(fsprojFile:string) =
let engine = new Microsoft.Build.BuildEngine.Engine()
Option.iter (fun l -> engine.RegisterLogger(l)) logOpt
Expand Down Expand Up @@ -108,6 +107,22 @@ module internal Program =

outFileOpt, directory, getItems, references, projectReferences, getProp project, project.FullFileName

let vs =
let programFiles =
let getEnv v =
let result = System.Environment.GetEnvironmentVariable(v)
match result with
| null -> None
| _ -> Some result

match List.tryPick getEnv [ "ProgramFiles(x86)"; "ProgramFiles" ] with
| Some r -> r
| None -> "C:\\Program Files (x86)"

let vsVersions = ["14.0"; "12.0"]
let msbuildBin v = IO.Path.Combine(programFiles, "MSBuild", v, "Bin", "MSBuild.exe")
List.tryFind (fun v -> IO.File.Exists(msbuildBin v)) vsVersions

let CrackProjectUsingNewBuildAPI(fsprojFile) =
let fsprojFullPath = try Path.GetFullPath(fsprojFile) with _ -> fsprojFile
let fsprojAbsDirectory = Path.GetDirectoryName fsprojFullPath
Expand All @@ -128,7 +143,10 @@ module internal Program =
let project = engine.LoadProject(xmlReader, FullPath=fsprojFullPath)

project.SetGlobalProperty("BuildingInsideVisualStudio", "true") |> ignore
project.SetGlobalProperty("VisualStudioVersion", "12.0") |> ignore
if not (List.exists (fun (p,_) -> p = "VisualStudioVersion") properties) then
match vs with
| Some version -> project.SetGlobalProperty("VisualStudioVersion", version) |> ignore
| None -> ()
project.SetGlobalProperty("ShouldUnsetParentConfigurationAndPlatform", "false") |> ignore
for (prop, value) in properties do
project.SetGlobalProperty(prop, value) |> ignore
Expand Down