[corlib] RuntimeEnvironment from referencesource

diff --git a/external/referencesource b/external/referencesource
index f6109ff2bc79dcb052b61239a78870a866bcd42c..35b7594b5498e9712522e0556ec290415691dddd 160000 (submodule)
--- a/external/referencesource
+++ b/external/referencesource
@@ -1 +1 @@
-Subproject commit f6109ff2bc79dcb052b61239a78870a866bcd42c
+Subproject commit 35b7594b5498e9712522e0556ec290415691dddd

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs b/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs
deleted file mode 100644 (file)
index d280820..0000000
--- a/mcs/class/corlib/System.Runtime.InteropServices/RuntimeEnvironment.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Runtime.InteropServices/RuntimeEnvironment.cs
-//
-// Authors:
-//     Dominik Fretz (roboto@gmx.net)
-//     Sebastien Pouliot (sebastien@ximian.com)
-//
-// (C) 2003 Dominik Fretz
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Permissions;
-
-namespace System.Runtime.InteropServices
-{
-       [ComVisible (true)]
-       public class RuntimeEnvironment
-       {
-               public RuntimeEnvironment ()
-               {
-               }
-
-               public static string SystemConfigurationFile {
-                       get {
-                               // GetMachineConfigPath is internal and not protected by CAS
-                               string path = Environment.GetMachineConfigPath ();
-                               if (SecurityManager.SecurityEnabled) {
-                                       new FileIOPermission (FileIOPermissionAccess.PathDiscovery, path).Demand ();
-                               }
-                               return path;
-                       }
-               }
-
-               public static bool FromGlobalAccessCache (Assembly a)
-               {
-                       // yes, this will throw a NullReferenceException (just like MS, reported as ...)
-                       return a.GlobalAssemblyCache;
-               }
-       
-               public static string GetRuntimeDirectory ()
-               {
-                       return Path.GetDirectoryName (typeof (int).Assembly.Location);  
-               }
-
-               [SecuritySafeCritical]
-               public static string GetSystemVersion ()
-               {
-                       return "v" + Environment.Version.Major + "." + Environment.Version.Minor + "." + Environment.Version.Build;
-               }
-       }
-}

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 4d4fc1260a35fd80bb30dbe281bbe14538f33b6b..464ac076432cab4506909b77961da47cf926fde9 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -398,7 +398,6 @@ System.Runtime.InteropServices/RegistrationConnectionType.cs
 System.Runtime.InteropServices/SEHException.cs
 System.Runtime.InteropServices/STATSTG.cs
 System.Runtime.InteropServices/RegistrationServices.cs
-System.Runtime.InteropServices/RuntimeEnvironment.cs
 System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
 System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
 System.Runtime.InteropServices/SafeBuffer.cs
@@ -1286,6 +1285,7 @@ ReferenceSources/SecurityContext.cs
 ../../../external/referencesource/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs
 
 ../../../external/referencesource/mscorlib/system/runtime/interopservices/attributes.cs
+../../../external/referencesource/mscorlib/system/runtime/interopservices/runtimeenvironment.cs
 ../../../external/referencesource/mscorlib/system/runtime/interopservices/safehandle.cs
 ../../../external/referencesource/mscorlib/system/runtime/interopservices/ucomienumconnections.cs