Merge pull request #4708 from xmcclure/orbis-system-net
authorAndi McClure <andi.mcclure@xamarin.com>
Tue, 18 Apr 2017 18:05:16 +0000 (14:05 -0400)
committerGitHub <noreply@github.com>
Tue, 18 Apr 2017 18:05:16 +0000 (14:05 -0400)
Minor orbis fix in System.Net

mcs/class/referencesource/System/net/System/Net/webproxy.cs

index 80fef4d94d1ba5c65c20b16a99a0e26f2e8b79e5..0f874b3fa5faa630c252b562d40bd36a8a6970f2 100644 (file)
@@ -504,7 +504,7 @@ namespace System.Net {
 #if MONO
         public static IWebProxy CreateDefaultProxy ()
         {
-#if FEATURE_NO_BSD_SOCKETS || ORBIS
+#if FEATURE_NO_BSD_SOCKETS
             throw new PlatformNotSupportedException ();
 #elif MONOTOUCH
             return Mono.Net.CFNetwork.GetDefaultProxy ();
@@ -514,6 +514,8 @@ namespace System.Net {
             if (data != null)
                 return data;
 
+            return new WebProxy (true);
+#elif ORBIS
             return new WebProxy (true);
 #else
             if (Platform.IsMacOS) {