Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -384,7 +384,7 @@ namespace System.Reflection.Emit
internal void AddPermissionRequests (PermissionSet required, PermissionSet optional, PermissionSet refused)
{
#if !NET_2_1
#if !MOBILE
if (created)
throw new InvalidOperationException ("Assembly was already saved.");
@@ -466,6 +466,11 @@ namespace System.Reflection.Emit
return new AssemblyBuilder (name, null, access, false);
}
public static AssemblyBuilder DefineDynamicAssembly (AssemblyName name, AssemblyBuilderAccess access, IEnumerable<CustomAttributeBuilder> assemblyAttributes)
{
throw new NotImplementedException ();
}
public ModuleBuilder DefineDynamicModule (string name)
{
return DefineDynamicModule (name, name, false, true);
@@ -1038,16 +1043,6 @@ namespace System.Reflection.Emit
return (str == "neutral" ? String.Empty : str);
}
internal override AssemblyName UnprotectedGetName ()
{
AssemblyName an = base.UnprotectedGetName ();
if (sn != null) {
an.SetPublicKey (sn.PublicKey);
an.SetPublicKeyToken (sn.PublicKeyToken);
}
return an;
}
/*Warning, @typeArguments must be a mscorlib internal array. So make a copy before passing it in*/
internal Type MakeGenericType (Type gtd, Type[] typeArguments)
{
@@ -1124,7 +1119,14 @@ namespace System.Reflection.Emit
public override AssemblyName GetName (bool copiedName)
{
return base.GetName (copiedName);
var aname = AssemblyName.Create (this, false);
if (sn != null) {
aname.SetPublicKey (sn.PublicKey);
aname.SetPublicKeyToken (sn.PublicKeyToken);
}
return aname;
}
[MonoTODO ("This always returns an empty array")]