diff options
author | Gustavo Guerra <gustavo@codebeside.org> | 2013-10-09 16:38:35 +0400 |
---|---|---|
committer | Gustavo Guerra <gustavo@codebeside.org> | 2013-10-09 16:38:35 +0400 |
commit | 6c8c17c9323c0426f4a844d90e0f5a95844e6630 (patch) | |
tree | 188d5e2d628049c5973764800ec9c8d5cb33caad /mcs/class/Microsoft.Build.Utilities | |
parent | 0fd61547a110620851da255e32931ffd846d8dce (diff) |
Adjust defines to check for 4_0 instead of 3_0
Diffstat (limited to 'mcs/class/Microsoft.Build.Utilities')
-rw-r--r-- | mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs | 6 |
1 files changed, 3 insertions, 3 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 c763d59df76..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,7 +48,7 @@ namespace Microsoft.Build.Utilities t2 = t1.Parent; lib_mono_dir = t2.FullName; -#if NET_3_0 +#if NET_4_0 var windowsPath = Environment.GetFolderPath (Environment.SpecialFolder.Windows); #endif if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) { @@ -60,7 +60,7 @@ namespace Microsoft.Build.Utilities Path.Combine (lib_mono_dir, "net_4_0"), Path.Combine (lib_mono_dir, "net_4_5") }; -#if NET_3_0 +#if NET_4_0 } else if (!string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath)) { //running in .NET, not Mono mono_dir = new string [] { @@ -108,7 +108,7 @@ namespace Microsoft.Build.Utilities return mono_dir [(int)version]; } -#if NET_3_0 +#if NET_4_0 public static string GetMSBuildInstallPath (string version) { //see http://msdn.microsoft.com/en-us/library/vstudio/bb397428(v=vs.120).aspx |