From 2f73666fb6537af8a8f2e02cfc659092a6fc196a Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 18 Aug 2018 08:20:11 +0000 Subject: [PATCH] Imported Upstream version 5.16.0.113 Former-commit-id: 2bcc375d35c32f5e7df9471e4d4c4ad1a42644a2 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Test/System.Reflection/AssemblyTest.cs | 16 ++++++++++++++++ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600010/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600010/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600010/mcs.exe.REMOVED.git-id | 2 +- .../1051600010/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600010/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600010/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600010/mcs.exe.REMOVED.git-id | 2 +- .../1051600010/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600010/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600010/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600010/mcs.exe.REMOVED.git-id | 2 +- .../1051600010/mscorlib.dll.REMOVED.git-id | 2 +- mcs/tools/compiler-tester/compiler-tester.cs | 2 ++ mono/metadata/appdomain.c | 5 +++++ mono/mini/version.h | 2 +- mono/tests/Makefile.am.REMOVED.git-id | 2 +- mono/tests/Makefile.in.REMOVED.git-id | 2 +- mono/tests/test-multi-netmodule-4-exe.cs | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 43 files changed, 57 insertions(+), 34 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 0ea7112176..dd303ea8aa 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -9a85c2b78d9bb83fa7696ea4bd6e69f60a5e4396 \ No newline at end of file +1c679289c0519f58db7504ac25a405796f601659 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 16a8690c98..b9306d7d43 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -3299023e93bd9b2e83fd553a42c304cf1c3af886 \ No newline at end of file +63a53a86e8b66e829951738958530ddcaa7b0020 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 4ec4885b82..a04058d9a7 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs index ca4581a0b9..208318c173 100644 --- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs +++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs @@ -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 diff --git a/mcs/class/lib/monolite-darwin/1051600010/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/Mono.Security.dll.REMOVED.git-id index 15654118d2..04613f330c 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -96261d9f61cd487aeaf7a05876af2aa20870995b \ No newline at end of file +76f7b30f3b772705adeccf5ae5122298373595f0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/System.Configuration.dll.REMOVED.git-id index 6d835a009f..6651e4092d 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aea62df15a18b6b9800e2a4b494eab4610f1bbe2 \ No newline at end of file +df1531febfddb37fb0e38c53a36c814f6e4b726e \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/System.IO.Compression.dll b/mcs/class/lib/monolite-darwin/1051600010/System.IO.Compression.dll index 4e894c2fb47e55dfbcf09ee0e1b1884486609e9c..e298141865e4c1a7216eb3da580f6c9cde753e55 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ6Qc^jfsD0`0W=H{gDh~@)JKFss<~)7$fN6;x6lj$Y6b%{ Q04kTDeE}-BXA=RLaI78{p#T5? delta 58 zcmV-A0LA}+hz5X&29SsZU(>PefsD0`0W=H{E{$us69H{aviFzQxlGebx6lj$Y6b%` Q04kTDeE}-BXA=RLaLxZ03;+NC diff --git a/mcs/class/lib/monolite-darwin/1051600010/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/System.Numerics.dll.REMOVED.git-id index 320dc1c742..e5909c2da9 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -250a739352abc0a44dbab31d1d028ca62ff2c8f1 \ No newline at end of file +8226ad7568af72483e988ca9e9fc4bc890138e8c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/System.Security.dll.REMOVED.git-id index 1b3471a0e1..88f05435f4 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -535cc5a5c013757daeb6350daae0a53185996cb8 \ No newline at end of file +d8f0c4be13ec04447e671c62891f2ebc930392be \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/System.Xml.dll.REMOVED.git-id index e7df4e87b7..926900d7e3 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -e4ef359b8f74b1150796882b81bd1217c79cf089 \ No newline at end of file +28718cf701fa008ca5f23d78b4eccc8e9d6630fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/mcs.exe.REMOVED.git-id index 4abff8bd39..346e99f858 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -67c414f79adeff3f388a71f61069df40792a3964 \ No newline at end of file +58502f5a6be5d68c84a091c65626ac3e6e44d0cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600010/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600010/mscorlib.dll.REMOVED.git-id index f0de7f367b..0182756009 100644 --- a/mcs/class/lib/monolite-darwin/1051600010/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600010/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -0167f7ae83d1b223045058050f59ba119873c852 \ No newline at end of file +804de4a35a0da1c2767537f64f3aebf210367f4c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/Mono.Security.dll.REMOVED.git-id index 15654118d2..04613f330c 100644 --- a/mcs/class/lib/monolite-linux/1051600010/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -96261d9f61cd487aeaf7a05876af2aa20870995b \ No newline at end of file +76f7b30f3b772705adeccf5ae5122298373595f0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/System.Configuration.dll.REMOVED.git-id index 6d835a009f..6651e4092d 100644 --- a/mcs/class/lib/monolite-linux/1051600010/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aea62df15a18b6b9800e2a4b494eab4610f1bbe2 \ No newline at end of file +df1531febfddb37fb0e38c53a36c814f6e4b726e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/1051600010/System.IO.Compression.dll index 4e894c2fb47e55dfbcf09ee0e1b1884486609e9c..e298141865e4c1a7216eb3da580f6c9cde753e55 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ6Qc^jfsD0`0W=H{gDh~@)JKFss<~)7$fN6;x6lj$Y6b%{ Q04kTDeE}-BXA=RLaI78{p#T5? delta 58 zcmV-A0LA}+hz5X&29SsZU(>PefsD0`0W=H{E{$us69H{aviFzQxlGebx6lj$Y6b%` Q04kTDeE}-BXA=RLaLxZ03;+NC diff --git a/mcs/class/lib/monolite-linux/1051600010/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/System.Numerics.dll.REMOVED.git-id index 320dc1c742..e5909c2da9 100644 --- a/mcs/class/lib/monolite-linux/1051600010/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -250a739352abc0a44dbab31d1d028ca62ff2c8f1 \ No newline at end of file +8226ad7568af72483e988ca9e9fc4bc890138e8c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/System.Security.dll.REMOVED.git-id index 1b3471a0e1..88f05435f4 100644 --- a/mcs/class/lib/monolite-linux/1051600010/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -535cc5a5c013757daeb6350daae0a53185996cb8 \ No newline at end of file +d8f0c4be13ec04447e671c62891f2ebc930392be \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/System.Xml.dll.REMOVED.git-id index e7df4e87b7..926900d7e3 100644 --- a/mcs/class/lib/monolite-linux/1051600010/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -e4ef359b8f74b1150796882b81bd1217c79cf089 \ No newline at end of file +28718cf701fa008ca5f23d78b4eccc8e9d6630fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/mcs.exe.REMOVED.git-id index 4abff8bd39..346e99f858 100644 --- a/mcs/class/lib/monolite-linux/1051600010/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -67c414f79adeff3f388a71f61069df40792a3964 \ No newline at end of file +58502f5a6be5d68c84a091c65626ac3e6e44d0cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600010/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600010/mscorlib.dll.REMOVED.git-id index f0de7f367b..0182756009 100644 --- a/mcs/class/lib/monolite-linux/1051600010/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600010/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -0167f7ae83d1b223045058050f59ba119873c852 \ No newline at end of file +804de4a35a0da1c2767537f64f3aebf210367f4c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/Mono.Security.dll.REMOVED.git-id index 15654118d2..04613f330c 100644 --- a/mcs/class/lib/monolite-win32/1051600010/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -96261d9f61cd487aeaf7a05876af2aa20870995b \ No newline at end of file +76f7b30f3b772705adeccf5ae5122298373595f0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/System.Configuration.dll.REMOVED.git-id index 6d835a009f..6651e4092d 100644 --- a/mcs/class/lib/monolite-win32/1051600010/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aea62df15a18b6b9800e2a4b494eab4610f1bbe2 \ No newline at end of file +df1531febfddb37fb0e38c53a36c814f6e4b726e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/1051600010/System.IO.Compression.dll index 4e894c2fb47e55dfbcf09ee0e1b1884486609e9c..e298141865e4c1a7216eb3da580f6c9cde753e55 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ6Qc^jfsD0`0W=H{gDh~@)JKFss<~)7$fN6;x6lj$Y6b%{ Q04kTDeE}-BXA=RLaI78{p#T5? delta 58 zcmV-A0LA}+hz5X&29SsZU(>PefsD0`0W=H{E{$us69H{aviFzQxlGebx6lj$Y6b%` Q04kTDeE}-BXA=RLaLxZ03;+NC diff --git a/mcs/class/lib/monolite-win32/1051600010/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/System.Numerics.dll.REMOVED.git-id index 320dc1c742..e5909c2da9 100644 --- a/mcs/class/lib/monolite-win32/1051600010/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -250a739352abc0a44dbab31d1d028ca62ff2c8f1 \ No newline at end of file +8226ad7568af72483e988ca9e9fc4bc890138e8c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/System.Security.dll.REMOVED.git-id index 1b3471a0e1..88f05435f4 100644 --- a/mcs/class/lib/monolite-win32/1051600010/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -535cc5a5c013757daeb6350daae0a53185996cb8 \ No newline at end of file +d8f0c4be13ec04447e671c62891f2ebc930392be \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/System.Xml.dll.REMOVED.git-id index e7df4e87b7..926900d7e3 100644 --- a/mcs/class/lib/monolite-win32/1051600010/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -e4ef359b8f74b1150796882b81bd1217c79cf089 \ No newline at end of file +28718cf701fa008ca5f23d78b4eccc8e9d6630fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/mcs.exe.REMOVED.git-id index 4abff8bd39..346e99f858 100644 --- a/mcs/class/lib/monolite-win32/1051600010/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -67c414f79adeff3f388a71f61069df40792a3964 \ No newline at end of file +58502f5a6be5d68c84a091c65626ac3e6e44d0cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600010/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600010/mscorlib.dll.REMOVED.git-id index f0de7f367b..0182756009 100644 --- a/mcs/class/lib/monolite-win32/1051600010/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600010/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -0167f7ae83d1b223045058050f59ba119873c852 \ No newline at end of file +804de4a35a0da1c2767537f64f3aebf210367f4c \ No newline at end of file diff --git a/mcs/tools/compiler-tester/compiler-tester.cs b/mcs/tools/compiler-tester/compiler-tester.cs index 265f702ab6..181028ddb4 100644 --- a/mcs/tools/compiler-tester/compiler-tester.cs +++ b/mcs/tools/compiler-tester/compiler-tester.cs @@ -1573,6 +1573,8 @@ namespace TestRunner { return 1; } + compiler = Path.GetFullPath (compiler); + ITester tester; try { Console.WriteLine ("Loading " + compiler + " ..."); diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 576da20cc1..426155be8b 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -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 (); diff --git a/mono/mini/version.h b/mono/mini/version.h index 79343f5249..a8eeba7d5d 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/b59ae60" +#define FULL_VERSION "explicit/1929878" diff --git a/mono/tests/Makefile.am.REMOVED.git-id b/mono/tests/Makefile.am.REMOVED.git-id index 5ad8c7b18b..1ce66cd68c 100644 --- a/mono/tests/Makefile.am.REMOVED.git-id +++ b/mono/tests/Makefile.am.REMOVED.git-id @@ -1 +1 @@ -95b58685559d39eb38f0bcdfb91fca13976561e8 \ No newline at end of file +e865f2eae0c1c690cd99dbd3869081542bb71605 \ No newline at end of file diff --git a/mono/tests/Makefile.in.REMOVED.git-id b/mono/tests/Makefile.in.REMOVED.git-id index a89ab7f297..7efab42dc4 100644 --- a/mono/tests/Makefile.in.REMOVED.git-id +++ b/mono/tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -9dfa33da6257cb0393e44903ca351c9f3e3f32c8 \ No newline at end of file +6dd3eca708dad012afdca952dcd6fafcf6daedfc \ No newline at end of file diff --git a/mono/tests/test-multi-netmodule-4-exe.cs b/mono/tests/test-multi-netmodule-4-exe.cs index 03cd242592..79b6871a77 100644 --- a/mono/tests/test-multi-netmodule-4-exe.cs +++ b/mono/tests/test-multi-netmodule-4-exe.cs @@ -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"); diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index aacbc8e90bba1348f92fe68e7d962262cb0c83cb..78085fc0a02c7900272e6c1032b22070562b644f 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1JliKxQw^}O0x!g delta 20 bcmbQIHBW29Q!aKh1p^B!1Cz~fxQw^}N|gq9 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 3eb5a22312..937df1a055 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -53fdfbb1cc2306dec9e6c6abff94329708065c70 \ No newline at end of file +dc4fb2a538733b148c53c53a2ed8e902334f45c6 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 4d3dc2bb4c12b3b7bf5c7daf3f56aaacf3a59330..b4769838572c0184ba862fb13d8a5139b36ce8de 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)2f`NsVf$3&b#VK+CQPT#o delta 20 bcmX?Ef3kjqo+7)Mf`NsVfyri5#VK+CQMCrH diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 896e3c51be..7514f6dc55 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -26abd8696f18d45a2b7c660aadb907d46ec72458 \ No newline at end of file +98ba62865bf4d88ec0b095c7684f32cb6047f472 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 0863e219916b7f1c2c41ba0693351766849c0d53..b4895db21028e14bc9dbe9e6f51f0dcb5f500f25 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FGtPoB7oXv;bix2MquK delta 22 dcmeyri1Gg-#tj_m>}CoE7FGr(oB7oXv;biT2MPcH diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index dbf88dde37..19b94cca16 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -d3c27c7daccd3019d9b23182323fb1e0ac3cf001 \ No newline at end of file +aeb457e40f9fcea8685c24eab93b2aa71ed987a1 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index bc23292497..eebdd77fce 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index c62488cb28b9be9a83c31274200f22330606f9d8..126fd53df184918014371f14a803d824c2680b02 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXMnH>XZzYzF{t90-E| delta 22 ecmaF1gXP%{mJM-J+07ITEUXMnHm6QyYzF{s{s@2o diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 33465b553a..74dda3aad0 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -c4b141396ff84f455f5dc6f92099ab3e0ba81d1a \ No newline at end of file +2f4bfbf27bf8d9d68b1cf15efc1a6ed6b7c2c9e4 \ No newline at end of file