From 4103bd9aae88f529296cf73788cce439afff64ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 20 May 2016 23:24:04 +0200 Subject: [PATCH] [xbuild] Make sure MSBuildFrameworkToolsPath is set for xbuild 14 --- .../Microsoft.Build.BuildEngine/Project.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.25.1