diff options
| author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-10-18 11:48:26 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-10-18 11:48:26 +0400 |
| commit | 0075f3921505d5a52e163992c41842f809499d2a (patch) | |
| tree | 642efe9ce14c284fee57e158f33df6c9347ae75e /mcs/class/Microsoft.Build.Utilities | |
| parent | 6934f160db0edae2258b570ce7a959c217ed0b44 (diff) | |
| parent | 6c8c17c9323c0426f4a844d90e0f5a95844e6630 (diff) | |
Merge pull request #767 from ovatsus/Bug14922
Fix for #14922
Diffstat (limited to 'mcs/class/Microsoft.Build.Utilities')
| -rw-r--r-- | mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs index cc5b84cb904..f16603fcfd0 100644 --- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs +++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs @@ -48,6 +48,9 @@ namespace Microsoft.Build.Utilities t2 = t1.Parent; lib_mono_dir = t2.FullName; +#if NET_4_0 + var windowsPath = Environment.GetFolderPath (Environment.SpecialFolder.Windows); +#endif if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) { mono_dir = new string [] { Path.Combine (lib_mono_dir, "net_1_0"), @@ -57,6 +60,18 @@ namespace Microsoft.Build.Utilities Path.Combine (lib_mono_dir, "net_4_0"), Path.Combine (lib_mono_dir, "net_4_5") }; +#if NET_4_0 + } else if (!string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath)) { + //running in .NET, not Mono + mono_dir = new string [] { + Path.Combine (lib_mono_dir, "v1.0.3705"), + Path.Combine (lib_mono_dir, "v2.0.50727"), + Path.Combine (lib_mono_dir, "v2.0.50727"), + Path.Combine (lib_mono_dir, "v3.5"), + Path.Combine (lib_mono_dir, "v4.0.30319"), + Path.Combine (lib_mono_dir, "v4.0.30319") + }; +#endif } else { mono_dir = new string [] { Path.Combine (lib_mono_dir, "1.0"), @@ -93,6 +108,15 @@ namespace Microsoft.Build.Utilities return mono_dir [(int)version]; } +#if NET_4_0 + public static string GetMSBuildInstallPath (string version) + { + //see http://msdn.microsoft.com/en-us/library/vstudio/bb397428(v=vs.120).aspx + var programFiles = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86); + return Path.Combine (programFiles, "MSBuild", version, "bin"); + } +#endif + [MonoTODO] public static string GetPathToDotNetFrameworkFile (string fileName, TargetDotNetFrameworkVersion version) |