From 5186b308dfc51d2f1e84753f798b1b75f1935835 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Fri, 3 Dec 2021 10:37:47 -0500
Subject: [PATCH 1/7] [mobile] Add diagnostics tracing to Android iOS mobile
 runtime components

---
 src/tests/build.proj                           | 4 ++++
 src/tests/tracing/eventpipe/common/IpcUtils.cs | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/tests/build.proj b/src/tests/build.proj
index 66bfd1755ac3e..e11244f0a6e81 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -197,6 +197,8 @@
       <AppDir>$(BuildDir)\apk</AppDir>
       <FinalApkPath>$(XUnitTestBinBase)$(CategoryWithSlash)\$(Category).apk</FinalApkPath>
       <StripDebugSymbols>False</StripDebugSymbols>
+      <RuntimeComponents>diagnostics_tracing</RuntimeComponents>
+      <DiagnosticPorts>127.0.0.1:9000,nosuspend,listen</DiagnosticPorts>
       <StripDebugSymbols Condition="'$(Configuration)' == 'Release'">True</StripDebugSymbols>
       <MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.android-$(TargetArchitecture)\$(Configuration)\runtimes\android-$(TargetArchitecture)\</MicrosoftNetCoreAppRuntimePackDir>
       <AndroidAbi Condition="'$(TargetArchitecture)' == 'arm64'">arm64-v8a</AndroidAbi>
@@ -244,6 +246,8 @@
         RuntimeIdentifier="$(RuntimeIdentifier)"
         ProjectName="$(Category)"
         MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)/native/include/mono-2.0"
+        RuntimeComponents="$(RuntimeComponents)"
+        DiagnosticPorts="$(DiagnosticPorts)"
         StripDebugSymbols="$(StripDebugSymbols)"
         ForceInterpreter="$(MonoInterp)"
         AppDir="$(BuildDir)"
diff --git a/src/tests/tracing/eventpipe/common/IpcUtils.cs b/src/tests/tracing/eventpipe/common/IpcUtils.cs
index b3448f704f238..ee6f110302446 100644
--- a/src/tests/tracing/eventpipe/common/IpcUtils.cs
+++ b/src/tests/tracing/eventpipe/common/IpcUtils.cs
@@ -446,6 +446,12 @@ public static Stream GetStandardTransport(int processId)
                 namedPipe.Connect(3);
                 return namedPipe;
             }
