Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd

mcs/class/corlib/System.Diagnostics.Tracing/EventCounter.cs

@@ -28,7 +28,7 @@
 
 namespace System.Diagnostics.Tracing
 {
-	public class EventCounter
+	public class EventCounter : IDisposable
 	{
 		public EventCounter (string name, EventSource eventSource)
 		{
@@ -37,5 +37,9 @@ namespace System.Diagnostics.Tracing
 		public void WriteMetric (float value)
 		{
 		}
+
+		public void Dispose ()
+		{
+		}
 	}
 }

mcs/class/corlib/System.Diagnostics.Tracing/EventListener.cs

@@ -71,6 +71,11 @@ namespace System.Diagnostics.Tracing
 		public virtual void Dispose()
 		{
 		}
+
+#pragma warning disable CS0067
+		public event EventHandler<EventSourceCreatedEventArgs> EventSourceCreated;
+		public event EventHandler<EventWrittenEventArgs> EventWritten;
+#pragma warning restore CS0067
 	}
 }
 

mcs/class/corlib/System.Diagnostics.Tracing/EventSource.cs

@@ -277,56 +277,56 @@ namespace System.Diagnostics.Tracing
 		{
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public event EventHandler<EventCommandEventArgs> EventCommandExecuted
 		{
 			add { throw new NotImplementedException (); }
 			remove { throw new NotImplementedException (); }
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static string GenerateManifest (Type eventSourceType, string assemblyPathToIncludeInManifest)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static string GenerateManifest (Type eventSourceType, string assemblyPathToIncludeInManifest, EventManifestOptions flags)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static Guid GetGuid (Type eventSourceType)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static string GetName (Type eventSourceType)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static IEnumerable<EventSource> GetSources ()
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static void SendCommand (EventSource eventSource, EventCommand command, IDictionary<string, string> commandArguments)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static void SetCurrentThreadActivityId (Guid activityId)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
+//		[MonoTODO]
 		public static void SetCurrentThreadActivityId (Guid activityId, out Guid oldActivityThatWillContinue)
 		{
 			throw new NotImplementedException ();

mcs/class/corlib/System.Diagnostics.Tracing/EventSourceCreatedEventArgs.cs

@@ -0,0 +1,11 @@
+namespace System.Diagnostics.Tracing
+{
+	public class EventSourceCreatedEventArgs : EventArgs
+	{
+		public EventSource EventSource
+		{
+			get;
+			internal set;
+		}
+	}
+}