2005-01-10 Sebastien Pouliot <sebastien@ximian.com>

	* HostSecurityManager.cs: Fix signature as DetermineApplicationTrust
	doesn't return a boolean anymore.
	* SecurityElement.cs: The attributes and children elements are not
	indented in 2.0. This fix many unit tests that do string compares.
	* PermissionSetCollection.cs: We can't trust all IList implementations
	to throw the ArgumentOutOfRangeException - so we better do it here.


svn path=/trunk/mcs/; revision=38662

1 files changed, 11 insertions, 0 deletions

diff --git a/mcs/class/corlib/System.Security/SecurityElement.cs b/mcs/class/corlib/System.Security/SecurityElement.cs
index 1b3b5535ab8..ddc8aad35cf 100755
--- a/mcs/class/corlib/System.Security/SecurityElement.cs
+++ b/mcs/class/corlib/System.Security/SecurityElement.cs
@@ -311,6 +311,8 @@ namespace System.Security
 		{
 			if (xml == null)
 				throw new ArgumentNullException ("xml");
+			if (xml.Length == 0)
+				throw new XmlSyntaxException (Locale.GetText ("Empty string."));
 
 			try {
 				SecurityParser sp = new SecurityParser ();
@@ -390,17 +392,24 @@ namespace System.Security
 		
 		private void ToXml (ref StringBuilder s, int level)
 		{
+#if ! NET_2_0
 			s.Append (' ', level * 3);
+#endif
 			s.Append ("<");
 			s.Append (tag);
 			
 			if (attributes != null) {
+#if NET_2_0
+				s.Append (" ");
+#endif
 				for (int i=0; i < attributes.Count; i++) {
 					SecurityAttribute sa = (SecurityAttribute) attributes [i];
+#if ! NET_2_0
 					s.Append (" ");
 					// all other attributes must align with the first one
 					if (i != 0)
 						s.Append (' ', (level * 3) + tag.Length + 1);
+#endif
 					s.Append (sa.Name)
 					 .Append ("=\"")
 					 .Append (sa.Value)
@@ -420,7 +429,9 @@ namespace System.Security
 					foreach (SecurityElement child in children) {
 						child.ToXml (ref s, level + 1);
 					}
+#if ! NET_2_0
 					s.Append (' ', level * 3);
+#endif
 				}
 				s.Append ("</")
 				 .Append (tag)