Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/corlib/System/Environment.cs

@@ -57,7 +57,7 @@ namespace System {
 		 * of icalls, do not require an increment.
 		 */
 #pragma warning disable 169
-		private const int mono_corlib_version = 140;
+		private const int mono_corlib_version = 149;
 #pragma warning restore 169
 
 		[ComVisible (true)]
@@ -736,10 +736,6 @@ namespace System {
 				return String.Empty;
 			// This is where data common to all users goes
 			case SpecialFolder.CommonApplicationData:
-				Version v = CreateVersionFromString (GetOSVersionString ());
-				if (Platform == PlatformID.MacOSX && v >= new Version(15, 0)) {
-					return "/usr/local/share";
-				}
 				return "/usr/share";
 			default:
 				throw new ArgumentException ("Invalid SpecialFolder");
@@ -900,8 +896,11 @@ namespace System {
 			throw new NotImplementedException ();
 		}
 
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		extern static bool GetIs64BitOperatingSystem ();
+
 		public static bool Is64BitOperatingSystem {
-			get { return IntPtr.Size == 8; } // FIXME: is this good enough?
+			get { return GetIs64BitOperatingSystem (); }
 		}
 
 		public static int SystemPageSize {
@@ -986,6 +985,19 @@ namespace System {
 		{
 
 		}
+
+		// Copied from referencesource Environment
+		internal static String GetStackTrace(Exception e, bool needFileInfo)
+		{
+			System.Diagnostics.StackTrace st;
+			if (e == null)
+				st = new System.Diagnostics.StackTrace(needFileInfo);
+			else
+				st = new System.Diagnostics.StackTrace(e, needFileInfo);
+
+			// Do not include a trailing newline for backwards compatibility
+			return st.ToString( System.Diagnostics.StackTrace.TraceFormat.Normal );
+		}
 	}
 }