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

Imported Upstream version 5.16.0.113

Browse Source 
Former-commit-id: 2bcc375d35c32f5e7df9471e4d4c4ad1a42644a2
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-18 08:20:11 +00:00
parent 14c2d0c196
commit 2f73666fb6
43 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mono/metadata/appdomain.c
View File

@@ -2298,6 +2298,11 @@ ves_icall_System_Reflection_Assembly_LoadFile_internal (MonoStringHandle fname,
filename = mono_string_handle_to_utf8 (fname, error);
goto_if_nok (error, leave);
if (!g_path_is_absolute (filename)) {
mono_error_set_argument (error, "assemblyFile", "Absolute path information is required.");
goto leave;
}
MonoImageOpenStatus status;
MonoMethod *executing_method = mono_runtime_get_caller_no_system_or_reflection ();

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "explicit/b59ae60"
#define FULL_VERSION "explicit/1929878"

2
mono/tests/Makefile.am.REMOVED.git-id
View File

@@ -1 +1 @@
95b58685559d39eb38f0bcdfb91fca13976561e8
e865f2eae0c1c690cd99dbd3869081542bb71605

2
mono/tests/Makefile.in.REMOVED.git-id
View File

@@ -1 +1 @@
9dfa33da6257cb0393e44903ca351c9f3e3f32c8
6dd3eca708dad012afdca952dcd6fafcf6daedfc

2
mono/tests/test-multi-netmodule-4-exe.cs
View File

@@ -9,7 +9,7 @@ public class M4 {
// Expecting failure
try {
var DLL = Assembly.LoadFile(@"test-multi-netmodule-3-dll2.dll");
var DLL = Assembly.LoadFile(System.IO.Path.GetFullPath ("test-multi-netmodule-3-dll2.dll"));
var m3Type = DLL.GetType("M3");
var m3 = Activator.CreateInstance(m3Type);
var m3m1Field = m3Type.GetField("m1");