Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / class / System / System.Diagnostics / EventLogEntry.cs

diff --git a/mcs/class/System/System.Diagnostics/EventLogEntry.cs b/mcs/class/System/System.Diagnostics/EventLogEntry.cs
index 136cd01fdbd3357f60269942cc9a45ee00bb1581..8f922215cf13132e31e653caebf8d777b3eae894 100644 (file)
--- a/mcs/class/System/System.Diagnostics/EventLogEntry.cs
+++ b/mcs/class/System/System.Diagnostics/EventLogEntry.cs
@@ -31,9 +31,7 @@
 //
 
 using System.ComponentModel;
 //
 
 using System.ComponentModel;

-#if NET_2_0

 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;

-#endif

 using System.Runtime.Serialization;
 using System.Security.Permissions;
 
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 


@@ -59,9 +57,7 @@ namespace System.Diagnostics
                private DateTime timeGenerated;
                private DateTime timeWritten;
                private string userName;
                private DateTime timeGenerated;
                private DateTime timeWritten;
                private string userName;

-#if NET_2_0

                private long instanceId;
                private long instanceId;

-#endif

 
                internal EventLogEntry (string category, short categoryNumber, int index, 
                                        int eventID, string source, string message, string userName, 
 
                internal EventLogEntry (string category, short categoryNumber, int index, 
                                        int eventID, string source, string message, string userName, 


@@ -82,9 +78,7 @@ namespace System.Diagnostics
                        this.timeGenerated = timeGenerated;
                        this.timeWritten = timeWritten;
                        this.userName = userName;
                        this.timeGenerated = timeGenerated;
                        this.timeWritten = timeWritten;
                        this.userName = userName;

-#if NET_2_0

                        this.instanceId = instanceId;
                        this.instanceId = instanceId;

-#endif

                }
 
                [MonoTODO]
                }
 
                [MonoTODO]


@@ -112,9 +106,7 @@ namespace System.Diagnostics
                        get { return entryType; }
                }
 
                        get { return entryType; }
                }
 

-#if NET_2_0

                [Obsolete ("Use InstanceId")]
                [Obsolete ("Use InstanceId")]

-#endif

                [MonitoringDescription ("An ID number for this event entry.")]
                public int EventID {
                        get { return eventID; }
                [MonitoringDescription ("An ID number for this event entry.")]
                public int EventID {
                        get { return eventID; }


@@ -125,12 +117,11 @@ namespace System.Diagnostics
                        get { return index; }
                }
 
                        get { return index; }
                }
 

-#if NET_2_0

                [ComVisible (false)]
                [ComVisible (false)]

+               [MonitoringDescription ("The instance ID for this event entry.")]

                public long InstanceId {
                        get { return instanceId; }
                }
                public long InstanceId {
                        get { return instanceId; }
                }

-#endif

 
                [MonitoringDescription ("The Computer on which this event entry occured.")]
                public string MachineName {
 
                [MonitoringDescription ("The Computer on which this event entry occured.")]
                public string MachineName {