Author: msierad
Date: 2007-03-17 03:58:51 -0500 (Sat, 17 Mar 2007)
New Revision: 74515

Modified:
   trunk/mcs/class/Microsoft.Build.Engine/
   
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
   
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/Consts.cs
Log:
2007-03-17  Marek Sieradzki  <[EMAIL PROTECTED]>

        * Consts.cs: Check for runtime not platform.




Property changes on: trunk/mcs/class/Microsoft.Build.Engine
___________________________________________________________________
Name: svn:ignore
   - TestResult-net_2_0.log
TestResult-net_2_0.xml
Microsoft.Build.Engine.pidb
Microsoft.Build.Engine_test_net_2_0.dll
Microsoft.Build.Engine_test_net_2_0.dll.mdb

   + TestResult-net_2_0.log
TestResult-net_2_0.xml
TestResult-ondotnet-net_2_0.log
TestResult-ondotnet-net_2_0.xml
Microsoft.Build.Engine.pidb
Microsoft.Build.Engine_test_net_2_0.dll
Microsoft.Build.Engine_test_net_2_0.dll.mdb


Modified: 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
--- 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
   2007-03-17 08:56:19 UTC (rev 74514)
+++ 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
   2007-03-17 08:58:51 UTC (rev 74515)
@@ -1,3 +1,7 @@
+2007-03-17  Marek Sieradzki  <[EMAIL PROTECTED]>
+
+       * Consts.cs: Check for runtime not platform.
+
 2007-03-06  Marek Sieradzki  <[EMAIL PROTECTED]>
 
        * BuildPropertyTest.cs, ProjectTest.cs: More tests.

Modified: 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/Consts.cs
===================================================================
--- 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/Consts.cs
   2007-03-17 08:56:19 UTC (rev 74514)
+++ 
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/Consts.cs
   2007-03-17 08:58:51 UTC (rev 74515)
@@ -29,11 +29,15 @@
 using Microsoft.Build.Utilities;
 
 public static class Consts {
+
+       static bool RunningOnMono ()
+       {
+               return Type.GetType ("Mono.Runtime") != null;
+       }
+       
        public static string BinPath {
                get {
-                       // FIXME: it should check for runtime not OS
-                       int p = (int) Environment.OSVersion.Platform;
-                       if (p == 4 || p == 128)
+                       if (RunningOnMono ())
                                return "../../tools/xbuild/xbuild";
                        else
                                return 
ToolLocationHelper.GetPathToDotNetFramework 
(TargetDotNetFrameworkVersion.Version20);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to