From b8f7d9129e8147885a4b7e7be6136ec0812dc2a3 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Mon, 22 Apr 2019 22:18:01 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.190 Former-commit-id: e193e16b440728be216d156a01a02450e7882323 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/bockbuild/util/util.py | 6 ++++++ mcs/build/common/Consts.cs | 2 +- .../Test/System.Reflection/MethodInfoTest.cs | 9 +++++++++ ...monodroid_corlib_xtest.dll.exclude.sources | 2 ++ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mcs/packages/Makefile | 2 +- mcs/tools/xbuild/Makefile | 12 ++++++------ mono/metadata/object.c.REMOVED.git-id | 2 +- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/version.h | 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 +- 52 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 mcs/class/corlib/monodroid_corlib_xtest.dll.exclude.sources diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index c153837832..bf950e082b 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -abefaf5dbffc4e80018b084cd325822f1344cf89 \ No newline at end of file +73e8c9d278acfcd5e39a2e522cbcfc96598a7d01 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a15ef0efc7..d1a42d7c47 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -b98bb12c4d49d9270bb87247aae383eb7df49a04 \ No newline at end of file +acd5c22d85e3db995bbb3bcfa3b6b4d9d7c4af96 \ No newline at end of file diff --git a/external/bockbuild/bockbuild/util/util.py b/external/bockbuild/bockbuild/util/util.py index 96233cc311..115a069b2c 100644 --- a/external/bockbuild/bockbuild/util/util.py +++ b/external/bockbuild/bockbuild/util/util.py @@ -548,6 +548,12 @@ def iterate_dir(dir, with_links=False, with_dirs=False, summary=False): dirs = dirs + 1 if with_dirs: yield root + if with_dirs and with_links: + for subdir in subdirs: + path = os.path.join(root, subdir) + if os.path.islink(path): + links = links + 1 + yield path for file in filelist: path = os.path.join(root, file) if os.path.islink(path): diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 9eb163ecc5..5c4b4ec8fa 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.184"; + public const string MonoVersion = "6.0.0.190"; 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/MethodInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs index ef6b571451..a439865ae3 100644 --- a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs +++ b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs @@ -658,6 +658,15 @@ namespace MonoTests.System.Reflection Assert.AreEqual (10, pi2.GetGetMethod ().Invoke (10, null)); } + [Test] + public void NullableTestsStatic () + { + Nullable val = new Nullable(new Double()); + MethodInfo mi = typeof (Nullable).GetMethod ("op_Implicit"); + object obj = val; + mi.Invoke(null, new[] { obj }); + } + public static void foo_generic () { } diff --git a/mcs/class/corlib/monodroid_corlib_xtest.dll.exclude.sources b/mcs/class/corlib/monodroid_corlib_xtest.dll.exclude.sources new file mode 100644 index 0000000000..0173eb16a2 --- /dev/null +++ b/mcs/class/corlib/monodroid_corlib_xtest.dll.exclude.sources @@ -0,0 +1,2 @@ +../../../external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs +../../../external/corefx/src/System.IO.FileSystem/tests/FileInfo/CopyTo.cs diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 1addba13a4..b60e22537d 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -63b74fddf7c80391af92f886885a8acc83e7192c \ No newline at end of file +100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 7ca8c7a10d..37772ce4c7 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d803005b601b49f58cbc88c63dd40a0a01747f09 \ No newline at end of file +f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 54a4a97f01..00f6a088ea 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -25eb9c458720e5471a610d30cb872cb9707e3428 \ No newline at end of file +c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 6214acd6693249bc563149b994fd341850c0e505..a53496affa963075c96cd4a96779dfb5acf462e3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ6t&ybfsD0`0W=H{XH0DKC(VUPwJOUoJXKYlx6lj$uLcD< S05AY5m!N$CDz~l^0a9?@G!}gT delta 60 zcmV-C0K@-)hz5X&29SsZ)Boa%fsD0`0W=H{6}5lK?a&%Txo7zjhCOvkx6lj$uLcD; S05kw9m!N$CDz~l^0a9=si5Knw diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index abfc0addfa..cce8725521 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 \ No newline at end of file +2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 5cf79cd986..75f1e24d41 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7a9505f597fb6a1834a18d39d25346069ea8d8a1 \ No newline at end of file +3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 61183e8b53..3cb61250ab 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -013ae33b3c5b61fd8a7129e4806417c2f4505293 \ No newline at end of file +885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index ace8393953..d110c325ca 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 \ No newline at end of file +ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 1addba13a4..b60e22537d 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -63b74fddf7c80391af92f886885a8acc83e7192c \ No newline at end of file +100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 7ca8c7a10d..37772ce4c7 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d803005b601b49f58cbc88c63dd40a0a01747f09 \ No newline at end of file +f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 54a4a97f01..00f6a088ea 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -25eb9c458720e5471a610d30cb872cb9707e3428 \ No newline at end of file +c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 6214acd6693249bc563149b994fd341850c0e505..a53496affa963075c96cd4a96779dfb5acf462e3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ6t&ybfsD0`0W=H{XH0DKC(VUPwJOUoJXKYlx6lj$uLcD< S05AY5m!N$CDz~l^0a9?@G!}gT delta 60 zcmV-C0K@-)hz5X&29SsZ)Boa%fsD0`0W=H{6}5lK?a&%Txo7zjhCOvkx6lj$uLcD; S05kw9m!N$CDz~l^0a9=si5Knw diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index abfc0addfa..cce8725521 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 \ No newline at end of file +2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 5cf79cd986..75f1e24d41 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7a9505f597fb6a1834a18d39d25346069ea8d8a1 \ No newline at end of file +3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 61183e8b53..3cb61250ab 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -013ae33b3c5b61fd8a7129e4806417c2f4505293 \ No newline at end of file +885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index ace8393953..d110c325ca 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 \ No newline at end of file +ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 1addba13a4..b60e22537d 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -63b74fddf7c80391af92f886885a8acc83e7192c \ No newline at end of file +100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 7ca8c7a10d..37772ce4c7 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d803005b601b49f58cbc88c63dd40a0a01747f09 \ No newline at end of file +f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 54a4a97f01..00f6a088ea 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -25eb9c458720e5471a610d30cb872cb9707e3428 \ No newline at end of file +c97fa81a52e33e709aba8f6d48ce0e15ba59648e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 6214acd6693249bc563149b994fd341850c0e505..a53496affa963075c96cd4a96779dfb5acf462e3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ6t&ybfsD0`0W=H{XH0DKC(VUPwJOUoJXKYlx6lj$uLcD< S05AY5m!N$CDz~l^0a9?@G!}gT delta 60 zcmV-C0K@-)hz5X&29SsZ)Boa%fsD0`0W=H{6}5lK?a&%Txo7zjhCOvkx6lj$uLcD; S05kw9m!N$CDz~l^0a9=si5Knw diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index abfc0addfa..cce8725521 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 \ No newline at end of file +2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 5cf79cd986..75f1e24d41 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7a9505f597fb6a1834a18d39d25346069ea8d8a1 \ No newline at end of file +3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 61183e8b53..3cb61250ab 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -013ae33b3c5b61fd8a7129e4806417c2f4505293 \ No newline at end of file +885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index ace8393953..d110c325ca 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 \ No newline at end of file +ab35bec467401fde399b5f27fac9b8d6df19eaca \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 1addba13a4..b60e22537d 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -63b74fddf7c80391af92f886885a8acc83e7192c \ No newline at end of file +100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 7ca8c7a10d..37772ce4c7 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d803005b601b49f58cbc88c63dd40a0a01747f09 \ No newline at end of file +f0b284f1eef9c4ad53e46eb667569acbc301c8eb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 47da66c4ff..70ae662fae 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c70e268c083360f13d1031ae6e199545468d0bcf \ No newline at end of file +aa583f56071869bac3062f01221b9ef640d162f3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 6214acd6693249bc563149b994fd341850c0e505..a53496affa963075c96cd4a96779dfb5acf462e3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ6t&ybfsD0`0W=H{XH0DKC(VUPwJOUoJXKYlx6lj$uLcD< S05AY5m!N$CDz~l^0a9?@G!}gT delta 60 zcmV-C0K@-)hz5X&29SsZ)Boa%fsD0`0W=H{6}5lK?a&%Txo7zjhCOvkx6lj$uLcD; S05kw9m!N$CDz~l^0a9=si5Knw diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index abfc0addfa..cce8725521 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 \ No newline at end of file +2b37718af0ab691d006d4153f926d0ad3e61c24a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 5cf79cd986..75f1e24d41 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -7a9505f597fb6a1834a18d39d25346069ea8d8a1 \ No newline at end of file +3d8a09adb5c438493dd8010212b9a1114f3890f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 61183e8b53..3cb61250ab 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -013ae33b3c5b61fd8a7129e4806417c2f4505293 \ No newline at end of file +885e28e998117d99418431439fdcefda35b945dd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 94226647fb..cc10b351be 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1fee9fbe69b84bb58769d5bd304a961bbd8eda9e \ No newline at end of file +6d4a7658061b515788cbb55e8a8ba9ef7396f14e \ No newline at end of file diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index 95530754d7..3a1d320918 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -36,7 +36,7 @@ DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-tes ifeq ($(PROFILE), $(DEFAULT_PROFILE)) TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION) -MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/15.0/bin/Roslyn +MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/Current/bin/Roslyn install-local: install-prototypes $(MKINSTALLDIRS) $(TARGET_DIR) diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile index b4b55c8873..18cfed10d3 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -25,7 +25,7 @@ PCL5_FX_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETPortable/v5.0 VS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/VisualStudio PORTABLE_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable NUGET_BUILDTASKS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/NuGet -MSBUILD_EXTENSIONS_15_DIR=$(mono_libdir)/mono/xbuild/15.0 +MSBUILD_EXTENSIONS_CURRENT_DIR=$(mono_libdir)/mono/xbuild/Current ifeq (14.0, $(XBUILD_VERSION)) install-extras: install-versioned-files install-global-files @@ -97,7 +97,7 @@ install-pcl-targets: done install-web-targets: - for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0; do \ + for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0 v16.0; do \ $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ done @@ -106,12 +106,12 @@ NUGET_BUILDTASKS_REPO_DIR=$(topdir)/../external/nuget-buildtasks install-nuget-targets: $(MKINSTALLDIRS) $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) - $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Imports/Microsoft.Common.props/ImportBefore - $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Microsoft.Common.targets/ImportAfter + $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Imports/Microsoft.Common.props/ImportBefore + $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Microsoft.Common.targets/ImportAfter $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.props $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) - $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Imports/Microsoft.Common.props/ImportBefore - $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Microsoft.Common.targets/ImportAfter + $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Imports/Microsoft.Common.props/ImportBefore + $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Microsoft.Common.targets/ImportAfter install-nuget-imports: ifeq (14.0, $(XBUILD_VERSION)) diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index 66b1930760..af47c1d21f 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -c0a83e4270b665f14af645c476695552476a8c8e \ No newline at end of file +efc581af00f42fb46d61f4d094635bef1f7908de \ No newline at end of file diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id index 6d1196de9e..659a9d29cc 100644 --- a/mono/mini/aot-compiler.c.REMOVED.git-id +++ b/mono/mini/aot-compiler.c.REMOVED.git-id @@ -1 +1 @@ -7dd5faf818a0108425a9aa20fa86dc9b77faaaec \ No newline at end of file +1b1a45b7976986c7910e593aea762e789e3bcf28 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 7fae319ceb..e29889b922 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/3a8f93b" +#define FULL_VERSION "explicit/a418e94" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index e8a7fd926772847bf3860cc870e9ca80949707ba..9e9f37875e0918ff535e882d862567a933120230 100644 GIT binary patch delta 18 ZcmbQIHBW29b1qgRLn{;G&2PAjxBx&d1|R?c delta 18 ZcmbQIHBW29b1qgx6Dt$b&2PAjxBx&)1|$Fg diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 0a7441d5c6..cb157e05ff 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -5eb808aed810de17a1b21e69998bde4370e6b0f9 \ No newline at end of file +d27845252900e7a29f889367c914886e5057ea85 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 20ed666a10e5b5fea147a4a2a5a1de2c088ba091..5710133b236e3c24723d8747eec0b68922a1a097 100644 GIT binary patch delta 18 ZcmX?Ef3kjqfg-Dsp_Pg8W>du}asWn-237z7 delta 18 ZcmX?Ef3kjqfg-D+iIs`zW>du}asWoF23i0B diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 13ebf7541b..d90029fd65 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -724bed774d4300f34b4304e64458dab470044466 \ No newline at end of file +bba3dea7a4d70b097345d73c850b78d19e6cf5fc \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index b5eb1a45e254763c3bd2763fa686037599bc0192..259317408e4b3d6ca144813f9a45e3f97367f1e0 100644 GIT binary patch delta 20 bcmeyri1Gg-#tmHRtVV`bCdQlj)eE!$RJaDR delta 20 bcmeyri1Gg-#tmHRtcE65CZ?PD)eE!$RMiHy diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index f6275d4a3c..7efea7325d 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -60776213f8f0c23148f5bb473f6bb24c551e6fe9 \ No newline at end of file +866fcf80050b130aa1b16bdaba078529f581b45e \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index ddfc0f736f..d44907985d 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.184\n" +"Project-Id-Version: mono 6.0.0.190\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-04-22 14:45+0000\n" +"POT-Creation-Date: 2019-04-22 21:43+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 7b3d350fcb5b6018adecdd8bf42664b2e398d918..71fbf6ab7d0e1e385832959c6650b9398d30a615 100644 GIT binary patch delta 20 ccmaF1gXP%{mJJD0S&a;>OpG_DPGxKd0AMEwC;$Ke delta 20 ccmaF1gXP%{mJJD0Sq)9BOiVYYPGxKd0ANH2EC2ui diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index bb99dc6bcc..c397274842 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -210a0ebeb85872d0c1931e5b781a938be23faf0e \ No newline at end of file +682f1c0e11f965de2ef79f60fd6dbde3f0cced8f \ No newline at end of file