+            else if (OperatingSystem.IsAndroid())
+            {
+                Int32 port = 9000;
+                TcpClient client = new TcpClient("127.0.0.1", port);
+                return client.GetStream();
+            }
             else
             {
                 string ipcPort;

From 6a93f8b1cfb5b1723f52edb8e3a5b4bdc80fa9fe Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Fri, 3 Dec 2021 10:39:04 -0500
Subject: [PATCH 2/7] [tests] Reenable eventactivityidcontrol test on Android

Reenables eventactivityidcontrol now that diagnostics_tracing runtime component is included
---
 src/tests/issues.targets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 49579ecd10dbc..22f3272a3cd51 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3559,9 +3559,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer/**">
             <Issue>https://github.com/dotnet/runtime/issues/54906</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventactivityidcontrol/eventactivityidcontrol/**">
-            <Issue>https://github.com/dotnet/runtime/issues/52763</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/complus_config/name_config_with_pid/**">
             <Issue>https://github.com/dotnet/runtime/issues/54974</Issue>
         </ExcludeList>

From 3b8ef2356a739ee66962bb65f81db9d8ae64f3f3 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 6 Dec 2021 00:24:16 -0500
Subject: [PATCH 3/7] [tests] Enable non-eventpipe Android tracing tests to
 emulate desktop mono

---
 src/tests/tracing/eventcounter/eventcounter.csproj              | 2 +-
 src/tests/tracing/eventcounter/gh53564.csproj                   | 2 +-
 src/tests/tracing/eventcounter/incrementingeventcounter.csproj  | 2 +-
 .../tracing/eventcounter/incrementingpollingcounter.csproj      | 2 +-
 src/tests/tracing/eventcounter/pollingcounter.csproj            | 2 +-
 src/tests/tracing/eventcounter/regression-25709.csproj          | 2 +-
 src/tests/tracing/eventcounter/regression-46938.csproj          | 2 +-
 src/tests/tracing/eventcounter/runtimecounters.csproj           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tests/tracing/eventcounter/eventcounter.csproj b/src/tests/tracing/eventcounter/eventcounter.csproj
index 0b548a3d140b6..6e3a28000d761 100644
--- a/src/tests/tracing/eventcounter/eventcounter.csproj
+++ b/src/tests/tracing/eventcounter/eventcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/gh53564.csproj b/src/tests/tracing/eventcounter/gh53564.csproj
index 25b71bcfbf9ad..52e949c6cd7fd 100644
--- a/src/tests/tracing/eventcounter/gh53564.csproj
+++ b/src/tests/tracing/eventcounter/gh53564.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/incrementingeventcounter.csproj b/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
index 421ba01d16384..138a161a4749f 100644
--- a/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
+++ b/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj b/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
index 88614b0bb5d4a..96cd91373948b 100644
--- a/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
+++ b/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/pollingcounter.csproj b/src/tests/tracing/eventcounter/pollingcounter.csproj
index 648bdccd7a5c7..45ea1c21667fb 100644
--- a/src/tests/tracing/eventcounter/pollingcounter.csproj
+++ b/src/tests/tracing/eventcounter/pollingcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/regression-25709.csproj b/src/tests/tracing/eventcounter/regression-25709.csproj
index d35dcf8d01145..be327d9646b7d 100644
--- a/src/tests/tracing/eventcounter/regression-25709.csproj
+++ b/src/tests/tracing/eventcounter/regression-25709.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/regression-46938.csproj b/src/tests/tracing/eventcounter/regression-46938.csproj
index 0fa47827d4cbd..fe553c3006e92 100644
--- a/src/tests/tracing/eventcounter/regression-46938.csproj
+++ b/src/tests/tracing/eventcounter/regression-46938.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/runtimecounters.csproj b/src/tests/tracing/eventcounter/runtimecounters.csproj
index 44abb2b5f37e6..636068c55b9ed 100644
--- a/src/tests/tracing/eventcounter/runtimecounters.csproj
+++ b/src/tests/tracing/eventcounter/runtimecounters.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>

From 2ae493a5ddcb9778cec5d7045d612af72ca321db Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Tue, 8 Feb 2022 15:44:03 -0500
Subject: [PATCH 4/7] Revert "[tests] Enable non-eventpipe Android tracing
 tests to emulate desktop mono"

This reverts commit 3b8ef2356a739ee66962bb65f81db9d8ae64f3f3.
---
 src/tests/tracing/eventcounter/eventcounter.csproj              | 2 +-
 src/tests/tracing/eventcounter/gh53564.csproj                   | 2 +-
 src/tests/tracing/eventcounter/incrementingeventcounter.csproj  | 2 +-
 .../tracing/eventcounter/incrementingpollingcounter.csproj      | 2 +-
 src/tests/tracing/eventcounter/pollingcounter.csproj            | 2 +-
 src/tests/tracing/eventcounter/regression-25709.csproj          | 2 +-
 src/tests/tracing/eventcounter/regression-46938.csproj          | 2 +-
 src/tests/tracing/eventcounter/runtimecounters.csproj           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tests/tracing/eventcounter/eventcounter.csproj b/src/tests/tracing/eventcounter/eventcounter.csproj
index 6e3a28000d761..0b548a3d140b6 100644
--- a/src/tests/tracing/eventcounter/eventcounter.csproj
+++ b/src/tests/tracing/eventcounter/eventcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/gh53564.csproj b/src/tests/tracing/eventcounter/gh53564.csproj
index 52e949c6cd7fd..25b71bcfbf9ad 100644
--- a/src/tests/tracing/eventcounter/gh53564.csproj
+++ b/src/tests/tracing/eventcounter/gh53564.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/incrementingeventcounter.csproj b/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
index 138a161a4749f..421ba01d16384 100644
--- a/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
+++ b/src/tests/tracing/eventcounter/incrementingeventcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj b/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
index 96cd91373948b..88614b0bb5d4a 100644
--- a/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
+++ b/src/tests/tracing/eventcounter/incrementingpollingcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/pollingcounter.csproj b/src/tests/tracing/eventcounter/pollingcounter.csproj
index 45ea1c21667fb..648bdccd7a5c7 100644
--- a/src/tests/tracing/eventcounter/pollingcounter.csproj
+++ b/src/tests/tracing/eventcounter/pollingcounter.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/regression-25709.csproj b/src/tests/tracing/eventcounter/regression-25709.csproj
index be327d9646b7d..d35dcf8d01145 100644
--- a/src/tests/tracing/eventcounter/regression-25709.csproj
+++ b/src/tests/tracing/eventcounter/regression-25709.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/regression-46938.csproj b/src/tests/tracing/eventcounter/regression-46938.csproj
index fe553c3006e92..0fa47827d4cbd 100644
--- a/src/tests/tracing/eventcounter/regression-46938.csproj
+++ b/src/tests/tracing/eventcounter/regression-46938.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/tests/tracing/eventcounter/runtimecounters.csproj b/src/tests/tracing/eventcounter/runtimecounters.csproj
index 636068c55b9ed..44abb2b5f37e6 100644
--- a/src/tests/tracing/eventcounter/runtimecounters.csproj
+++ b/src/tests/tracing/eventcounter/runtimecounters.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This test is timing sensitive and JIT timing affects the results of the test -->
-    <JitOptimizationSensitive Condition="'$(TargetOS)' != 'Android'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <!-- This test has a secondary thread with an infinite loop -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>

From fd502a3f0baaf7c98a24e1ed0dcf0b4dfe355e71 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Wed, 9 Feb 2022 09:49:37 -0500
Subject: [PATCH 5/7] [tests] Skip JitOptimizationSensitive script on mono

---
 src/tests/Common/CLRTest.Execute.Bash.targets  | 2 +-
 src/tests/Common/CLRTest.Execute.Batch.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets
index ac563dff7cfed..a109ce3857f4c 100644
--- a/src/tests/Common/CLRTest.Execute.Bash.targets
+++ b/src/tests/Common/CLRTest.Execute.Bash.targets
@@ -96,7 +96,7 @@ then
   exit $(IncompatibleTestBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
-      <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'">
+      <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true' And '$(RuntimeFlavor)' != 'mono'">
     <![CDATA[
 $(BashCLRTestEnvironmentCompatibilityCheck)
 if [[ ( ! -z "$COMPlus_JitStress" ) || ( ! -z "$COMPlus_JitStressRegs" ) || ( ! -z "$COMPlus_JITMinOpts" ) || ( ! -z "$COMPlus_TailcallStress" ) ]]
diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets
index 584f4d30cfd9b..09e1fed2cb4c9 100644
--- a/src/tests/Common/CLRTest.Execute.Batch.targets
+++ b/src/tests/Common/CLRTest.Execute.Batch.targets
@@ -93,7 +93,7 @@ IF NOT "%RunTieringTest%"=="" (
   Exit /b 0
 )
       ]]></BatchCLRTestEnvironmentCompatibilityCheck>
-      <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'">
+      <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true' And '$(RuntimeFlavor)' != 'mono'">
     <![CDATA[
 $(BatchCLRTestEnvironmentCompatibilityCheck)
 REM JitOptimizationSensitive includes our set of tests which cannot run under:

From 3373f6209e10487e5603eec78c8cbffb19634636 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Wed, 9 Feb 2022 10:50:25 -0500
Subject: [PATCH 6/7] Update Android GetStandardTransport TcpClient
 initialization

---
 src/tests/tracing/eventpipe/common/IpcUtils.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/tests/tracing/eventpipe/common/IpcUtils.cs b/src/tests/tracing/eventpipe/common/IpcUtils.cs
index ee6f110302446..0640e7e898c31 100644
--- a/src/tests/tracing/eventpipe/common/IpcUtils.cs
+++ b/src/tests/tracing/eventpipe/common/IpcUtils.cs
@@ -448,8 +448,7 @@ public static Stream GetStandardTransport(int processId)
             }
             else if (OperatingSystem.IsAndroid())
             {
-                Int32 port = 9000;
-                TcpClient client = new TcpClient("127.0.0.1", port);
+                TcpClient client = new TcpClient("127.0.0.1", 9000);
                 return client.GetStream();
             }
             else

From 1e6280412ed8c4815d054dc9b0cc076ce5576593 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Wed, 9 Feb 2022 18:29:24 -0500
Subject: [PATCH 7/7] [tests] Skip diagnostics tests on browser and Android

---
 src/tests/issues.targets | 51 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 22f3272a3cd51..b307aed2135a2 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3394,6 +3394,53 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/Runtime_64125/Runtime_64125/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
+
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/incrementingeventcounter/**">
+            <Issue>System.Threading.Thread.UnsafeStart not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/eventcounter/**">
+            <Issue>System.Threading.Thread.UnsafeStart not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/runtimecounters/**">
+            <Issue>System.Threading.Thread.UnsafeStart not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/incrementingpollingcounter/**">
+            <Issue>System.Threading.Thread.UnsafeStart not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/pollingcounter/**">
+            <Issue>System.Threading.Thread.UnsafeStart not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventcounter/gh53564/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/reverse/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/bigevent/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient and system.diagnostics.process not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/processinfo2/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient and system.diagnostics.process not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/diagnosticport/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/processinfo/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient and system.diagnostics.process not supported</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/buffersize/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/reverseouter/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/processenvironment/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/pauseonstart/**">
+            <Issue>Could not load legacy Microsoft.Diagnostics.Tools.RuntimeClient</Issue>
+        </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition=" $(TargetOS) == 'Android' " >
@@ -3562,8 +3609,8 @@
         <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/complus_config/name_config_with_pid/**">
             <Issue>https://github.com/dotnet/runtime/issues/54974</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/**">
-            <Issue> needs triage </Issue>
+        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/**">
+            <Issue>Need to update with Microsoft.Diagnostics.NETCore.Client port https://github.com/dotnet/runtime/pull/64358</Issue>
         </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/Interop/UnmanagedCallConv/UnmanagedCallConvTest/**">
             <Issue>https://github.com/dotnet/runtime/issues/53077</Issue>