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/mscorlib/system/threading/synchronizationcontext.cs
+++ b/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs
@@ -292,7 +292,7 @@ namespace System.Threading
                context = GetWinRTContext();
 #endif

-#if MONODROID
+#if MONODROID && !MOBILE_DESKTOP_HOST
            if (context == null)
                context = AndroidPlatform.GetDefaultSyncContext ();
 #endif