Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs

@@ -112,6 +112,10 @@ namespace System.Security.Permissions {
 			throw new NotImplementedException ();
 		}
 
+		internal FileIOPermission (FileIOPermissionAccess access, string[] pathList, bool checkForDuplicates, bool needFullPath)
+		{
+		}
+
 		public FileIOPermissionAccess AllFiles {
 			get { return m_AllFilesAccess; } 
 			set {

mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs

@@ -39,12 +39,16 @@ namespace System.Security.Permissions {
 
 		private HostProtectionResource _resources;
 
+#if BOOTSTRAP_BASIC
+		public HostProtectionAttribute (SecurityAction action = SecurityAction.LinkDemand)
+#else
 		public HostProtectionAttribute ()
 			: base (SecurityAction.LinkDemand) 
 		{
 		}
 
 		public HostProtectionAttribute (SecurityAction action)
+#endif
 			: base (action) 
 		{
 			if (action != SecurityAction.LinkDemand) {

mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs

@@ -119,8 +119,7 @@ namespace System.Security.Permissions {
 				}
 				a = esd.Attribute ("UserQuota");
 				if (a != null) {
-					Exception exc;
-					Int64.Parse (a, true, out m_userQuota, out exc);
+					m_userQuota = Int64.Parse (a, CultureInfo.InvariantCulture);
 				}
 			}
 		}

mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs

@@ -170,7 +170,7 @@ namespace System.Security.Permissions {
 
 		private void SetFlags (KeyContainerPermissionFlags flags)
 		{
-			if ((flags & KeyContainerPermissionFlags.AllFlags) != 0) {
+			if ((flags & KeyContainerPermissionFlags.AllFlags) == 0) {
 				string msg = String.Format (Locale.GetText ("Invalid enum {0}"), flags);
 				throw new ArgumentException (msg, "KeyContainerPermissionFlags");
 			}

mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs

@@ -73,9 +73,7 @@ namespace System.Security.Permissions {
 			}
 		}
 		
-#if NET_4_0
 		[Obsolete]
-#endif
 		public bool ReflectionEmit
 		{
 			get { return reflectionEmit; }

mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs

@@ -45,14 +45,10 @@ namespace System.Security.Permissions {
 		TypeInformation = 0x00000001,
 
 		MemberAccess = 0x00000002,
-#if NET_4_0
 		[Obsolete]
-#endif
 		ReflectionEmit = 0x4,
 
-#if NET_4_0
 		[Obsolete]
-#endif
 		AllFlags = TypeInformation | MemberAccess | ReflectionEmit,
 
 		[ComVisible (false)]

mcs/class/corlib/System.Security.Permissions/SecurityAction.cs

@@ -43,24 +43,16 @@ namespace System.Security.Permissions {
 	public enum SecurityAction {
 		Demand = 2,
 		Assert = 3,
-#if NET_4_0
 		[Obsolete ("This requests should not be used")]
-#endif
 		Deny = 4,
 		PermitOnly = 5,
 		LinkDemand = 6,
 		InheritanceDemand = 7,
-#if NET_4_0
 		[Obsolete ("This requests should not be used")]
-#endif
 		RequestMinimum = 8,
-#if NET_4_0
 		[Obsolete ("This requests should not be used")]
-#endif
 		RequestOptional = 9,
-#if NET_4_0
 		[Obsolete ("This requests should not be used")]
-#endif
 		RequestRefuse = 10,
 	}
 }