2006-05-30 Sebastien Pouliot <sebastien@ximian.com>

	* CodeAccessSecurityAttribute.cs: Under 2.0 the ctor is protected.
	* IsolatedStoragePermissionAttribute.cs: Under 2.0 the ctor is 
	protected.
	* IsolatedStoragePermission.cs: Under 2.0 the ctor is protected.
	* SecurityAttribute.cs: Under 2.0 the ctor is protected.


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

5 files changed, 30 insertions, 6 deletions

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index 3eae1ea941d..9f9344ad431 100644
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-30  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* CodeAccessSecurityAttribute.cs: Under 2.0 the ctor is protected.
+	* IsolatedStoragePermissionAttribute.cs: Under 2.0 the ctor is 
+	protected.
+	* IsolatedStoragePermission.cs: Under 2.0 the ctor is protected.
+	* SecurityAttribute.cs: Under 2.0 the ctor is protected.
+
 2006-04-07  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* FileIOPermission.cs: Ensure the "bad" path characters match the OS
diff --git a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
index 5e927414940..69e807a2d5b 100644
--- a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
@@ -5,7 +5,7 @@
 // Created:        2002-01-06 
 //
 // Copyright (C) 2001 Nick Drochak, All Rights Reserved
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -46,7 +46,11 @@ namespace System.Security.Permissions {
 	[Serializable]
 	public abstract class CodeAccessSecurityAttribute : SecurityAttribute {
 
+#if NET_2_0
+		protected CodeAccessSecurityAttribute (SecurityAction action) 
+#else
 		public CodeAccessSecurityAttribute (SecurityAction action) 
+#endif
 			: base (action)
 		{
 		}
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
index b4f6563c1be..46a6d38773e 100644
--- a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
@@ -6,7 +6,7 @@
 //	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2002 Ximian, Inc.			http://www.ximian.com
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -48,7 +48,11 @@ namespace System.Security.Permissions {
 		internal bool m_permanentData;
 		internal IsolatedStorageContainment m_allowed;
 
+#if NET_2_0
+		protected IsolatedStoragePermission (PermissionState state)
+#else
 		public IsolatedStoragePermission (PermissionState state)
+#endif
 		{
 			if (CheckPermissionState (state, true) == PermissionState.Unrestricted) {
 				UsageAllowed = IsolatedStorageContainment.UnrestrictedIsolatedStorage;
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
index eb9e0cc97d5..0650b2c20fc 100644
--- a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
@@ -5,7 +5,7 @@
 //   Dan Lewis (dihlewis@yahoo.co.uk)
 //
 // (C) 2002
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -39,8 +39,12 @@ namespace System.Security.Permissions {
 		AttributeTargets.Method, AllowMultiple=true, Inherited=false)]
 	[Serializable]
 	public abstract class IsolatedStoragePermissionAttribute : CodeAccessSecurityAttribute {
-		
-		public IsolatedStoragePermissionAttribute (SecurityAction action) 
+
+#if NET_2_0
+		protected IsolatedStoragePermissionAttribute (SecurityAction action)
+#else
+		public IsolatedStoragePermissionAttribute (SecurityAction action)
+#endif
 			: base (action)
 		{
 		}
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
index 0a447d8186e..977f94dcf38 100644
--- a/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
@@ -5,7 +5,7 @@
 // Created:        2002-01-06 
 //
 // Copyright (C) 2001 Nick Drochak, All Rights Reserved
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -49,7 +49,11 @@ namespace System.Security.Permissions {
 		private SecurityAction m_Action;
 		private bool m_Unrestricted;
 
+#if NET_2_0
+		protected SecurityAttribute (SecurityAction action) 
+#else
 		public SecurityAttribute (SecurityAction action) 
+#endif
 		{
 			Action = action;
 		}