diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2013-12-22 05:37:25 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-01-08 03:39:30 +0400 |
| commit | 6926accf40dc6a144377ece8e03a45c2e06ad463 (patch) | |
| tree | f117c4cb74392caa0beec227deef936523a874b8 /mcs/class/Microsoft.Build.Engine | |
| parent | 47cb8c24c857245f6cddfb5634c33848042012a6 (diff) | |
[xbuild] MSBuild 12 toolset should be available for XBUILD_12
Diffstat (limited to 'mcs/class/Microsoft.Build.Engine')
| -rw-r--r-- | mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs | 2 | ||||
| -rw-r--r-- | mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs index 577a4379d29..40a4d251606 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs @@ -118,7 +118,7 @@ namespace Microsoft.Build.BuildEngine { Toolsets.Add (new Toolset ("4.0", ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40))); #endif -#if NET_4_5 +#if XBUILD_12 Toolsets.Add (new Toolset("12.0", ToolLocationHelper.GetMSBuildInstallPath ("12.0"), ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40))); 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 d7edd5f2961..ae1a9a8effe 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs @@ -1032,7 +1032,7 @@ namespace Microsoft.Build.BuildEngine { SetExtensionsPathProperties (DefaultExtensionsPath); evaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectDefaultTargets", DefaultTargets, PropertyType.Reserved)); evaluatedProperties.AddProperty (new BuildProperty ("OS", OS, PropertyType.Environment)); -#if NET_4_5 +#if XBUILD_12 // see http://msdn.microsoft.com/en-us/library/vstudio/hh162058(v=vs.120).aspx if (effective_tools_version == "12.0") { evaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath32", toolsPath, PropertyType.Reserved)); |