diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-11-19 12:43:19 +0300 |
| commit | 3464fad275c48d7c4ffb3602dfcc66afa467b76a (patch) | |
| tree | 10db040d0a2cf55165ac8d43dd24b60ca297a887 /main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs | |
| parent | d94562154c646871e5af85aeb9eca1ece86776f9 (diff) | |
| parent | 203ed0aabb6a60c7bb18f3b7b490588ab09cf38e (diff) | |
Merge branch 'master' into aspnet-project-wizard
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/UnitTests/UnitTests.csproj
Diffstat (limited to 'main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs | 2 |
1 files changed, 1 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"; } } } |