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

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/corlib/System.Reflection/Assembly.cs
View File

@ -531,6 +531,9 @@ namespace System.Reflection {
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private extern static Assembly LoadFrom (String assemblyFile, bool refonly);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private extern static Assembly LoadFile_internal (String assemblyFile);
public static Assembly LoadFrom (String assemblyFile)
{
return LoadFrom (assemblyFile, false);
@ -575,8 +578,11 @@ namespace System.Reflection {
throw new ArgumentNullException ("path");
if (path == String.Empty)
throw new ArgumentException ("Path can't be empty", "path");
// FIXME: Make this do the right thing
return LoadFrom (path, securityEvidence);
Assembly a = LoadFile_internal (path);
if (a != null && securityEvidence != null) {
throw new NotImplementedException ();
}
return a;
}
public static Assembly LoadFile (String path)