Adjust defines to check for 4_0 instead of 3_0
authorGustavo Guerra <gustavo@codebeside.org>
Wed, 9 Oct 2013 12:38:35 +0000 (13:38 +0100)
committerGustavo Guerra <gustavo@codebeside.org>
Wed, 9 Oct 2013 12:38:35 +0000 (13:38 +0100)
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs

index c763d59df76bc5c369bcd8bea3733eb2d8f42aa6..f16603fcfd0dc4d70f1bdf507feb4f40f636fe56 100644 (file)
@@ -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