[xbuild] Use the env var $MSBuildExtensionsPath before trying other paths.

[mono.git] / mcs / class / Microsoft.Build.Engine / Microsoft.Build.BuildEngine / Import.cs

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
index e77209c2caa5802d9149770f7f9b9a7d275f3bcd..9088babcfecf8444dc178ef46234374432af271f 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs
@@ -120,10 +120,10 @@ namespace Microsoft.Build.BuildEngine {
 
                        string envvar = Environment.GetEnvironmentVariable (property_name);
                        envvar = String.Join (":", new string [] {
+                                               (envvar ?? String.Empty),
                                                // For mac osx, look in the 'External' dir on macosx,
                                                // see bug #663180
                                                MSBuildUtils.RunningOnMac ? MacOSXExternalXBuildDir : String.Empty,
-                                               (envvar ?? String.Empty),
                                                DotConfigExtensionsPath});
 
                        string [] paths = envvar.Split (new char [] {':'}, StringSplitOptions.RemoveEmptyEntries);