Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -6,11 +6,11 @@
/*
*/
#if WINFORMS_NAMESPACE
#if Microsoft_NAMESPACE
namespace System.Windows.Forms
#elif DRAWING_NAMESPACE
namespace System.Drawing
#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY
#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY
namespace System.Internal
#elif SYSTEM_NAMESPACE
namespace System
@@ -274,7 +274,7 @@
/// -----------------------------------------------------------------
///
/// </devdoc>
#if WINFORMS_NAMESPACE || WINFORMS_PUBLIC_GRAPHICS_LIBRARY || DRAWING_NAMESPACE
#if Microsoft_NAMESPACE || Microsoft_PUBLIC_GRAPHICS_LIBRARY || DRAWING_NAMESPACE
internal class WeakRefCollection : IList {
private int refCheckThreshold = Int32.MaxValue; // this means this is disabled by default.
private ArrayList _innerList;

View File

@@ -8,11 +8,11 @@
*/
#if WINFORMS_NAMESPACE
#if Microsoft_NAMESPACE
namespace System.Windows.Forms
#elif DRAWING_NAMESPACE
namespace System.Drawing
#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY
#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY
namespace System.Internal
#elif SYSTEM_NAMESPACE
namespace System
@@ -131,7 +131,7 @@ namespace System.Windows.Forms
return Activator.CreateInstance(type, flags, null, args, null);
}
#if (!WINFORMS_NAMESPACE)
#if (!Microsoft_NAMESPACE)
/// <devdoc>
/// This helper method provides safe access to Activator.CreateInstance.

View File

@@ -72,6 +72,7 @@ namespace System {
public const string Fxassert = "Fxassert.dll";
public const string Shlwapi = "shlwapi.dll";
public const string Crypt32 = "crypt32.dll";
public const string ShCore = "SHCore.dll";
// system.data specific
internal const string Odbc32 = "odbc32.dll";