diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ClientCertificates.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ClientCertificates.cs
index 45f6963190692..e5bd399a977ba 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ClientCertificates.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ClientCertificates.cs
@@ -209,17 +209,16 @@ await LoopbackServer.CreateServerAsync(async server =>
}
}
- [ConditionalFact]
- [PlatformSpecific(TestPlatforms.Android)]
+#if TARGETS_ANDROID
+ [Fact]
public async Task Android_GetCertificateFromKeyStoreViaAlias()
{
-#if TARGETS_ANDROID
var options = new LoopbackServer.Options { UseSsl = true };
- var (store, alias) = AndroidKeyStoreHelper.AddCertificate(Configuration.Certificates.GetClientCertificate());
+ (X509Store store, string alias) = AndroidKeyStoreHelper.AddCertificate(Configuration.Certificates.GetClientCertificate());
try
{
- var clientCertificate = AndroidKeyStoreHelper.GetCertificateViaAlias(store, alias);
+ X509Certificate2 clientCertificate = AndroidKeyStoreHelper.GetCertificateViaAlias(store, alias);
Assert.True(clientCertificate.HasPrivateKey);
await LoopbackServer.CreateServerAsync(async (server, url) =>
@@ -247,10 +246,7 @@ await TestHelper.WhenAllCompletedOrAnyFailed(
Assert.True(AndroidKeyStoreHelper.DeleteAlias(store, alias));
store.Dispose();
}
-#else
- await Task.CompletedTask;
- throw new SkipTestException("Android-specific test");
-#endif
}
+#endif
}
}
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/AndroidKeyStoreHelper.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/AndroidKeyStoreHelper.cs
index d3ab3df784563..21c0cb1c2fae1 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/AndroidKeyStoreHelper.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/AndroidKeyStoreHelper.cs
@@ -20,7 +20,7 @@ public static (X509Store, string) AddCertificate(X509Certificate2 cert)
public static X509Certificate2 GetCertificateViaAlias(X509Store store, string alias)
{
- var privateKeyEntry = Interop.AndroidCrypto.X509StoreGetPrivateKeyEntry(store.StoreHandle, alias);
+ IntPtr privateKeyEntry = Interop.AndroidCrypto.X509StoreGetPrivateKeyEntry(store.StoreHandle, alias);
return new X509Certificate2(privateKeyEntry);
}
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index 87c90349a7b6b..add7df7ccd731 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -6,7 +6,7 @@
$(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3
true
true
- $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-linux;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx
+ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-linux;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx
true
true
@@ -29,7 +29,7 @@
01:15:00
-
+
$(DefineConstants);TARGETS_ANDROID
@@ -237,7 +237,7 @@
-
+
@@ -247,7 +247,7 @@
Link="Common\Interop\OSX\Interop.Libraries.cs" />
-
+