Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-23 13:20:38 +00:00
parent 02ac915603
commit b95516a3dd
239 changed files with 4096 additions and 1544 deletions

View File

@ -1077,6 +1077,11 @@ namespace Microsoft.Build.BuildEngine {
if (!String.IsNullOrEmpty (ToolsVersion))
return ToolsVersion;
#if XBUILD_14
return "14.0";
#elif XBUILD_12
return "12.0";
#else
if (!HasToolsVersionAttribute)
return parentEngine.DefaultToolsVersion;
@ -1088,6 +1093,7 @@ namespace Microsoft.Build.BuildEngine {
}
return DefaultToolsVersion;
#endif
}
void AddProjectExtensions (XmlElement xmlElement)