2005-09-22 Marek Sieradzki <marek.sieradzki@gmail.com>

        * 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

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
index 8cd7073638e7c0060555634e86c270b4956e5522..7e842535c6f56adf82f7ddc7ac8f3638bef17a8d 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
index 81d904f0eb8235d155fa4a0f3dfb8957cf591a5b..2e38c07332fe0c977ea2132e3db7ba7b0516092c 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
@@ -1,4 +1,11 @@
-2005-09-25  Marek Sieradzki  <marek.sieradzki@gmail.com>
+2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
+
+       * 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  <marek.sieradzki@gmail.com>
 
        * ToolTask.cs: Formatting.
        * TaskItem.cs: Removed obsoleted code.

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs
index 8910d1dfed601bdc0199e0cad8417a594f8c9660..75104c0fac455a5ddc3649adfc83ae1210d36b89 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ConcurrentLoggingHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ConcurrentLoggingHelper.cs
index 1961bb64923fc6885ad5cc2da01019c014ac4921..0bbe2b43c6bbb53a10435e264c1a6752571b780b 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ConcurrentLoggingHelper.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
index 7d38a22c613b1b0fa0ee8c805a91b51dd093559d..ab534c018178430be9bd70dd2cb3f14514b1a931 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
+++ b/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
\ No newline at end of file

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 2dfa78da2cb994c0a8fef2612b25b3f8e192f535..11d96256e109a8cf061238497716a0fc3ad33b87 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
index 18c1913e04a349a57d8ba9cc7fb38c4662d5ab7a..781d5fe40958a3d0f30929957f9dd4ebd1e73110 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs
index 01500f83c9764cd96b7d4896ef148b6cc2aed603..8bfa5cd70b8b5cfbe010c259afa22e36d5d6ba03 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
index e23c793202f6796ca56d7fc35b6eb81b50d3b50a..8f22b30945e75a1b6965eb7747d70c8c21e03a7c 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
+++ b/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
\ No newline at end of file

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 8bcf57a9abc0bb2ebb2ce833fba78d41109e7fd9..3bad1b12c0a0ffbd563e3757cff56f358da632cb 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
index 465b91465eb150c011a8f1d992c642e279bb6c92..397ee5ec1cd371ef6c463ad9db22c0b6dcad322f 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/ChangeLog b/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/ChangeLog
index 5f29dfe1b48c145c0ba4c3d36f353ead40f42643..0dae7394159c1246624bf92610768cdb2b44ed37 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/ChangeLog
+++ b/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/ChangeLog
@@ -1,3 +1,7 @@
-2005-09-25  Marek Sieradzki  <marek.sieradzki@gmail.com>
+2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
+
+       * MonoLocationHelper.cs: Added GetXBuildDir ().
+
+2005-09-21  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
        * MonoLocationHelper.cs: Added.

diff --git a/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs
index 9edac17e7908d0db31f38a9b5399122e0718001d..6f8558dadb39b5671c8e431285af55d3331eb998 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs
+++ b/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;
+               }
        }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file