Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Driesen <drieseng@users.sourceforge.net>2004-05-20 22:56:34 +0400
committerGert Driesen <drieseng@users.sourceforge.net>2004-05-20 22:56:34 +0400
commit2e472fe3689e246a61388754219f49982f0b1197 (patch)
tree94e0659b89b84fcd80bfb3db08279a00316fca58 /mcs/class/System/System.Diagnostics
parentff0310677a327b3e3fa354e8d07a0adfce319ab0 (diff)
* EventLogPermissionAttribute.cs:
* PerformanceCounterPermissionAttribute.cs: adjust AllowMultiple and Inherited to match .NET svn path=/trunk/mcs/; revision=27769
Diffstat (limited to 'mcs/class/System/System.Diagnostics')
-rw-r--r--mcs/class/System/System.Diagnostics/ChangeLog6
-rw-r--r--mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs3
-rw-r--r--mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs3
3 files changed, 10 insertions, 2 deletions
diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 8f1f330144c..108ccfe6fa0 100644
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-20 Gert Driesen (drieseng@users.sourceforge.net)
+
+ * EventLogPermissionAttribute.cs:
+ * PerformanceCounterPermissionAttribute.cs: adjust AllowMultiple
+ and Inherited to match .NET
+
2004-05-19 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* Process.cs: separate the command and the arguments when calling
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs b/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs
index d6db335d9df..a42a5dc9325 100644
--- a/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs
+++ b/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs
@@ -20,7 +20,8 @@ namespace System.Diagnostics
[AttributeUsage(
AttributeTargets.Assembly | AttributeTargets.Class |
AttributeTargets.Struct | AttributeTargets.Constructor |
- AttributeTargets.Method | AttributeTargets.Event)]
+ AttributeTargets.Method | AttributeTargets.Event,
+ AllowMultiple=true, Inherited=false)]
[Serializable]
public class EventLogPermissionAttribute : CodeAccessSecurityAttribute
{
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs
index 739e20fa7a2..4f4f0508ff0 100644
--- a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs
@@ -23,7 +23,8 @@ namespace System.Diagnostics
AttributeTargets.Struct |
AttributeTargets.Constructor |
AttributeTargets.Method |
- AttributeTargets.Event )]
+ AttributeTargets.Event, AllowMultiple=true,
+ Inherited=false)]
[Serializable]
public class PerformanceCounterPermissionAttribute : CodeAccessSecurityAttribute
{