Imported Upstream version 5.16.0.113
Former-commit-id: 2bcc375d35c32f5e7df9471e4d4c4ad1a42644a2
This commit is contained in:
parent
14c2d0c196
commit
2f73666fb6
@ -1 +1 @@
|
||||
9a85c2b78d9bb83fa7696ea4bd6e69f60a5e4396
|
||||
1c679289c0519f58db7504ac25a405796f601659
|
@ -1 +1 @@
|
||||
3299023e93bd9b2e83fd553a42c304cf1c3af886
|
||||
63a53a86e8b66e829951738958530ddcaa7b0020
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.16.0.112";
|
||||
public const string MonoVersion = "5.16.0.113";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1287,6 +1287,22 @@ namespace MonoTests.System.Reflection
|
||||
} catch (NotImplementedException){
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException (typeof (ArgumentException))]
|
||||
public void LoadFileRelativeThrows ()
|
||||
{
|
||||
Assembly.LoadFile (Path.Combine ("non-existent", "relative", "path.dll"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException (typeof (FileNotFoundException))]
|
||||
public void LoadFileAbsoluteNotFoundThrows ()
|
||||
{
|
||||
// have to use GetFullPath so we get C:\... on Windows
|
||||
var abspath = Path.GetFullPath (Path.Combine ("non-existent", "absolute", "path.dll"));
|
||||
Assembly.LoadFile (abspath);
|
||||
}
|
||||
}
|
||||
|
||||
public class TestDefinedTypes
|
||||
|
@ -1 +1 @@
|
||||
96261d9f61cd487aeaf7a05876af2aa20870995b
|
||||
76f7b30f3b772705adeccf5ae5122298373595f0
|
@ -1 +1 @@
|
||||
aea62df15a18b6b9800e2a4b494eab4610f1bbe2
|
||||
df1531febfddb37fb0e38c53a36c814f6e4b726e
|
Binary file not shown.
@ -1 +1 @@
|
||||
250a739352abc0a44dbab31d1d028ca62ff2c8f1
|
||||
8226ad7568af72483e988ca9e9fc4bc890138e8c
|
@ -1 +1 @@
|
||||
535cc5a5c013757daeb6350daae0a53185996cb8
|
||||
d8f0c4be13ec04447e671c62891f2ebc930392be
|
@ -1 +1 @@
|
||||
e4ef359b8f74b1150796882b81bd1217c79cf089
|
||||
28718cf701fa008ca5f23d78b4eccc8e9d6630fa
|
@ -1 +1 @@
|
||||
67c414f79adeff3f388a71f61069df40792a3964
|
||||
58502f5a6be5d68c84a091c65626ac3e6e44d0cd
|
@ -1 +1 @@
|
||||
0167f7ae83d1b223045058050f59ba119873c852
|
||||
804de4a35a0da1c2767537f64f3aebf210367f4c
|
@ -1 +1 @@
|
||||
96261d9f61cd487aeaf7a05876af2aa20870995b
|
||||
76f7b30f3b772705adeccf5ae5122298373595f0
|
@ -1 +1 @@
|
||||
aea62df15a18b6b9800e2a4b494eab4610f1bbe2
|
||||
df1531febfddb37fb0e38c53a36c814f6e4b726e
|
Binary file not shown.
@ -1 +1 @@
|
||||
250a739352abc0a44dbab31d1d028ca62ff2c8f1
|
||||
8226ad7568af72483e988ca9e9fc4bc890138e8c
|
@ -1 +1 @@
|
||||
535cc5a5c013757daeb6350daae0a53185996cb8
|
||||
d8f0c4be13ec04447e671c62891f2ebc930392be
|
@ -1 +1 @@
|
||||
e4ef359b8f74b1150796882b81bd1217c79cf089
|
||||
28718cf701fa008ca5f23d78b4eccc8e9d6630fa
|
@ -1 +1 @@
|
||||
67c414f79adeff3f388a71f61069df40792a3964
|
||||
58502f5a6be5d68c84a091c65626ac3e6e44d0cd
|
@ -1 +1 @@
|
||||
0167f7ae83d1b223045058050f59ba119873c852
|
||||
804de4a35a0da1c2767537f64f3aebf210367f4c
|
@ -1 +1 @@
|
||||
96261d9f61cd487aeaf7a05876af2aa20870995b
|
||||
76f7b30f3b772705adeccf5ae5122298373595f0
|
@ -1 +1 @@
|
||||
aea62df15a18b6b9800e2a4b494eab4610f1bbe2
|
||||
df1531febfddb37fb0e38c53a36c814f6e4b726e
|
Binary file not shown.
@ -1 +1 @@
|
||||
250a739352abc0a44dbab31d1d028ca62ff2c8f1
|
||||
8226ad7568af72483e988ca9e9fc4bc890138e8c
|
@ -1 +1 @@
|
||||
535cc5a5c013757daeb6350daae0a53185996cb8
|
||||
d8f0c4be13ec04447e671c62891f2ebc930392be
|
@ -1 +1 @@
|
||||
e4ef359b8f74b1150796882b81bd1217c79cf089
|
||||
28718cf701fa008ca5f23d78b4eccc8e9d6630fa
|
@ -1 +1 @@
|
||||
67c414f79adeff3f388a71f61069df40792a3964
|
||||
58502f5a6be5d68c84a091c65626ac3e6e44d0cd
|
@ -1 +1 @@
|
||||
0167f7ae83d1b223045058050f59ba119873c852
|
||||
804de4a35a0da1c2767537f64f3aebf210367f4c
|
@ -1573,6 +1573,8 @@ namespace TestRunner {
|
||||
return 1;
|
||||
}
|
||||
|
||||
compiler = Path.GetFullPath (compiler);
|
||||
|
||||
ITester tester;
|
||||
try {
|
||||
Console.WriteLine ("Loading " + compiler + " ...");
|
||||
|
@ -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 ();
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/b59ae60"
|
||||
#define FULL_VERSION "explicit/1929878"
|
||||
|
@ -1 +1 @@
|
||||
95b58685559d39eb38f0bcdfb91fca13976561e8
|
||||
e865f2eae0c1c690cd99dbd3869081542bb71605
|
@ -1 +1 @@
|
||||
9dfa33da6257cb0393e44903ca351c9f3e3f32c8
|
||||
6dd3eca708dad012afdca952dcd6fafcf6daedfc
|
@ -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");
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
53fdfbb1cc2306dec9e6c6abff94329708065c70
|
||||
dc4fb2a538733b148c53c53a2ed8e902334f45c6
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
26abd8696f18d45a2b7c660aadb907d46ec72458
|
||||
98ba62865bf4d88ec0b095c7684f32cb6047f472
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
d3c27c7daccd3019d9b23182323fb1e0ac3cf001
|
||||
aeb457e40f9fcea8685c24eab93b2aa71ed987a1
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.16.0.112\n"
|
||||
"Project-Id-Version: mono 5.16.0.113\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-08-16 08:04+0000\n"
|
||||
"POT-Creation-Date: 2018-08-18 08:05+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c4b141396ff84f455f5dc6f92099ab3e0ba81d1a
|
||||
2f4bfbf27bf8d9d68b1cf15efc1a6ed6b7c2c9e4
|
Loading…
x
Reference in New Issue
Block a user