diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2015-11-11 18:42:29 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2015-11-11 18:42:29 +0300 |
| commit | b773dd00c6d493f607c8871e416991599c45d334 (patch) | |
| tree | 73886e39a63566d0c2ec08f355869dcc2585a714 /main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild | |
| parent | cc7b1b00d61f4e29064d91d1fe96826df1531c89 (diff) | |
[Core] Add support for MSBuild 14
Diffstat (limited to 'main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs index c47e9e05d3..b2b556de41 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs @@ -861,12 +861,16 @@ namespace MonoDevelop.Projects.Formats.MSBuild { using (await buildersLock.EnterAsync ()) { - //attempt to use 12.0 builder first if available - string toolsVersion = "12.0"; - string binDir = runtime.GetMSBuildBinPath ("12.0"); + //attempt to use 14.0 builder first if available + string toolsVersion = "14.0"; + string binDir = runtime.GetMSBuildBinPath ("14.0"); if (binDir == null) { - //fall back to 4.0, we know it's always available - toolsVersion = "4.0"; + toolsVersion = "12.0"; + binDir = runtime.GetMSBuildBinPath ("12.0"); + if (binDir == null) { + //fall back to 4.0, we know it's always available + toolsVersion = "4.0"; + } } //check the ToolsVersion we found can handle the project |