diff options
| author | Lluis Sanchez <slluis.devel@gmail.com> | 2015-07-28 08:50:33 +0300 |
|---|---|---|
| committer | Lluis Sanchez <slluis.devel@gmail.com> | 2015-07-28 08:50:33 +0300 |
| commit | b99cb19a1d3b15d8980c4616f13f837457e5b292 (patch) | |
| tree | c7e03a31ac124ce3e41fec8089e51d070e9a9db6 | |
| parent | 676dac8a7ae1d4e6de624a0e029ae141cbc59028 (diff) | |
| parent | 0ce9862b0fc01bec2116c14cc36641b62f95aeac (diff) | |
Merge pull request #989 from mono/md-5.9-vs2015monodevelop-5.9.5.9
[Core] Add support for VS 2015
2 files changed, 2 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs index 05314dfdb7..814935bdbb 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs @@ -347,7 +347,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild protected override bool SupportsToolsVersion (string version) { - return version == "4.0" || version == "12.0"; + return version == "4.0" || version == "12.0" || version == "14.0"; } } } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs index 878dae0804..8965eb4aa9 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs @@ -118,6 +118,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild return SolutionFormat; return new MSBuildFileFormatVS12 (); case "12.0": + case "14.0": return new MSBuildFileFormatVS12 (); default: throw new Exception ("Unknown ToolsVersion '" + ToolsVersion + "'"); |