From ae8e7b88fab4faedb2da5d20cfd2b2386596a514 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Mon, 7 Feb 2022 20:37:27 -0500
Subject: [PATCH 1/4] [tests][diagnostics] Enable diagnostics tracing on iOS
 runtime tests

---
 src/tests/build.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/build.proj b/src/tests/build.proj
index 3c6ebde822501..b2cb5f8c285ea 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -283,6 +283,7 @@
       <XUnitWrapperDll>$(CMDDIR_GrandParent)/$(CategoryWithSlash)/$(XUnitWrapperFileName)</XUnitWrapperDll>
       <BuildDir>$(IntermediateOutputPath)\iOSApps\$(Category)</BuildDir>
       <FinalPath>$(XUnitTestBinBase)$(CategoryWithSlash)\$(Category).app</FinalPath>
+      <RuntimeComponents>diagnostics_tracing</RuntimeComponents>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -342,6 +343,7 @@
         Arch="$(TargetArchitecture)"
         ProjectName="$(AssemblyName)"
         MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackNativeDir)/include/mono-2.0"
+        RuntimeComponents="$(RuntimeComponents)"
         Assemblies="@(BundleAssemblies)"
         ForceInterpreter="$(MonoForceInterpreter)"
         EnableAppSandbox="$(EnableAppSandbox)"

From 9677caacc7f985759c06c0c7893100a00f645137 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Mon, 7 Feb 2022 20:45:12 -0500
Subject: [PATCH 2/4] Reenable eventactivityidcontrol on iOS runtime tests

---
 src/tests/issues.targets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 484f1e6d6db96..dd1c4f26e5d2e 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3695,9 +3695,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/complus_config/name_config_with_pid/**">
             <Issue>System.ArgumentNullException: Value cannot be null. (Parameter 'path1')</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventactivityidcontrol/eventactivityidcontrol/**">
-            <Issue>System.Exception: Values for 'retCode' are not equal! Left='1' Right='0'</Issue>
-        </ExcludeList>
 
         <ExcludeList Include = "$(XunitTestBinBase)/readytorun/multifolder/multifolder/**">
             <Issue>System.IO.FileNotFoundException: Could not load file or assembly '/.../Library/Developer/CoreSimulator/Devices/941235AB-7563-4D79-AC28-946B7AD2304A/data/Containers/Bundle/Application/40176A30-D8F5-4497-958A-6514E5C684FC/readytorun_multifolder.app/testdir-multifolder/../FolderA/FolderA/FolderA.dll' or one of its dependencies.</Issue>

From dd06be73a8f87604f71f33934b26bf4602699c78 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Tue, 8 Feb 2022 17:15:36 -0500
Subject: [PATCH 3/4] temporary enable runtime ios tests to be ran

---
 eng/pipelines/runtime-staging.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
index e8f707ff5e6d5..59e52d5929e5b 100644
--- a/eng/pipelines/runtime-staging.yml
+++ b/eng/pipelines/runtime-staging.yml
@@ -301,12 +301,11 @@ jobs:
           eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
           eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
           eq(variables['isRollingBuild'], true))
-      ${{ if eq(variables['isRollingBuild'], true) }}:
-        # extra steps, run tests
-        extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
-        extraStepsParameters:
-          creator: dotnet-bot
-          testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+      # extra steps, run tests
+      extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
 #
 # Build the whole product using Mono and run libraries tests, for Wasm.Build.Tests

From 27712e0f3b5d996a42e2b8a99d48021210ed4447 Mon Sep 17 00:00:00 2001
From: mdh1418 <mitchhwang1418@gmail.com>
Date: Sun, 13 Feb 2022 20:43:08 -0500
Subject: [PATCH 4/4] Revert "temporary enable runtime ios tests to be ran"

This reverts commit dd06be73a8f87604f71f33934b26bf4602699c78.
---
 eng/pipelines/runtime-staging.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
index 59e52d5929e5b..e8f707ff5e6d5 100644
--- a/eng/pipelines/runtime-staging.yml
+++ b/eng/pipelines/runtime-staging.yml
@@ -301,11 +301,12 @@ jobs:
           eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
           eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
           eq(variables['isRollingBuild'], true))
-      # extra steps, run tests
-      extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
-      extraStepsParameters:
-        creator: dotnet-bot
-        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+      ${{ if eq(variables['isRollingBuild'], true) }}:
+        # extra steps, run tests
+        extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+        extraStepsParameters:
+          creator: dotnet-bot
+          testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
 #
 # Build the whole product using Mono and run libraries tests, for Wasm.Build.Tests