Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/corlib/System.Security.Policy/ApplicationDirectory.cs

@@ -40,9 +40,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class ApplicationDirectory :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IBuiltInEvidence {
 		
 		private string directory;

mcs/class/corlib/System.Security.Policy/ApplicationTrust.cs

@@ -40,9 +40,7 @@ namespace System.Security.Policy
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class ApplicationTrust :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		ISecurityEncodable {
 
 		private ApplicationIdentity _appid;
@@ -65,11 +63,7 @@ namespace System.Security.Policy
 			_appid = applicationIdentity;
 		}
 		
-#if NET_4_0
 		public
-#else
-		internal
-#endif
 		ApplicationTrust (PermissionSet defaultGrantSet, IEnumerable<StrongName> fullTrustAssemblies)
 		{
 			if (defaultGrantSet == null)
@@ -205,13 +199,11 @@ namespace System.Security.Policy
 			return se;
 		}
 		
-#if NET_4_0		
 		public IList<StrongName> FullTrustAssemblies {
 			get {
 				return fullTrustAssemblies;
 			}
 		}
-#endif		
 
 		// internal stuff
 

mcs/class/corlib/System.Security.Policy/Evidence.cs

@@ -61,9 +61,7 @@ namespace System.Security.Policy {
 				Merge (evidence);	
 		}
 
-#if NET_4_0
 		[Obsolete]
-#endif
 		public Evidence (object[] hostEvidence, object[] assemblyEvidence)
 		{
 			if (null != hostEvidence)
@@ -76,9 +74,7 @@ namespace System.Security.Policy {
 		// Public Properties
 		//
 	
-#if NET_4_0
 		[Obsolete]
-#endif
 		public int Count {
 			get {
 				int count = 0;
@@ -130,17 +126,13 @@ namespace System.Security.Policy {
 		// Public Methods
 		//
 
-#if NET_4_0
 		[Obsolete]
-#endif
 		public void AddAssembly (object id) 
 		{
 			AssemblyEvidenceList.Add (id);
 		}
 
-#if NET_4_0
 		[Obsolete]
-#endif
 		public void AddHost (object id) 
 		{
 			if (_locked && SecurityManager.SecurityEnabled) {
@@ -158,9 +150,7 @@ namespace System.Security.Policy {
 				assemblyEvidenceList.Clear ();
 		}
 
-#if NET_4_0
 		[Obsolete]
-#endif
 		public void CopyTo (Array array, int index) 
 		{
 			int hc = 0;
@@ -173,51 +163,8 @@ namespace System.Security.Policy {
 				assemblyEvidenceList.CopyTo (array, index + hc);
 		}
 
-#if !NET_4_0
-		[ComVisible (false)]
-		public override bool Equals (object obj)
-		{
-			if (obj == null)
-				return false;
-			Evidence e = (obj as Evidence);
-			if (e == null)
-				return false;
 
-			if (HostEvidenceList.Count != e.HostEvidenceList.Count)
-				return false;
-			if (AssemblyEvidenceList.Count != e.AssemblyEvidenceList.Count)
-				return false;
-
-			for (int i = 0; i < hostEvidenceList.Count; i++) {
-				bool found = false;
-				for (int j = 0; j < e.hostEvidenceList.Count; i++) {
-					if (hostEvidenceList [i].Equals (e.hostEvidenceList [j])) {
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-					return false;
-			}
-			for (int i = 0; i < assemblyEvidenceList.Count; i++) {
-				bool found = false;
-				for (int j = 0; j < e.assemblyEvidenceList.Count; i++) {
-					if (assemblyEvidenceList [i].Equals (e.assemblyEvidenceList [j])) {
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-					return false;
-			}
-			
-			return true;
-		}
-#endif
-
-#if NET_4_0
 		[Obsolete]
-#endif
 		public IEnumerator GetEnumerator () 
 		{
 			IEnumerator he = null;
@@ -234,23 +181,6 @@ namespace System.Security.Policy {
 			return AssemblyEvidenceList.GetEnumerator ();
 		}
 
-#if !NET_4_0
-		[ComVisible (false)]
-		public override int GetHashCode ()
-		{
-			int _hashCode = 0;
-			if (hostEvidenceList != null) {
-				for (int i = 0; i < hostEvidenceList.Count; i++)
-					_hashCode ^= hostEvidenceList [i].GetHashCode ();
-			}
-			if (assemblyEvidenceList != null) {
-				for (int i = 0; i < assemblyEvidenceList.Count; i++)
-					_hashCode ^= assemblyEvidenceList [i].GetHashCode ();
-			}
-			
-			return _hashCode;
-		}
-#endif
 		public IEnumerator GetHostEnumerator () 
 		{
 			return HostEvidenceList.GetEnumerator ();

mcs/class/corlib/System.Security.Policy/EvidenceBase.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
 
 using System.Security.Permissions;
 
@@ -44,4 +43,3 @@ namespace System.Security.Policy
 	}
 }
 
-#endif

mcs/class/corlib/System.Security.Policy/Gac.cs

@@ -35,9 +35,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class GacInstalled :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence {
 
 		public GacInstalled ()

mcs/class/corlib/System.Security.Policy/Hash.cs

@@ -42,9 +42,7 @@ namespace System.Security.Policy {
 [Serializable]
 [ComVisible (true)]
 public sealed class Hash :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		ISerializable, IBuiltInEvidence {
 
 	private Assembly assembly;

mcs/class/corlib/System.Security.Policy/PermissionRequestEvidence.cs

@@ -35,9 +35,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class PermissionRequestEvidence :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IBuiltInEvidence {
 
 		private PermissionSet requested, optional, denied;

mcs/class/corlib/System.Security.Policy/Publisher.cs

@@ -36,9 +36,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class Publisher :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence {
 	
 		private X509Certificate m_cert;

mcs/class/corlib/System.Security.Policy/Site.cs

@@ -40,9 +40,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class Site:
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence {
 
 		internal string origin_site;

mcs/class/corlib/System.Security.Policy/StrongName.cs

@@ -35,9 +35,7 @@ namespace System.Security.Policy {
 [Serializable]
 [ComVisible (true)]
 public sealed class StrongName :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence {
 
 	private StrongNamePublicKeyBlob publickey;

mcs/class/corlib/System.Security.Policy/Url.cs

@@ -40,9 +40,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class Url :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence {
 
                 private string origin_url;

mcs/class/corlib/System.Security.Policy/Zone.cs

@@ -40,9 +40,7 @@ namespace System.Security.Policy {
 	[Serializable]
 	[ComVisible (true)]
 	public sealed class Zone :
-#if NET_4_0
 		EvidenceBase,
-#endif
 		IIdentityPermissionFactory, IBuiltInEvidence	{
 
 		private SecurityZone zone;