Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-05-21 00:24:04 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2016-05-21 00:37:21 +0300
commit4103bd9aae88f529296cf73788cce439afff64ff (patch)
tree35f70636776b8bb768f055f331e9528f8a424452 /mcs/class/Microsoft.Build.Engine
parentd44824b7f8483b2aebb6becdfac54b1206cd617e (diff)
[xbuild] Make sure MSBuildFrameworkToolsPath is set for xbuild 14
Diffstat (limited to 'mcs/class/Microsoft.Build.Engine')
-rw-r--r--mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index 005752baf98..fb545562ffa 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -1035,7 +1035,7 @@ namespace Microsoft.Build.BuildEngine {
evaluatedProperties.AddProperty (new BuildProperty ("OS", OS, PropertyType.Environment));
#if XBUILD_12
// see http://msdn.microsoft.com/en-us/library/vstudio/hh162058(v=vs.120).aspx
- if (effective_tools_version == "12.0") {
+ if (effective_tools_version == "12.0" || effective_tools_version == "14.0") {
evaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath32", toolsPath, PropertyType.Reserved));
var frameworkToolsPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version451);