mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.0.0.246

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/referencesource/System/net/System/Net/webproxy.cs
View File

@@ -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)

2
mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs
View File

@@ -292,7 +292,7 @@ namespace System.Threading
context = GetWinRTContext();
#endif
#if MONODROID
#if MONODROID && !MOBILE_DESKTOP_HOST
if (context == null)
context = AndroidPlatform.GetDefaultSyncContext ();
#endif