projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved ProviderCollectionTest.cs from System assembly to System.Configuration.
[mono.git]
/
mcs
/
class
/
corlib
/
System.Reflection
/
AssemblyFlagsAttribute.cs
diff --git
a/mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
b/mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
index e48d4a042766bf57db432c4460cb1b3897fbe86e..4b1cbc4d6cacf0e164f53156929189719fd76f67 100644
(file)
--- a/
mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
+++ b/
mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
@@
-29,15
+29,25
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Runtime.InteropServices;
+
namespace System.Reflection
{
namespace System.Reflection
{
+#if NET_2_0
+ [ComVisible (true)]
+ [AttributeUsage (AttributeTargets.Assembly, Inherited=false)]
+#else
[AttributeUsage (AttributeTargets.Assembly)]
[AttributeUsage (AttributeTargets.Assembly)]
+#endif
public sealed class AssemblyFlagsAttribute : Attribute
{
// Field
private uint flags;
// Constructor
public sealed class AssemblyFlagsAttribute : Attribute
{
// Field
private uint flags;
// Constructor
+#if NET_2_0
+ [Obsolete("")]
+#endif
[CLSCompliant (false)]
public AssemblyFlagsAttribute (uint flags)
{
[CLSCompliant (false)]
public AssemblyFlagsAttribute (uint flags)
{
@@
-45,13
+55,26
@@
namespace System.Reflection
}
#if NET_1_1
}
#if NET_1_1
- public AssemblyFlagsAttribute (int flags)
+#if NET_2_0
+ [Obsolete("")]
+#endif
+ public AssemblyFlagsAttribute (int assemblyFlags)
{
{
- this.flags = (uint)flags;
+ this.flags = (uint)assemblyFlags;
+ }
+#endif
+
+#if NET_2_0
+ public AssemblyFlagsAttribute (AssemblyNameFlags assemblyFlags)
+ {
+ this.flags = (uint)assemblyFlags;
}
#endif
// Property
}
#endif
// Property
+#if NET_2_0
+ [Obsolete("")]
+#endif
[CLSCompliant (false)]
public uint Flags
{
[CLSCompliant (false)]
public uint Flags
{