diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-06-09 15:12:35 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-06-09 15:12:35 +0400 |
| commit | d14ba5bfe97f119c163e3a7a850df9219f225f0f (patch) | |
| tree | 767056a784ba2c102d262d3cc14c29edf85b8863 /mcs/class/corlib/System.Security.Permissions | |
| parent | fae5147e4c1b4ded64e5b079c0e3a6d7e4f3a8c3 (diff) | |
2005-06-09 Sebastien Pouliot <sebastien@ximian.com>
* all: Added ComVisible(true) and some Obsolete attributes for NET_2_0
svn path=/trunk/mcs/; revision=45686
Diffstat (limited to 'mcs/class/corlib/System.Security.Permissions')
47 files changed, 294 insertions, 259 deletions
diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index da181180e59..81be8cf8076 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,7 @@ +2005-06-09 Sebastien Pouliot <sebastien@ximian.com> + + * all: Added ComVisible(true) and some Obsolete attributes for NET_2_0 + 2005-06-07 Sebastien Pouliot <sebastien@ximian.com> * IsolatedStorageFilePermission.cs: Removed unrequired TODO on ctor. diff --git a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs index f7bb4c2009b..5e927414940 100644 --- a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs @@ -1,16 +1,11 @@ -//------------------------------------------------------------------------------ // // System.Security.Permissions.SecurityPermissionAttribute.cs // -// Copyright (C) 2001 Nick Drochak, All Rights Reserved -// // Author: Nick Drochak, ndrochak@gol.com // Created: 2002-01-06 // -//------------------------------------------------------------------------------ - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2001 Nick Drochak, All Rights Reserved +// Copyright (C) 2004-2005 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 @@ -32,8 +27,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage( AttributeTargets.Assembly | AttributeTargets.Class diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs index 15b88492e32..7ac551cd59f 100644 --- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs @@ -7,7 +7,7 @@ // // Copyright (C) 2002, Tim Coleman // Portions Copyright (C) 2003 Motus Technologies (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -30,10 +30,14 @@ // using System.Collections; +using System.Runtime.InteropServices; using System.Text; - -namespace System.Security.Permissions { - +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class EnvironmentPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs index a019b339927..bf3a15bf414 100644 --- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs +++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs @@ -8,9 +8,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,30 +30,19 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif [Flags] public enum EnvironmentPermissionAccess { - /// <summary> - /// </summary> NoAccess = 0x00000000, - - /// <summary> - /// </summary> Read = 0x00000001, - - /// <summary> - /// </summary> Write = 0x00000002, - - /// <summary> - /// </summary> AllAccess = Read | Write, - } // EnvironmentPermissionAccess - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs index c544f48a701..acc0624717f 100644 --- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs @@ -7,7 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions Copyright (C) 2003 Motus Technologies (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,8 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs index e59a1711be1..0c44cb8d69d 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // Copyright (C) 2003 Motus Technologies. http://www.motus.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -27,8 +27,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class FileDialogPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs index 092583ae96b..248579b34c0 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs @@ -4,10 +4,7 @@ // Author: Duncan Mak (duncan@ximian.com) // // (C) Ximian, Inc. http://www.ximian.com -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,13 +26,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; +using System.Runtime.InteropServices; + +namespace System.Security.Permissions { -namespace System.Security.Permissions -{ - [Flags] [Serializable] - public enum FileDialogPermissionAccess - { +#if NET_2_0 + [ComVisible (true)] +#endif + [Flags] + [Serializable] + public enum FileDialogPermissionAccess { None = 0, Open = 1, Save = 2, diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs index 770a3b535ae..9b75d99cc8b 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs @@ -3,14 +3,11 @@ // // Authors // Duncan Mak <duncan@ximian.com> -// Sebastien Pouliot <spouliot@motus.com> +// Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions Copyright (C) 2003 Motus Technologies (http://www.motus.com) -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,10 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; - -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] @@ -47,7 +47,10 @@ namespace System.Security.Permissions { private bool canSave; // Constructor - public FileDialogPermissionAttribute (SecurityAction action) : base (action) {} + public FileDialogPermissionAttribute (SecurityAction action) + : base (action) + { + } // Properties public bool Open { diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs index 32581496223..42f24958efa 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs @@ -6,7 +6,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // Copyright (C) 2001 Nick Drochak, All Rights Reserved
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,6 +39,9 @@ using System.Security.AccessControl; namespace System.Security.Permissions {
+#if NET_2_0 + [ComVisible (true)] +#endif [Serializable]
public sealed class FileIOPermission
: CodeAccessPermission, IBuiltInPermission, IUnrestrictedPermission {
diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs index 9e874e73309..f1ca699197c 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs @@ -8,9 +8,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,38 +30,21 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif [Flags] public enum FileIOPermissionAccess { - /// <summary> - /// </summary> NoAccess = 0x00000000, - - /// <summary> - /// </summary> Read = 0x00000001, - - /// <summary> - /// </summary> Write = 0x00000002, - - /// <summary> - /// </summary> Append = 0x00000004, - - /// <summary> - /// </summary> PathDiscovery = 0x00000008, - - /// <summary> - /// </summary> AllAccess = Read | Write | Append | PathDiscovery, - } // FileIOPermissionAccess - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs index 92666454536..f5c1fcb2cb7 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs @@ -7,7 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions Copyright (C) 2003 Motus Technologies (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,8 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs index 15355694394..7604ef5a34d 100644 --- a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs @@ -4,7 +4,7 @@ // Author: // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,9 +29,11 @@ #if NET_2_0 using System.Globalization; - -namespace System.Security.Permissions { - +using System.Runtime.InteropServices; +
+namespace System.Security.Permissions {
+
+ [ComVisible (true)] [Serializable] public sealed class GacIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs index 52e046d5b4d..93fe70a3545 100644 --- a/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs @@ -4,7 +4,7 @@ // Author: // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,11 +28,14 @@ #if NET_2_0 +using System.Runtime.InteropServices; + namespace System.Security.Permissions { [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Delegate, AllowMultiple = true, Inherited = false)] + [ComVisible (true)] [Serializable] public sealed class HostProtectionAttribute : CodeAccessSecurityAttribute { @@ -89,6 +92,7 @@ namespace System.Security.Permissions { } } + [ComVisible (true)] public bool SecurityInfrastructure { get { return ((_resources & HostProtectionResource.SecurityInfrastructure) != 0); } set { diff --git a/mcs/class/corlib/System.Security.Permissions/HostProtectionResource.cs b/mcs/class/corlib/System.Security.Permissions/HostProtectionResource.cs index 84732693597..031c9fc3086 100644 --- a/mcs/class/corlib/System.Security.Permissions/HostProtectionResource.cs +++ b/mcs/class/corlib/System.Security.Permissions/HostProtectionResource.cs @@ -4,7 +4,7 @@ // Author: // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ #if NET_2_0 -using System; +using System.Runtime.InteropServices; namespace System.Security.Permissions { [Flags] [Serializable] + [ComVisible (true)] public enum HostProtectionResource { None = 0, Synchronization = 1, diff --git a/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs b/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs index 840fb9353b0..9c437677077 100644 --- a/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs @@ -5,10 +5,7 @@ // Nick Drochak(ndrochak@gol.com)
//
// (C) Nick Drochak
-//
- -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,10 +26,15 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Runtime.InteropServices; namespace System.Security.Permissions {
+#if NET_2_0 + [ComVisible (true)] +#endif public interface IUnrestrictedPermission {
- bool IsUnrestricted();
+ bool IsUnrestricted ();
}
}
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs index f1a6c25a371..25038d376fa 100644 --- a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs @@ -7,7 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions (C) 2002 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,8 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs index 652628095b0..8b6dc67f0f6 100644 --- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs @@ -4,7 +4,7 @@ // Author // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,10 +29,12 @@ #if NET_2_0 using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { [Serializable] + [ComVisible (true)] public sealed class KeyContainerPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { private KeyContainerPermissionAccessEntryCollection _accessEntries; diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs index 4bc676e3464..67468829ac6 100644 --- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs +++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs @@ -4,7 +4,7 @@ // Author // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,11 +29,13 @@ #if NET_2_0 using System.Globalization; +using System.Runtime.InteropServices; using System.Security.Cryptography; namespace System.Security.Permissions { [Serializable] + [ComVisible (true)] public sealed class KeyContainerPermissionAccessEntry { private KeyContainerPermissionFlags _flags; diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntryCollection.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntryCollection.cs index cf22e56f961..15fc6e18bbf 100644 --- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntryCollection.cs +++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntryCollection.cs @@ -4,7 +4,7 @@ // Author // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -30,10 +30,12 @@ using System.Collections; using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { [Serializable] + [ComVisible (true)] public sealed class KeyContainerPermissionAccessEntryCollection : ICollection, IEnumerable { private ArrayList _list; diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAttribute.cs index cd58beeb2d3..d14711f32fd 100644 --- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAttribute.cs @@ -4,7 +4,7 @@ // Author // Sebastien Pouliot <sebastien@ximian.com> // -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,12 +29,14 @@ #if NET_2_0 using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = true, Inherited = false)] + [ComVisible (true)] [Serializable] public sealed class KeyContainerPermissionAttribute : CodeAccessSecurityAttribute { diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs index bd0519b65f0..9022f9e4ce4 100644 --- a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs @@ -29,6 +29,7 @@ // using System.IO; +using System.Runtime.InteropServices; using System.Security.Policy; using System.Text; @@ -37,6 +38,9 @@ using Mono.Xml; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionState.cs b/mcs/class/corlib/System.Security.Permissions/PermissionState.cs index ac68d9d2ebf..04068d9ff5e 100644 --- a/mcs/class/corlib/System.Security.Permissions/PermissionState.cs +++ b/mcs/class/corlib/System.Security.Permissions/PermissionState.cs @@ -8,9 +8,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,21 +30,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif public enum PermissionState { - /// <summary> - /// </summary> Unrestricted = 1, - - /// <summary> - /// </summary> None = 0, - } // PermissionState - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs index f123b60c773..0f7066c8318 100644 --- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // Copyright (C) 2003 Motus Technologies. http://www.motus.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -34,6 +34,9 @@ using System.Threading; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class PrincipalPermission : IPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs index a41a3b7321a..2dd9f04994d 100644 --- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs @@ -6,7 +6,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,8 +28,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] [Serializable] public sealed class PrincipalPermissionAttribute : CodeAccessSecurityAttribute { diff --git a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs index 0a53523a184..e3a61c4b228 100644 --- a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs @@ -5,8 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com) -// (C) 2004 Novell (http://www.novell.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 +27,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; using System.Security.Cryptography.X509Certificates; using Mono.Security.Cryptography; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class PublisherIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs index 0e7b5b0efd7..80d034feb92 100644 --- a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs @@ -5,8 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// (C) 2004 Novell (http://www.novell.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 +27,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; using SSCX = System.Security.Cryptography.X509Certificates; using Mono.Security.Cryptography; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs index ef9cfe1f5ed..bb7dabcfad3 100644 --- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs @@ -7,7 +7,7 @@ // // Copyright (C) 2002, Tim Coleman // Portions (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -30,9 +30,13 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class ReflectionPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs index 53f102bf97a..2d82b3a27f9 100644 --- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs @@ -7,10 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions Copyright (C) 2003 Motus Technologies (http://www.motus.com) -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,10 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs index ec4df411e37..7fdfb641793 100644 --- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs +++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs @@ -8,9 +8,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,34 +30,26 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> [Flags] +#if NET_2_0 + [ComVisible (true)] +#endif public enum ReflectionPermissionFlag { - /// <summary> - /// </summary> NoFlags = 0x00000000, - - /// <summary> - /// </summary> +#if NET_2_0 + [Obsolete ("not used anymore")] +#endif TypeInformation = 0x00000001, - /// <summary> - /// </summary> MemberAccess = 0x00000002, - /// <summary> - /// </summary> ReflectionEmit = 0x4, - /// <summary> - /// </summary> - AllFlags = TypeInformation | MemberAccess | ReflectionEmit, - } // ReflectionPermissionFlag - -} // System.Security.Permissions + AllFlags = TypeInformation | MemberAccess | ReflectionEmit + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs index c2950ec93a1..3dd0615f68e 100644 --- a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs +++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs @@ -8,9 +8,7 @@ // URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,34 +30,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif [Flags] public enum RegistryPermissionAccess { - /// <summary> - /// </summary> NoAccess = 0, - - /// <summary> - /// </summary> Read = 1, - - /// <summary> - /// </summary> Write = 2, - - /// <summary> - /// </summary> Create = 4, - - /// <summary> - /// </summary> AllAccess = 7, - } // RegistryPermissionAccess - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs index 6d7a88fecde..118440add13 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs @@ -9,7 +9,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -31,9 +31,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { #if NET_2_0 || BOOTSTRAP_NET_2_0 + [ComVisible (true)] [Serializable] #endif public enum SecurityAction { @@ -47,8 +50,11 @@ namespace System.Security.Permissions { RequestOptional = 9, RequestRefuse = 10, #if NET_2_0 || BOOTSTRAP_NET_2_0 + [Obsolete ("to be removed before 2.0 RTM")] LinkDemandChoice = 16, + [Obsolete ("to be removed before 2.0 RTM")] InheritanceDemandChoice = 17, + [Obsolete ("to be removed before 2.0 RTM")] DemandChoice = 18 #endif } diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs index da39130e4c5..0a447d8186e 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs @@ -1,16 +1,11 @@ -//------------------------------------------------------------------------------ // // System.Security.Permissions.SecurityAttribute.cs // -// Copyright (C) 2001 Nick Drochak, All Rights Reserved -// // Author: Nick Drochak, ndrochak@gol.com // Created: 2002-01-06 // -//------------------------------------------------------------------------------ - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2001 Nick Drochak, All Rights Reserved +// Copyright (C) 2004-2005 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 @@ -32,8 +27,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage( AttributeTargets.Assembly | AttributeTargets.Class diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs index 9f970097c69..4240ccb938d 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs @@ -7,7 +7,7 @@ // // (C) 2002 // Portions (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -30,9 +30,14 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { - + +#if NET_2_0 + [ComVisible (true)] +#endif + [Serializable] public sealed class SecurityPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs index 389503f46b7..594e38e1b97 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs @@ -1,16 +1,11 @@ -//------------------------------------------------------------------------------ // // System.Security.Permissions.SecurityPermissionAttribute.cs // -// Copyright (C) 2001 Nick Drochak, All Rights Reserved -// // Author: Nick Drochak, ndrochak@gol.com // Created: 2002-01-06 // -//------------------------------------------------------------------------------ - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2001 Nick Drochak, All Rights Reserved +// Copyright (C) 2004-2005 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 @@ -32,11 +27,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.Security; +using System.Runtime.InteropServices; namespace System.Security.Permissions { - [System.AttributeUsage( + +#if NET_2_0 + [ComVisible (true)] +#endif + [AttributeUsage ( System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Struct @@ -180,6 +178,9 @@ namespace System.Security.Permissions { } } +#if NET_2_0 + [ComVisible (true)] +#endif public bool Infrastructure { get { return ((m_Flags & SecurityPermissionFlag.Infrastructure) != 0); diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs index 8b9c7c502c7..93db283ba63 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs @@ -8,9 +8,7 @@ // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,8 +30,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Flags] [Serializable] public enum SecurityPermissionFlag { diff --git a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs index 0ef0a7e3591..f047dac1fea 100644 --- a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // Copyright (C) 2003 Motus Technologies. http://www.motus.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,9 +28,13 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class SiteIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs index 61e31e6a7cb..bed29d28f39 100644 --- a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs @@ -6,7 +6,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,8 +28,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs index f8f31b3c99b..257dc63cc62 100644 --- a/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,9 +29,13 @@ using System.Collections; using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class StrongNameIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs index 97bd04ac8f7..66e39b0f5e2 100644 --- a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs @@ -6,7 +6,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,9 +29,13 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNamePublicKeyBlob.cs b/mcs/class/corlib/System.Security.Permissions/StrongNamePublicKeyBlob.cs index d6bbbda9362..3b7a657737f 100644 --- a/mcs/class/corlib/System.Security.Permissions/StrongNamePublicKeyBlob.cs +++ b/mcs/class/corlib/System.Security.Permissions/StrongNamePublicKeyBlob.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -27,11 +27,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; +using System.Runtime.InteropServices; using System.Text; namespace System.Security.Permissions { +#if NET_2_0 +[ComVisible (true)] +#endif [Serializable] public sealed class StrongNamePublicKeyBlob { diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermission.cs b/mcs/class/corlib/System.Security.Permissions/UIPermission.cs index 955ede71aed..a53a651ce34 100644 --- a/mcs/class/corlib/System.Security.Permissions/UIPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/UIPermission.cs @@ -5,7 +5,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // Copyright (C) 2003 Motus Technologies. http://www.motus.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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,9 +28,13 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class UIPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs index 6bf355c4726..84ffb92412d 100644 --- a/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs @@ -4,10 +4,7 @@ // Duncan Mak <duncan@ximian.com> // // (C) 2002 Ximian, Inc. http://www.ximian.com -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,10 +26,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] @@ -44,17 +44,17 @@ namespace System.Security.Permissions { private UIPermissionWindow window; // Constructor - public UIPermissionAttribute (SecurityAction action) : base (action) {} + public UIPermissionAttribute (SecurityAction action) : base (action) + { + } // Properties - public UIPermissionClipboard Clipboard - { + public UIPermissionClipboard Clipboard { get { return clipboard; } set { clipboard = value; } } - public UIPermissionWindow Window - { + public UIPermissionWindow Window { get { return window; } set { window = value; } } diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs index 678e5e51d94..8b2d445f784 100644 --- a/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs +++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs @@ -8,9 +8,7 @@ // URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,25 +30,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif public enum UIPermissionClipboard { - /// <summary> - /// </summary> NoClipboard = 0, - - /// <summary> - /// </summary> OwnClipboard = 1, - - /// <summary> - /// </summary> AllClipboard = 2, - } // UIPermissionClipboard - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs index d03d28f0c05..ecf74635b4b 100644 --- a/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs +++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs @@ -8,9 +8,7 @@ // URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml // // (C) 2001 Ximian, Inc. http://www.ximian.com - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,29 +30,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; namespace System.Security.Permissions { - - /// <summary> - /// </summary> +#if NET_2_0 + [ComVisible (true)] +#endif public enum UIPermissionWindow { - /// <summary> - /// </summary> NoWindows = 0, - - /// <summary> - /// </summary> SafeSubWindows = 1, - - /// <summary> - /// </summary> SafeTopLevelWindows = 2, - - /// <summary> - /// </summary> AllWindows = 3, - } // UIPermissionWindow - -} // System.Security.Permissions + } +} diff --git a/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs index 16aa6358626..49d1fb5ea18 100644 --- a/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs @@ -7,7 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,8 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] diff --git a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs index d80c6f5a30c..0e6ca4a583d 100644 --- a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs @@ -6,7 +6,7 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2002 Ximian, Inc (http://www.ximian.com) -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -29,9 +29,13 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [Serializable] public sealed class ZoneIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs index c11a6424851..4332dfc83d4 100644 --- a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs @@ -7,10 +7,7 @@ // // (C) 2002 Ximian, Inc. http://www.ximian.com // Portions (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2004-2005 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 @@ -32,8 +29,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security.Permissions { +#if NET_2_0 + [ComVisible (true)] +#endif [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple=true, Inherited=false)] |