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

Imported Upstream version 4.0.1

Browse Source 
Former-commit-id: 757121caeaad523350be5330f0a3ecc891c70fb8
This commit is contained in:
Jo Shields
2015-04-26 19:10:23 +01:00
parent 7fce50ac98
commit c54b0bda4e
252 changed files with 16715 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
external/referencesource/mscorlib/system/activator.cs vendored
View File

@ -19,7 +19,7 @@ namespace System {
using System.Runtime.Remoting;
#if FEATURE_REMOTING
using System.Runtime.Remoting.Activation;
using Message = System.Runtime.Remoting.Messaging.Message;
// using Message = System.Runtime.Remoting.Messaging.Message;
#endif
using System.Security;
using CultureInfo = System.Globalization.CultureInfo;
@ -74,10 +74,10 @@ namespace System {
if ((object)type == null)
throw new ArgumentNullException("type");
Contract.EndContractBlock();
#if !FULL_AOT_RUNTIME
if (type is System.Reflection.Emit.TypeBuilder)
throw new NotSupportedException(Environment.GetResourceString("NotSupported_CreateInstanceWithTypeBuilder"));
#endif
// If they didn't specify a lookup, then we will provide the default lookup.
if ((bindingAttr & (BindingFlags) LookupMask) == 0)
bindingAttr |= Activator.ConstructorDefault;
@ -110,7 +110,7 @@ namespace System {
static public Object CreateInstance(Type type, params Object[] args)
{
#if !FEATURE_CORECLR
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage) && type != null)
{
FrameworkEventSource.Log.ActivatorCreateInstance(type.GetFullNameForEtw());
@ -138,7 +138,7 @@ namespace System {
static public Object CreateInstance(Type type)
{
#if !FEATURE_CORECLR
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage) && type != null)
{
FrameworkEventSource.Log.ActivatorCreateInstance(type.GetFullNameForEtw());
@ -157,6 +157,10 @@ namespace System {
static public ObjectHandle CreateInstance(String assemblyName,
String typeName)
{
#if MONO
if(assemblyName == null)
assemblyName = Assembly.GetCallingAssembly ().GetName ().Name;
#endif
StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
return CreateInstance(assemblyName,
typeName,
@ -177,6 +181,10 @@ namespace System {
Object[] activationAttributes)
{
#if MONO
if(assemblyName == null)
assemblyName = Assembly.GetCallingAssembly ().GetName ().Name;
#endif
StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
return CreateInstance(assemblyName,
typeName,
@ -210,7 +218,7 @@ namespace System {
static public T CreateInstance<T>()
{
RuntimeType rt = typeof(T) as RuntimeType;
#if !FEATURE_CORECLR
#if !FEATURE_CORECLR && !MONO
if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage) && rt != null)
{
FrameworkEventSource.Log.ActivatorCreateInstanceT(rt.GetFullNameForEtw());
@ -280,6 +288,10 @@ namespace System {
Object[] activationAttributes,
Evidence securityInfo)
{
#if MONO
if(assemblyName == null)
assemblyName = Assembly.GetCallingAssembly ().GetName ().Name;
#endif
StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
return CreateInstance(assemblyName,
typeName,
@ -304,6 +316,10 @@ namespace System {
CultureInfo culture,
object[] activationAttributes)
{
#if MONO
if(assemblyName == null)
assemblyName = Assembly.GetCallingAssembly ().GetName ().Name;
#endif
StackCrawlMark stackMark = StackCrawlMark.LookForMyCaller;
return CreateInstance(assemblyName,
typeName,
@ -335,7 +351,6 @@ namespace System {
throw new NotSupportedException(Environment.GetResourceString("NotSupported_RequiresCasPolicyImplicit"));
}
#endif // FEATURE_CAS_POLICY
Type type = null;
Assembly assembly = null;
if (assemblyString == null) {
@ -611,7 +626,7 @@ namespace System {
activationAttributes,
null);
}
#if FEATURE_COMINTEROP
#if FEATURE_COMINTEROP || MONO_COM
#if FEATURE_CLICKONCE
[System.Security.SecuritySafeCritical] // auto-generated