Remove CAS attributes from System.Drawing (#4544)

4 files changed, 14 insertions, 3 deletions

diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/EditorAttribute.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/EditorAttribute.cs
index 55b5420f131..c3f493f88dc 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/EditorAttribute.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/EditorAttribute.cs
@@ -10,8 +10,7 @@ namespace System.ComponentModel {
     
     using System.Diagnostics;
     using System.Globalization;
-    using System.Security.Permissions;
-                                
+
     /// <devdoc>
     ///    <para>Specifies the editor to use to change a property. This class cannot be inherited.</para>
     /// </devdoc>
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/ExpandableObjectConverter.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/ExpandableObjectConverter.cs
index 7e24c906e59..0b51b472add 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/ExpandableObjectConverter.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/ExpandableObjectConverter.cs
@@ -9,14 +9,18 @@ namespace System.ComponentModel {
     using System.Collections;
     using System.ComponentModel.Design;
     using System.Diagnostics;
+#if MONO_FEATURE_CAS
     using System.Security.Permissions;
+#endif
 
     /// <devdoc>
     ///    <para>Provides
     ///       a type converter to convert expandable objects to and from various
     ///       other representations.</para>
     /// </devdoc>
+#if MONO_FEATURE_CAS
     [HostProtection(SharedState = true)]
+#endif
     public class ExpandableObjectConverter : TypeConverter {
     
         /// <devdoc>
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/InvalidEnumArgumentException.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/InvalidEnumArgumentException.cs
index 792d9f055c1..24784e96efc 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/InvalidEnumArgumentException.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/InvalidEnumArgumentException.cs
@@ -10,12 +10,16 @@ namespace System.ComponentModel {
     using System.Diagnostics;
     using System.Globalization;
     using System.Runtime.Serialization;
+#if MONO_FEATURE_CAS
     using System.Security.Permissions;
+#endif
     
     /// <devdoc>
     ///    <para>The exception that is thrown when using invalid arguments that are enumerators.</para>
     /// </devdoc>
+#if MONO_FEATURE_CAS
     [HostProtection(SharedState = true)]
+#endif
     [Serializable]
     public class InvalidEnumArgumentException : ArgumentException {
 
diff --git a/mcs/class/referencesource/System/compmod/system/componentmodel/design/serialization/InstanceDescriptor.cs b/mcs/class/referencesource/System/compmod/system/componentmodel/design/serialization/InstanceDescriptor.cs
index 8f218d666f6..79005f43815 100644
--- a/mcs/class/referencesource/System/compmod/system/componentmodel/design/serialization/InstanceDescriptor.cs
+++ b/mcs/class/referencesource/System/compmod/system/componentmodel/design/serialization/InstanceDescriptor.cs
@@ -10,15 +10,19 @@ namespace System.ComponentModel.Design.Serialization {
     using System.Collections;
     using System.Diagnostics;
     using System.Reflection;
+#if MONO_FEATURE_CAS 
     using System.Security.Permissions;
+#endif
 
     /// <devdoc>
     ///     EventArgs for the ResolveNameEventHandler.  This event is used
     ///     by the serialization process to match a name to an object
     ///     instance.
     /// </devdoc>
-    [HostProtection(SharedState = true)]
+#if MONO_FEATURE_CAS 
+    [HostProtection(SharedState = true)]		
     [System.Security.Permissions.PermissionSetAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Name = "FullTrust")]
+#endif
     public sealed class InstanceDescriptor {
         private MemberInfo  member;
         private ICollection arguments;