ToolLocationHelper is now used in MS.Build.dll too (as internal).

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
index 4401042a60d0e41b8bd39be6e6db28ed9ccec604..0906ef3ebf5cda566ecd857f35a602276fa27777 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
@@ -31,7 +31,12 @@ namespace Microsoft.Build.Utilities
 {
        // If changing something here then update
        // ToolLocationHelper.GetPathToDotNetFramework also
-       public enum TargetDotNetFrameworkVersion
+       #if MICROSOFT_BUILD_DLL
+       internal
+       #else
+       public
+       #endif
+       enum TargetDotNetFrameworkVersion
        {
                Version11,
                Version20,

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 f16603fcfd0dc4d70f1bdf507feb4f40f636fe56..e61094bc8676f7ee479fd91c7563ec7983308d4a 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -30,7 +30,12 @@ using System.IO;
 
 namespace Microsoft.Build.Utilities
 {
-       public static class ToolLocationHelper
+       #if MICROSOFT_BUILD_DLL
+       internal
+       #else
+       public
+       #endif
+       static class ToolLocationHelper
        {
                static string lib_mono_dir;
                static string [] mono_dir;