Imported Upstream version 6.0.0.246

Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-05-18 08:35:58 +00:00
parent fdf94592db
commit 65ce5c75f1
75 changed files with 607 additions and 61 deletions

View File

@ -42,7 +42,7 @@ namespace Mono.Net.Security
{
#if MONOTOUCH
is_macosx = true;
#elif MONODROID || ORBIS
#elif (MONODROID || ORBIS) && !MOBILE_DESKTOP_HOST
is_macosx = false;
#else
is_macosx = Environment.OSVersion.Platform != PlatformID.Win32NT && System.IO.File.Exists (OSX509Certificates.SecurityLibrary);
@ -133,7 +133,7 @@ namespace Mono.Net.Security
var leaf = certs [0];
bool result;
#if MONODROID
#if MONODROID && !MOBILE_DESKTOP_HOST
try {
result = AndroidPlatform.TrustEvaluateSsl (certs);
if (result) {