From a5e46a7c85a00901ede071be92b94751c4c50455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 13 Jul 2020 14:36:05 +0200
Subject: [PATCH 1/2] WASM: Fix System.Diagnostics.TextWriterTraceListener
 tests

It was using Process.GetCurrentProcess() which throws PNSE on WebAssembly.
---
 .../src/System/Diagnostics/XmlWriterTraceListener.cs  | 11 +++++++++--
 .../tests/XmlWriterTraceListenerTests.cs              | 11 +++++++++--
 src/libraries/tests.proj                              |  1 -
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
index cf38c8d8539567..539307fe83cc55 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
@@ -258,8 +258,15 @@ private void WriteEndHeader()
             string? processName = s_processName;
             if (processName is null)
             {
-                using Process process = Process.GetCurrentProcess();
-                s_processName = processName = process.ProcessName;
+                try
+                {
+                    using Process process = Process.GetCurrentProcess();
+                    s_processName = processName = process.ProcessName;
+                }
+                catch (PlatformNotSupportedException)
+                {
+                    s_processName = processName = string.Empty;
+                }
             }
 
             InternalWrite("\" />");
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
index efcfb6f8a5638c..cd92080fe03dd7 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
@@ -18,9 +18,16 @@ public class XmlWriterTraceListenerTests : FileCleanupTestBase
 
         public XmlWriterTraceListenerTests()
         {
-            using (var process = Process.GetCurrentProcess())
+            try
             {
-                _processName = process.ProcessName;
+                using (var process = Process.GetCurrentProcess())
+                {
+                    _processName = process.ProcessName;
+                }
+            }
+            catch (PlatformNotSupportedException)
+            {
+                _processName = string.Empty;
             }
         }
 
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 29a5714bb80372..82ace21edebf12 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -30,7 +30,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.Common.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TextWriterTraceListener\tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TraceSource\tests\System.Diagnostics.TraceSource.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj" />

From 563c93432cd782d8562c4d0e3775f4227aab56d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 13 Jul 2020 17:00:09 +0200
Subject: [PATCH 2/2] PR feedback

---
 .../src/System/Diagnostics/XmlWriterTraceListener.cs            | 2 +-
 .../tests/XmlWriterTraceListenerTests.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
index 539307fe83cc55..bf97f5fe8418c0 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System/Diagnostics/XmlWriterTraceListener.cs
@@ -263,7 +263,7 @@ private void WriteEndHeader()
                     using Process process = Process.GetCurrentProcess();
                     s_processName = processName = process.ProcessName;
                 }
-                catch (PlatformNotSupportedException)
+                catch (PlatformNotSupportedException) // Process isn't supported on Browser
                 {
                     s_processName = processName = string.Empty;
                 }
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
index cd92080fe03dd7..d71818e9fd097a 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/XmlWriterTraceListenerTests.cs
@@ -25,7 +25,7 @@ public XmlWriterTraceListenerTests()
                     _processName = process.ProcessName;
                 }
             }
-            catch (PlatformNotSupportedException)
+            catch (PlatformNotSupportedException) // Process isn't supported on Browser
             {
                 _processName = string.Empty;
             }