diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 081708186d..a87dddcb4f 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -2f9aab488d9693102bd839af379a13a78a4ae23d \ No newline at end of file +29934128e74365026cd0e20fc003e23148281b95 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index de83ab4c10..20d1642e56 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -1c9f6eaaaa26d36b69f66c399686242efa8fd7d6 \ No newline at end of file +8cf64e6d8b3715983f82419725e624b70b0ef99d \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 3da799eeb7..505813ab21 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -1,7 +1,8 @@ -class GtkPackage (GnomeGitPackage): +class GtkPackage (GitHubPackage): def __init__(self): - GnomeGitPackage.__init__(self, 'gtk+', '2.24', '280fc402be5fb46b66bcd32056963bb1afb8b54b', + GitHubPackage.__init__(self, 'GNOME', 'gtk', '2.24', '280fc402be5fb46b66bcd32056963bb1afb8b54b', + configure='./autogen.sh --prefix="%{package_prefix}"', configure_flags=[ '--with-gdktarget=%{gdk_target}', # '--disable-cups', diff --git a/external/bockbuild/packages/gtk-sharp.py b/external/bockbuild/packages/gtk-sharp.py index 1d52bf0872..b35cf23fb2 100644 --- a/external/bockbuild/packages/gtk-sharp.py +++ b/external/bockbuild/packages/gtk-sharp.py @@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package): Package.__init__(self, 'gtk-sharp', sources=['git://github.com/mono/gtk-sharp.git'], git_branch='gtk-sharp-2-12-branch', - revision='ae7bbb340c0e4baad27264727f6ca80ebbc882c0', + revision='372b03b5cf68af8088e1fec00c201ea057578021', override_properties={ 'configure': './bootstrap-2.12 --prefix=%{package_prefix}', } diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 1ae8e89d7a..e59c78085d 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.10.0.97"; + public const string MonoVersion = "5.10.0.101"; 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/Facades/System.IO.Compression.ZipFile/Makefile b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile index 92949d59dd..10bbd967bf 100644 --- a/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile +++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile @@ -9,7 +9,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades LIBRARY = System.IO.Compression.ZipFile.dll -KEYFILE = ../../msfinal.pub +KEYFILE = ../../ecma.pub SIGN_FLAGS = /delaysign /nowarn:1616,1699 LIB_REFS = System System.IO.Compression.FileSystem LIB_MCS_FLAGS = $(SIGN_FLAGS) diff --git a/mcs/class/System.Dynamic/Makefile b/mcs/class/System.Dynamic/Makefile index b4706f3d03..bc384dc205 100644 --- a/mcs/class/System.Dynamic/Makefile +++ b/mcs/class/System.Dynamic/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = System.Dynamic.dll LIB_REFS = System.Core System -KEYFILE = ../ecma.pub +KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -nowarn:414,169 # This is a .NET 4.0+ only assembly diff --git a/mcs/class/System.Reflection.Context/Makefile b/mcs/class/System.Reflection.Context/Makefile index 1961066c52..4d29c7b2dd 100644 --- a/mcs/class/System.Reflection.Context/Makefile +++ b/mcs/class/System.Reflection.Context/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Reflection.Context.dll LIB_REFS = System -KEYFILE = ../msfinal.pub +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = NO_TEST = yes diff --git a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index 6461e276ab..c141ee624e 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file +d5fe529e72a19edabb8d0d737134f42d61076a2e \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index f0ac12d454..62c948c471 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file +d6603fb55c99e4e6a2ab0f992aa575a430a23daf \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index b5c99c0246..ec42ed58b8 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file +ca7879c6464de633c5d55777e99f90f6c32b0346 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index 820ed90e15..d9bca73107 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file +05a25e094cf7053d826c561b6bae1934b651c4cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index 62c4755068..431d59bb42 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file +4dda84573eb2e64b6ce95ccc37cb297d0d96ac26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index 1799e95e59..0db787fc1e 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file +2d54b1ef285e46cc986e00ef7bcd7775e3412a56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index 2098c85e58..d462d3c9df 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file +ffe45e62e511ea47af2a066b17eb0637418d7347 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index 6461e276ab..c141ee624e 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file +d5fe529e72a19edabb8d0d737134f42d61076a2e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index f0ac12d454..62c948c471 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file +d6603fb55c99e4e6a2ab0f992aa575a430a23daf \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index b5c99c0246..ec42ed58b8 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file +ca7879c6464de633c5d55777e99f90f6c32b0346 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index 820ed90e15..d9bca73107 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file +05a25e094cf7053d826c561b6bae1934b651c4cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index 62c4755068..431d59bb42 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file +4dda84573eb2e64b6ce95ccc37cb297d0d96ac26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index 1799e95e59..0db787fc1e 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file +2d54b1ef285e46cc986e00ef7bcd7775e3412a56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index 2098c85e58..d462d3c9df 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file +ffe45e62e511ea47af2a066b17eb0637418d7347 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index 6461e276ab..c141ee624e 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file +d5fe529e72a19edabb8d0d737134f42d61076a2e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index f0ac12d454..62c948c471 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file +d6603fb55c99e4e6a2ab0f992aa575a430a23daf \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index b5c99c0246..ec42ed58b8 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file +ca7879c6464de633c5d55777e99f90f6c32b0346 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index 820ed90e15..d9bca73107 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file +05a25e094cf7053d826c561b6bae1934b651c4cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index 62c4755068..431d59bb42 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file +4dda84573eb2e64b6ce95ccc37cb297d0d96ac26 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index 1799e95e59..0db787fc1e 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file +2d54b1ef285e46cc986e00ef7bcd7775e3412a56 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index 2098c85e58..d462d3c9df 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file +ffe45e62e511ea47af2a066b17eb0637418d7347 \ No newline at end of file diff --git a/mono/mini/aot-tests.cs b/mono/mini/aot-tests.cs index 176cbeac74..01e9bcbd6e 100644 --- a/mono/mini/aot-tests.cs +++ b/mono/mini/aot-tests.cs @@ -193,6 +193,10 @@ class Tests public static T Get_T (object o) { return (T)o; } + + public static long vtype_by_val (T1 t1, T2 t2, T3 t3, T4 t4, long? t5) { + return (long)t5; + } } [Category ("DYNCALL")] @@ -212,6 +216,12 @@ class Tests return 0; } + static int test_42_arm64_dyncall_vtypebyval () { + var method = typeof (Foo5).GetMethod ("vtype_by_val").MakeGenericMethod (new Type [] { typeof (int), typeof (long?), typeof (long?), typeof (long?), typeof (long?) }); + long res = (long)method.Invoke (null, new object [] { 1, 2L, 3L, 4L, 42L }); + return (int)res; + } + class Foo6 { public T reg_stack_split_inner (int i, int j, T l) { return l; diff --git a/mono/mini/mini-arm64.c.REMOVED.git-id b/mono/mini/mini-arm64.c.REMOVED.git-id index 3a770e4b96..027876c9ca 100644 --- a/mono/mini/mini-arm64.c.REMOVED.git-id +++ b/mono/mini/mini-arm64.c.REMOVED.git-id @@ -1 +1 @@ -830ecebfeb3b595f9e1857a7604b8f10f3821f37 \ No newline at end of file +33e5a40b241d520cf4a8eb5274551fb83985185c \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 5c0f6c91e2..68c827506e 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/f5e8783" +#define FULL_VERSION "explicit/b66bc53" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 5a95934f80..057eb96679 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 07f713c029..c5ba6574b8 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -e66b326eae1afe9d2ee9446be255281b998c4bf1 \ No newline at end of file +bd80b37ca3851a629369e3a68ca2434d0f1e993c \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 68de6df6c8..c2312b2f6d 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 725edc4b2d..c2663c3f6b 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -9b3caa26926933e058493040b539fba2bf962ecc \ No newline at end of file +30f9a068a58a1a7f137f29bfffe003b519b9c28c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d143a1a27c..5b1804a286 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index f544d3289b..01c86fe53f 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -6aab38cf25b4aa3a99cb06f8325c44de73e07d3b \ No newline at end of file +5bb2aea616b503b910b63fd1ca78da99d1030b19 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 3f6a0056df..63840f462e 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.0.97\n" +"Project-Id-Version: mono 5.10.0.101\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-02-08 18:58+0000\n" +"POT-Creation-Date: 2018-02-09 18:50+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 a96b1c3e9e..33cc4495f0 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 004c031c7b..dd09f21fcb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -f7015989de1c8fafcbf9757eeda7e4ed9a75bbb0 \ No newline at end of file +c20632dfffb56de6e750c6607472862e453d1095 \ No newline at end of file