Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -626,9 +626,9 @@ namespace System {
activationAttributes,
null);
}
#if FEATURE_COMINTEROP || MONO_COM
#if FEATURE_COMINTEROP || MONO_COM || MOBILE_LEGACY
#if FEATURE_CLICKONCE
#if FEATURE_CLICKONCE || MOBILE_LEGACY
[System.Security.SecuritySafeCritical] // auto-generated
public static ObjectHandle CreateInstance (ActivationContext activationContext) {
AppDomainManager domainManager = AppDomain.CurrentDomain.DomainManager;
@@ -700,7 +700,7 @@ namespace System {
}
#endif // FEATURE_COMINTEROP
#if FEATURE_REMOTING
#if FEATURE_REMOTING || MOBILE_LEGACY
// This method is a helper method and delegates to the remoting
// services to do the actual work.
[System.Security.SecurityCritical] // auto-generated_required