From 363990fefd701a3bcfc1f9eee5bdcc87741858db Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 29 Sep 2021 13:15:10 -0400
Subject: [PATCH 1/2] Remove ILStrip temporarily to retain ActiveIssue
 attributes in release mobile device configuration

---
 eng/testing/tests.mobile.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 8a7036f14208f6..58c9dd77d2827d 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -56,7 +56,7 @@
              Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />
 
   <Target Name="GenerateRuntimeConfig" Condition="'$(TargetOS)' != 'Browser'"
-                                       Inputs="$(PublishDir)$(AssemblyName).runtimeconfig.json" 
+                                       Inputs="$(PublishDir)$(AssemblyName).runtimeconfig.json"
                                        Outputs="$(PublishDir)runtimeconfig.bin">
     <PropertyGroup>
       <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
@@ -208,7 +208,7 @@
         <Output TaskParameter="CompiledAssemblies" ItemName="BundleAssemblies" />
     </MonoAOTCompiler>
 
-    <ILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'" Assemblies="@(BundleAssemblies)" />
+    <!-- <ILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'" Assemblies="@(BundleAssemblies)" /> -->
 
     <ItemGroup>
       <BundleAssemblies Include="@(_BundleNonAotAssemblies)" />
@@ -249,7 +249,7 @@
           SkipUnchangedFiles="true"
           Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true' and '$(GenerateXcodeProject)' == 'true'" />
 
-    <RemoveDir Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'" 
+    <RemoveDir Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'"
                Directories="$(OutDir)" />
   </Target>
 

From 45c3575ec8debe9211fa36f28b5018474da9f6f8 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 29 Sep 2021 16:33:33 -0400
Subject: [PATCH 2/2] Add Android Active Issue

---
 .../tests/CollectionTests.cs                                    | 1 +
 src/libraries/tests.proj                                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs b/src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs
index d074f8ad431661..da647d19ad5ef1 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs
@@ -1583,6 +1583,7 @@ public static void ExportCertificatePems_SingleCert()
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/59777", TestPlatforms.Android)]
         public static void ExportCertificatePems_MultiCert()
         {
             const string MultiPem = "-----BEGIN CERTIFICATE-----\n" +
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index aae9eb5396a6ac..aefca41a35b6b5 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -149,7 +149,7 @@
 
   <ItemGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS') and '$(RunDisablediOSTests)' != 'true'">
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />
-    
+
     <!-- Functional tests on devices have problems with return codes from mlaunch -->
     <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\$(TargetOS)\Device\**\*.Test.csproj" />
   </ItemGroup>