- Include Mono MacCatalyst testing

- Wait for event processing before disconnecting the EventPipe stream

Author: noahfalk

src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventPipeListener.cs

@@ -110,13 +110,22 @@ public override void Dispose()
             {
                 return;
             }
-            _disposed = true;
-            _session?.Stop();
-            _session?.Dispose();
 
-            if (_processingTask != null && !_processingTask.Wait(TimeSpan.FromSeconds(5)))
+            try
             {
-                Debug.WriteLine("EventPipeEventListener processing task failed to stop in a timely manner.");
+                _disposed = true;
+                _session?.Stop();
+
+                if (_processingTask != null && !_processingTask.Wait(TimeSpan.FromSeconds(5)))
+                {
+                    // If the session is still streaming data then session.Dispose() below will disconnect the stream 
+                    // and likely cause the thread running source.Process() to throw.
+                    Assert.Fail("EventPipeEventListener processing task failed to complete in 5 seconds.");
+                }
+            }
+            finally
+            {
+                _session?.Dispose();
             }
         }
 

src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs

@@ -29,7 +29,9 @@ private struct PartB_UserInfo
         public static TheoryData<Listener> GetListeners()
         {
             TheoryData<Listener> data = new TheoryData<Listener>();
-            if (PlatformDetection.IsNetCore && PlatformDetection.IsNotAndroid && PlatformDetection.IsNotBrowser && PlatformDetection.IsNotMonoRuntime)
+
+            if (PlatformDetection.IsNetCore && PlatformDetection.IsNotAndroid && PlatformDetection.IsNotBrowser && 
+                (PlatformDetection.IsNotMonoRuntime || PlatformDetection.IsMacCatalyst))
             {
                 data.Add(new EventPipeListener());
             }

src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs

@@ -30,7 +30,8 @@ public static TheoryData<Listener,bool> GetListenerConfigurations()
         public static TheoryData<Listener> GetListeners()
         {
             TheoryData<Listener> data = new TheoryData<Listener>();
-            if (PlatformDetection.IsNetCore && PlatformDetection.IsNotAndroid && PlatformDetection.IsNotBrowser && PlatformDetection.IsNotMonoRuntime)
+            if (PlatformDetection.IsNetCore && PlatformDetection.IsNotAndroid && PlatformDetection.IsNotBrowser &&
+                (PlatformDetection.IsNotMonoRuntime || PlatformDetection.IsMacCatalyst))
             {
                 data.Add(new EventPipeListener());
             }