Browse Source

restore some types to MT

svn path=/trunk/mcs/; revision=144324
Geoff Norton 16 years ago
parent
commit
32555b5234

+ 1 - 0
mcs/class/System/monotouch_System.dll.sources

@@ -141,6 +141,7 @@ System.Diagnostics/ProcessStartInfo.cs
 System.Diagnostics/ProcessThread.cs
 System.Diagnostics/ProcessThreadCollection.cs
 System.Diagnostics/ProcessWindowStyle.cs
+System.Diagnostics/Stopwatch.cs
 System.Diagnostics/ThreadPriorityLevel.cs
 System.Diagnostics/ThreadState.cs
 System.Diagnostics/ThreadWaitReason.cs

+ 8 - 8
mcs/class/corlib/System.IO/Directory.cs

@@ -44,7 +44,7 @@ using System.Security.Permissions;
 using System.Text;
 using System.Runtime.InteropServices;
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 using System.Security.AccessControl;
 #endif
 
@@ -79,7 +79,7 @@ namespace System.IO
 			return CreateDirectoriesInternal (path);
 		}
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		[MonoLimitation ("DirectorySecurity not implemented")]
 		public static DirectoryInfo CreateDirectory (string path, DirectorySecurity directorySecurity)
 		{
@@ -89,7 +89,7 @@ namespace System.IO
 
 		static DirectoryInfo CreateDirectoriesInternal (string path)
 		{
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 			if (SecurityManager.SecurityEnabled) {
 				new FileIOPermission (FileIOPermissionAccess.Read | FileIOPermissionAccess.Write, path).Demand ();
 			}
@@ -251,7 +251,7 @@ namespace System.IO
 			string result = MonoIO.GetCurrentDirectory (out error);
 			if (error != MonoIOError.ERROR_SUCCESS)
 				throw MonoIO.GetException (error);
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 			if ((result != null) && (result.Length > 0) && SecurityManager.SecurityEnabled) {
 				new FileIOPermission (FileIOPermissionAccess.PathDiscovery, result).Demand ();
 			}
@@ -269,7 +269,7 @@ namespace System.IO
 			return GetFileSystemEntries (path, searchPattern, FileAttributes.Directory, FileAttributes.Directory);
 		}
 		
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		public static string [] GetDirectories (string path, string searchPattern, SearchOption searchOption)
 		{
 			if (searchOption == SearchOption.TopDirectoryOnly)
@@ -302,7 +302,7 @@ namespace System.IO
 			return GetFileSystemEntries (path, searchPattern, FileAttributes.Directory, 0);
 		}
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		public static string[] GetFiles (string path, string searchPattern, SearchOption searchOption)
 		{
 			if (searchOption == SearchOption.TopDirectoryOnly)
@@ -397,7 +397,7 @@ namespace System.IO
 				throw MonoIO.GetException (error);
 		}
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		public static void SetAccessControl (string path, DirectorySecurity directorySecurity)
 		{
 			throw new NotImplementedException ();
@@ -519,7 +519,7 @@ namespace System.IO
 			return result;
 		}
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		[MonoNotSupported ("DirectorySecurity isn't implemented")]
 		public static DirectorySecurity GetAccessControl (string path, AccessControlSections includeSections)
 		{

+ 2 - 2
mcs/class/corlib/System.IO/DirectoryInfo.cs

@@ -35,7 +35,7 @@ using System.Collections;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Text;
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 using System.Security.AccessControl;
 #endif
 
@@ -242,7 +242,7 @@ namespace System.IO {
 			return OriginalPath;
 		}
 
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
 		public DirectoryInfo[] GetDirectories (string searchPattern, SearchOption searchOption)
 		{
 			switch (searchOption) {