Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / corlib / System.Security.Permissions / CodeAccessSecurityAttribute.cs

diff --git a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
index 5e927414940a7c3f7f0d18508ff6088b830f1849..5714862cbde0d9bf3f13786374eed5cf4479fb8a 100644 (file)
--- 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
@@ -28,12 +28,13 @@
 //
 
 using System.Runtime.InteropServices;
-\r
-namespace System.Security.Permissions {\r
-\r
-#if NET_2_0
-       [ComVisible (true)]
+
+namespace System.Security.Permissions {
+
+#if NET_2_1 && !MONOTOUCH
+       [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
+       [ComVisible (true)]
        [AttributeUsage(
                AttributeTargets.Assembly 
                | AttributeTargets.Class 
@@ -46,7 +47,7 @@ namespace System.Security.Permissions {
        [Serializable]
        public abstract class CodeAccessSecurityAttribute : SecurityAttribute {
 
-               public CodeAccessSecurityAttribute (SecurityAction action) 
+               protected CodeAccessSecurityAttribute (SecurityAction action) 
                        : base (action)
                {
                }