From 06ef5a6244e26f35cb6cc307214d2a86bc631d43 Mon Sep 17 00:00:00 2001
From: David Nguyen <87228593+davidnguyen-tech@users.noreply.github.com>
Date: Thu, 14 Aug 2025 14:50:06 +0000
Subject: [PATCH 1/6] Remove System.Security.Cryptography.Tests.csproj from
Smoke Tests for CoreCLR Android
---
src/libraries/tests.proj | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index b795066b05097b..eeb0a42c22a60e 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -609,6 +609,12 @@
+
+
+
+
+
+
From 614974ebac7b4dec282f9e7764b6ae00f15f720c Mon Sep 17 00:00:00 2001
From: David Nguyen <87228593+davidnguyen-tech@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:05:28 +0000
Subject: [PATCH 2/6] Refactoring
---
src/libraries/tests.proj | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index eeb0a42c22a60e..358669e3fd390f 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -600,7 +600,8 @@
-
+
+
@@ -610,11 +611,6 @@
-
-
-
-
-
From 092c8cd419f91615e3d853f14c162d86c81d175e Mon Sep 17 00:00:00 2001
From: David Nguyen <87228593+davidnguyen-tech@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:10:02 +0000
Subject: [PATCH 3/6] Enable the tests for devices (on emulators, they are
still disabled)
---
src/libraries/tests.proj | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 358669e3fd390f..fec0f53e77eaa7 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -225,8 +225,6 @@
-
-
From 9c594304c51ac4eab589626aba0abea4ad4482e3 Mon Sep 17 00:00:00 2001
From: David Nguyen <87228593+davidnguyen-tech@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:25:37 +0000
Subject: [PATCH 4/6] Refatoring - remove from smoke tests for good
---
src/libraries/tests.proj | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index fec0f53e77eaa7..7eda5e8c7efbc3 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -598,8 +598,6 @@
-
-
From 09f9aa3ed38f1d6fb9b0c0ea66088bfa2b625934 Mon Sep 17 00:00:00 2001
From: Milos Kotlar
Date: Thu, 14 Aug 2025 18:43:45 +0200
Subject: [PATCH 5/6] Remove smoke tests that are failing
---
src/libraries/tests.proj | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 7eda5e8c7efbc3..19e539367d5a8d 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -595,11 +595,9 @@
-
-
From 1a976243a2ba2ba2cd93abaf3a7d9b02cb1cad85 Mon Sep 17 00:00:00 2001
From: Milos Kotlar
Date: Thu, 14 Aug 2025 18:47:54 +0200
Subject: [PATCH 6/6] Skip test
---
.../tests/X509Certificates/PfxIterationCountTests.cs | 1 +
src/libraries/tests.proj | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.cs b/src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.cs
index 1f65016841437a..36a6d2d57b5978 100644
--- a/src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.cs
+++ b/src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.cs
@@ -64,6 +64,7 @@ public void Import_IterationCountLimitExceeded_Throws(string name, string passwo
Assert.Contains(FwlinkId, ce.Message);
}
+ [SkipOnPlatform(TestPlatforms.Android, "Android emulators report OOM error")]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.Is64BitProcess))]
[MemberData(nameof(GetCertsWith_IterationCountExceedingDefaultLimit_MemberData))]
public void ImportWithPasswordOrFileName_IterationCountLimitExceeded(string name, string password, bool usesPbes2, byte[] blob, long iterationCount, bool usesRC2)
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 19e539367d5a8d..c6d4b2f35039e8 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -596,6 +596,7 @@
+