* Project.cs (InitializeProperties): Set MSBuildBinPath to the current

tools path.

svn path=/trunk/mcs/; revision=155196

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 4ce85d2bad3213c6af853313c96a50005d5c19bc..7b43f792701256ec17cbd045acc091edbe0057cd 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Ankit Jain  <jankit@novell.com>
+
+       * Project.cs (InitializeProperties): Set MSBuildBinPath to the current
+       tools path.
+
 2010-04-10  Ankit Jain  <jankit@novell.com>
 
        * TaskEngine.cs (Prepare): Throw InvalidProjectFileException instead of a generic

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 c30002862e6397468e0bb5b494f19ebb9eaf0380..0bda5abba45a7853ca3dd3f0a741dce166169980 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -932,11 +932,11 @@ namespace Microsoft.Build.BuildEngine {
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectName",
                                                Path.GetFileNameWithoutExtension (fullFileName),
                                                PropertyType.Reserved));
-                       EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildBinPath", parentEngine.BinPath, PropertyType.Reserved));
                        string toolsVersionToUse = GetToolsVersionToUse ();
                        string toolsPath = parentEngine.Toolsets [toolsVersionToUse].ToolsPath;
                        if (toolsPath == null)
                                throw new Exception ("Unknown toolsVersion: " + toolsVersionToUse);
+                       EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildBinPath", toolsPath, PropertyType.Reserved));
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath", toolsPath, PropertyType.Reserved));
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsVersion", toolsVersionToUse, PropertyType.Reserved));
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildExtensionsPath", ExtensionsPath, PropertyType.Reserved));