Imported Upstream version 6.0.0.246

Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed
2019-05-18 08:35:58 +00:00
parent fdf94592db
commit 65ce5c75f1
75 changed files with 607 additions and 61 deletions
--- a/mcs/class/referencesource/System/net/System/Net/webproxy.cs
+++ b/mcs/class/referencesource/System/net/System/Net/webproxy.cs
@@ -508,7 +508,7 @@ namespace System.Net {
            throw new PlatformNotSupportedException ();
 #elif MONOTOUCH
            return Mono.Net.CFNetwork.GetDefaultProxy ();
-#elif MONODROID
+#elif MONODROID && !MOBILE_DESKTOP_HOST
            // Return the system web proxy.  This only works for ICS+.
            var data = AndroidPlatform.GetDefaultProxy ();
            if (data != null)