Author: zoltan
Date: 2005-06-06 14:28:09 -0400 (Mon, 06 Jun 2005)
New Revision: 45516
Added:
trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseOptions.cs
trunk/mcs/class/corlib/System.Reflection/PortableExecutableKinds.cs
Removed:
trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs
trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs
Modified:
trunk/mcs/class/corlib/System.Reflection/ChangeLog
trunk/mcs/class/corlib/System.Reflection/Module.cs
trunk/mcs/class/corlib/System.Reflection/ObfuscateAssemblyAttribute.cs
trunk/mcs/class/corlib/System.Reflection/ObfuscationAttribute.cs
Log:
2005-06-06 Zoltan Varga <[EMAIL PROTECTED]>
* *.cs: Updates for net 2.0 beta 2.
Modified: trunk/mcs/class/corlib/System.Reflection/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ChangeLog 2005-06-06 18:24:28 UTC
(rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/ChangeLog 2005-06-06 18:28:09 UTC
(rev 45516)
@@ -1,5 +1,7 @@
2005-06-06 Zoltan Varga <[EMAIL PROTECTED]>
+ * *.cs: Updates for net 2.0 beta 2.
+
* *.cs: Add net 2.0 ComVisibleAttribute.
2005-06-04 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
Deleted:
trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs
2005-06-06 18:24:28 UTC (rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -1,50 +0,0 @@
-//
-// System.Reflection/ExceptionHandlingClauseFlags.cs
-//
-// Author:
-// Zoltan Varga ([EMAIL PROTECTED])
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-#if NET_2_0
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace System.Reflection {
-
-#if NET_2_0
- [ComVisible (true)]
-#endif
- [Flags]
- public enum ExceptionHandlingClauseFlags {
- Clause = 0x0,
- Filter = 0x1,
- Finally = 0x2,
- Fault = 0x4
- }
-
-}
-
-#endif
Copied:
trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseOptions.cs
(from rev 45510,
trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs)
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseFlags.cs
2005-06-06 18:03:29 UTC (rev 45510)
+++ trunk/mcs/class/corlib/System.Reflection/ExceptionHandlingClauseOptions.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -0,0 +1,50 @@
+//
+// System.Reflection/ExceptionHandlingClauseOptions.cs
+//
+// Author:
+// Zoltan Varga ([EMAIL PROTECTED])
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+
+#if NET_2_0
+ [ComVisible (true)]
+#endif
+ [Flags]
+ public enum ExceptionHandlingClauseOptions {
+ Clause = 0x0,
+ Filter = 0x1,
+ Finally = 0x2,
+ Fault = 0x4
+ }
+
+}
+
+#endif
Modified: trunk/mcs/class/corlib/System.Reflection/Module.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/Module.cs 2005-06-06 18:24:28 UTC
(rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/Module.cs 2005-06-06 18:28:09 UTC
(rev 45516)
@@ -280,7 +280,7 @@
}
}
- public void GetPEKind (out PortableExecutableKind peKind, out
ImageFileMachine machine) {
+ public void GetPEKind (out PortableExecutableKinds peKind, out
ImageFileMachine machine) {
ModuleHandle.GetPEKind (out peKind, out machine);
}
#endif
@@ -400,6 +400,6 @@
internal static extern MemberInfo ResolveMemberToken (IntPtr
module, int token, out ResolveTokenError error);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
- internal static extern void GetPEKind (IntPtr module, out
PortableExecutableKind peKind, out ImageFileMachine machine);
+ internal static extern void GetPEKind (IntPtr module, out
PortableExecutableKinds peKind, out ImageFileMachine machine);
}
}
Modified: trunk/mcs/class/corlib/System.Reflection/ObfuscateAssemblyAttribute.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ObfuscateAssemblyAttribute.cs
2005-06-06 18:24:28 UTC (rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/ObfuscateAssemblyAttribute.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -56,7 +56,7 @@
}
}
- public bool Strip {
+ public bool StripAfterObfuscation {
get {
return strip;
}
Modified: trunk/mcs/class/corlib/System.Reflection/ObfuscationAttribute.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ObfuscationAttribute.cs
2005-06-06 18:24:28 UTC (rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/ObfuscationAttribute.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -63,7 +63,7 @@
}
}
- public bool Strip {
+ public bool StripAfterObfuscation {
get {
return strip;
}
Deleted: trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs
2005-06-06 18:24:28 UTC (rev 45515)
+++ trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -1,46 +0,0 @@
-//
-// System.Reflection.PortableExecutableKind flag
-//
-// Author:
-// Sebastien Pouliot <[EMAIL PROTECTED]>
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Reflection {
-
- [Flags]
- [Serializable]
-#if NET_2_0 || BOOTSTRAP_NET_2_0
- public
-#else
- internal
-#endif
- enum PortableExecutableKind {
- NotAPortableExecutableImage = 0,
- ILOnly = 1,
- Required32Bit = 2,
- Plus32Bit = 4,
- Unmanaged32Bit = 8
- }
-}
-
Copied: trunk/mcs/class/corlib/System.Reflection/PortableExecutableKinds.cs
(from rev 45481,
trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs)
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/PortableExecutableKind.cs
2005-06-06 11:29:51 UTC (rev 45481)
+++ trunk/mcs/class/corlib/System.Reflection/PortableExecutableKinds.cs
2005-06-06 18:28:09 UTC (rev 45516)
@@ -0,0 +1,47 @@
+//
+// System.Reflection.PortableExecutableKinds flag
+//
+// Author:
+// Sebastien Pouliot <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Reflection {
+
+ [Flags]
+ [Serializable]
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+ public
+#else
+ internal
+#endif
+ enum PortableExecutableKinds {
+ NotAPortableExecutableImage = 0,
+ ILOnly = 1,
+ Required32Bit = 2,
+ Plus32Bit = 4,
+ PE32Plus = 4,
+ Unmanaged32Bit = 8
+ }
+}
+
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
