* RuntimeEnvironment.cs: Implemented SystemConfigurationFile and

	  GetSystemVersion().

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

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index a6fdecc47bf13822c317699b512466c5cebdf35b..697f7c1bdebd2193237e58bf66bdddff446e293f 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-29  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * RuntimeEnvironment.cs: Implemented SystemConfigurationFile and
+         GetSystemVersion().
 
 Wed Jul 14 19:28:57 CEST 2004 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs b/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs
index c2044c74943c21936a798edad89b1d22c79a6e10..e5bc822b494747c97c8aa0442619fb3f35c31e2b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs
@@ -42,10 +42,9 @@ namespace System.Runtime.InteropServices
                {
                }
 
-               [MonoTODO]
                public static string SystemConfigurationFile 
                {
-                       get { return String.Empty; }
+                       get { return Environment.GetMachineConfigPath (); }
                }
 
                
@@ -61,13 +60,9 @@ namespace System.Runtime.InteropServices
                        return Path.GetDirectoryName (typeof (int).Assembly.Location);  
                }
 
-               [MonoTODO]
                public static string GetSystemVersion ()
                {
-                       //TODO We give back the .Net (1.1) version nummber. Probabbly Environment.Version should also return this.
-
-                       // We probably want to return the mono runtime version here -Gonzalo
-                       return "v1.1.4322";
+                       return "v" + Environment.Version.Major + "." + Environment.Version.Minor + "." + Environment.Version.Build;
                }
                
        }