2005-09-22 Marek Sieradzki <[email protected]>

        * CommandLineBuilder.cs, Logger.cs, AppDomainIsolatedTask.cs,
        ToolTask.cs, TaskItem.cs, Task.cs, ToolLocationHelper.cs,
        TargetDotNetFrameworkVersion.cs, ConcurrentLoggingHelper.cs,
        TaskLoggingHelper.cs: Added #if NET_2_0.


svn path=/trunk/mcs/; revision=50526

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.Resources;
 using Microsoft.Build.Framework;
@@ -107,3 +109,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog

@@ -1,4 +1,11 @@
-2005-09-25  Marek Sieradzki  <[email protected]>
+2005-09-22  Marek Sieradzki  <[email protected]>
+
+	* CommandLineBuilder.cs, Logger.cs, AppDomainIsolatedTask.cs,
+	ToolTask.cs, TaskItem.cs, Task.cs, ToolLocationHelper.cs,
+	TargetDotNetFrameworkVersion.cs, ConcurrentLoggingHelper.cs,
+	TaskLoggingHelper.cs: Added #if NET_2_0.
+
+2005-09-21  Marek Sieradzki  <[email protected]>
 
 	* ToolTask.cs: Formatting.
 	* TaskItem.cs: Removed obsoleted code.

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs

@@ -25,6 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
 
 using System;
 using System.Text;
@@ -281,3 +282,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ConcurrentLoggingHelper.cs

@@ -25,6 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
 
 using System;
 using System.IO;
@@ -109,3 +110,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using Microsoft.Build.Framework;
 
@@ -78,3 +80,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 namespace Microsoft.Build.Utilities
 {
 	public enum TargetDotNetFrameworkVersion
@@ -34,3 +36,5 @@ namespace Microsoft.Build.Utilities
 		VersionLatest = Version20
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.Resources;
 using Microsoft.Build.Framework;
@@ -102,3 +104,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -155,3 +157,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.IO;
 using System.Resources;
@@ -362,3 +364,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.IO;
 
@@ -90,3 +92,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.Diagnostics;
 using System.Collections.Specialized;
@@ -283,3 +285,5 @@ namespace Microsoft.Build.Utilities
 		}
 	}
 }
+
+#endif

mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/ChangeLog

@@ -1,3 +1,7 @@
-2005-09-25  Marek Sieradzki  <[email protected]>
+2005-09-22  Marek Sieradzki  <[email protected]>
+
+	* MonoLocationHelper.cs: Added GetXBuildDir ().
+
+2005-09-21  Marek Sieradzki  <[email protected]>
 
 	* MonoLocationHelper.cs: Added.

mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs

@@ -25,6 +25,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#if NET_2_0
+
 using System;
 using System.IO;
 
@@ -34,6 +36,7 @@ namespace Mono.XBuild.Utilities {
 		static string binDir;
 		static string libDir;
 		static string assembliesDir;
+		static string xbuildDir;
 	
 		static MonoLocationHelper ()
 		{
@@ -46,6 +49,8 @@ namespace Mono.XBuild.Utilities {
 			t1 = new DirectoryInfo (assemblyLocation);
 			// /usr/local/lib/mono
 			t2 = t1.Parent;
+			// /usr/local/lib/mono/xbuild
+			xbuildDir = Path.Combine (t2.FullName, "xbuild");
 			// /usr/local/lib
 			t3 = t2.Parent;
 			// /usr/local
@@ -68,5 +73,12 @@ namespace Mono.XBuild.Utilities {
 		{
 			return assembliesDir;
 		}
+		
+		public static string GetXBuildDir ()
+		{
+			return xbuildDir;
+		}
 	}
-}
+}
+
+#endif