From cb2f3eca2f9035b736dd4f39fbe01f5b8230277b Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 25 Jan 2018 19:12:49 +0000 Subject: [PATCH] Imported Upstream version 5.10.0.49 Former-commit-id: 26d56271ea25d4854e5aa56dee7109315d571761 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/build/library.make | 2 +- mcs/build/profiles/basic.make | 2 +- mcs/build/profiles/build.make | 2 +- mcs/build/profiles/net_4_x.make | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/class-internals.h | 2 +- mono/metadata/class.c.REMOVED.git-id | 2 +- mono/metadata/sre.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/tests/bug-6148.cs | 12 +++++++++++- 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 +- 42 files changed, 49 insertions(+), 39 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 92d39d92f3..0e52bc516b 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -d13f7ea6116e119ab479d11eb1c2998854e15762 \ No newline at end of file +9235bb579dc4f949ba8acb513249945ef9c4b103 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index ef34d9ebdf..8f3045e5c6 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -c88fcfe91d4abdcba2e28a486d695c94df35b127 \ No newline at end of file +3b32b361ca53f90f6eee4ed42e33d91a3ec6485a \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index dc49869681..87bd638347 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.47"; + public const string MonoVersion = "5.10.0.49"; 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/build/library.make b/mcs/build/library.make index 1e9dd82757..43f97e42a0 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -37,7 +37,7 @@ LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE else ifdef API_BIN_REFS -LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/api-snapshot/profiles/$(API_BIN_PROFILE)/%.dll,$(API_BIN_REFS)) +LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(API_BIN_PROFILE)/%.dll,$(API_BIN_REFS)) endif LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_FULL)) diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make index 199effb19a..347b313308 100644 --- a/mcs/build/profiles/basic.make +++ b/mcs/build/profiles/basic.make @@ -31,7 +31,7 @@ MCS = $(BOOTSTRAP_MCS) DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) -API_BIN_PROFILE = net_4_x +API_BIN_PROFILE = v4.7.1 NO_SIGN_ASSEMBLY = yes NO_TEST = yes diff --git a/mcs/build/profiles/build.make b/mcs/build/profiles/build.make index b8dd755fca..d757d10b1c 100644 --- a/mcs/build/profiles/build.make +++ b/mcs/build/profiles/build.make @@ -15,7 +15,7 @@ profile-check: DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) -API_BIN_PROFILE = net_4_x +API_BIN_PROFILE = v4.7.1 NO_SIGN_ASSEMBLY = yes NO_TEST = yes diff --git a/mcs/build/profiles/net_4_x.make b/mcs/build/profiles/net_4_x.make index 09548ace25..5463812acc 100644 --- a/mcs/build/profiles/net_4_x.make +++ b/mcs/build/profiles/net_4_x.make @@ -14,7 +14,7 @@ profile-check: DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) -API_BIN_PROFILE = net_4_x +API_BIN_PROFILE = v4.7.1 FRAMEWORK_VERSION = 4.5 XBUILD_VERSION = 4.0 diff --git a/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id index 08bc690c53..679a8293a2 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0c6b96cabb87945e181555cd14696eec7f413c96 \ No newline at end of file +cd7c43f8dffa2586b1282b8887479e468a95d75c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id index 113c7b2ff6..87f699aadb 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -26cf699a882dad8e6745e3095e542f9be2ec3dfd \ No newline at end of file +731475c0dbf86b158bd24be0310a9846abe60a58 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id index e4e6da7d6a..cfea14dc1d 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5 \ No newline at end of file +17220641ad6d74a4699900869da6bff91029bfeb \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id index 41b2142f8c..1f9201c2f7 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6e98556edcd87d96ce3c96881c77122a9329f179 \ No newline at end of file +5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id index 4a1469aeab..4da1e12801 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52 \ No newline at end of file +e0a5c2029b5171ed9d510390ec114ffc0f330336 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id index 138dbe3b0c..e172b007e0 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2 \ No newline at end of file +6bcfc2ce9660079db605d187ed4985a9ba7d0d80 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id index 585e1996ab..0f30e02081 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8b46bae8f7d8fd173ad9d80dac69406758078f63 \ No newline at end of file +c567160c9b24180b335d37858188d402e39c610c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id index 08bc690c53..679a8293a2 100644 --- a/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0c6b96cabb87945e181555cd14696eec7f413c96 \ No newline at end of file +cd7c43f8dffa2586b1282b8887479e468a95d75c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id index 113c7b2ff6..87f699aadb 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -26cf699a882dad8e6745e3095e542f9be2ec3dfd \ No newline at end of file +731475c0dbf86b158bd24be0310a9846abe60a58 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id index e4e6da7d6a..cfea14dc1d 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5 \ No newline at end of file +17220641ad6d74a4699900869da6bff91029bfeb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id index 41b2142f8c..1f9201c2f7 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6e98556edcd87d96ce3c96881c77122a9329f179 \ No newline at end of file +5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id index 4a1469aeab..4da1e12801 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52 \ No newline at end of file +e0a5c2029b5171ed9d510390ec114ffc0f330336 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id index 138dbe3b0c..e172b007e0 100644 --- a/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2 \ No newline at end of file +6bcfc2ce9660079db605d187ed4985a9ba7d0d80 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id index 585e1996ab..0f30e02081 100644 --- a/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8b46bae8f7d8fd173ad9d80dac69406758078f63 \ No newline at end of file +c567160c9b24180b335d37858188d402e39c610c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id index 08bc690c53..679a8293a2 100644 --- a/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0c6b96cabb87945e181555cd14696eec7f413c96 \ No newline at end of file +cd7c43f8dffa2586b1282b8887479e468a95d75c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id index 113c7b2ff6..87f699aadb 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -26cf699a882dad8e6745e3095e542f9be2ec3dfd \ No newline at end of file +731475c0dbf86b158bd24be0310a9846abe60a58 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id index e4e6da7d6a..cfea14dc1d 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5 \ No newline at end of file +17220641ad6d74a4699900869da6bff91029bfeb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id index 41b2142f8c..1f9201c2f7 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6e98556edcd87d96ce3c96881c77122a9329f179 \ No newline at end of file +5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id index 4a1469aeab..4da1e12801 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52 \ No newline at end of file +e0a5c2029b5171ed9d510390ec114ffc0f330336 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id index 138dbe3b0c..e172b007e0 100644 --- a/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2 \ No newline at end of file +6bcfc2ce9660079db605d187ed4985a9ba7d0d80 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id index 585e1996ab..0f30e02081 100644 --- a/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8b46bae8f7d8fd173ad9d80dac69406758078f63 \ No newline at end of file +c567160c9b24180b335d37858188d402e39c610c \ No newline at end of file diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h index b5769cd166..8578b78a7b 100644 --- a/mono/metadata/class-internals.h +++ b/mono/metadata/class-internals.h @@ -918,7 +918,7 @@ void mono_classes_cleanup (void); void -mono_class_layout_fields (MonoClass *klass, int base_instance_size, int packing_size, gboolean sre); +mono_class_layout_fields (MonoClass *klass, int base_instance_size, int packing_size, int real_size, gboolean sre); void mono_class_setup_interface_offsets (MonoClass *klass); diff --git a/mono/metadata/class.c.REMOVED.git-id b/mono/metadata/class.c.REMOVED.git-id index e31434a359..5f605911d3 100644 --- a/mono/metadata/class.c.REMOVED.git-id +++ b/mono/metadata/class.c.REMOVED.git-id @@ -1 +1 @@ -46eeeebf0c1fd15fb72ad7b103d23678dd805d08 \ No newline at end of file +0be27681ecbae4d86e37587094491cd49768b9f3 \ No newline at end of file diff --git a/mono/metadata/sre.c.REMOVED.git-id b/mono/metadata/sre.c.REMOVED.git-id index 9becbbfdd7..95878ab5c3 100644 --- a/mono/metadata/sre.c.REMOVED.git-id +++ b/mono/metadata/sre.c.REMOVED.git-id @@ -1 +1 @@ -00f6f4469e507014efbd8c92076a616d6bf9bcad \ No newline at end of file +c66116963bfc3d54bd7a7e2db807e92d9cca29fc \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 19417615d8..d54160a427 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/57500fc" +#define FULL_VERSION "explicit/aa440db" diff --git a/mono/tests/bug-6148.cs b/mono/tests/bug-6148.cs index a115439333..fd9b26f1a5 100644 --- a/mono/tests/bug-6148.cs +++ b/mono/tests/bug-6148.cs @@ -33,8 +33,15 @@ struct ExplicitPack public int A4; } +[StructLayout(LayoutKind.Explicit, Size = 12)] +struct ExplicitSize +{ + [FieldOffset(0)] + private long Data1; - + [FieldOffset(8)] + private int Data3; +} public class Program { public static unsafe int Main(string[] args) @@ -44,6 +51,9 @@ public class Program { if (sizeof(ExplicitPack) != 18) return 2; + + if (sizeof (ExplicitSize) != 12) + return 3; return 0; } } diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index e1a7f4d524248db21d1e53b214926934fb27184d..718c6be8e004d926c8cd85c9219bb4dcd6809162 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK>1w#ufQ=`pqxQw^}N~#8X delta 20 bcmbQIHBW29Q!aKB1w%6{BeTtKxQw^}N{?R6^W>!XKoB7oXv;biN2MYiI diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 1d60d198c3..ff211fe5f9 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -c5a23b8f1007618619ddadc43914895f847079c4 \ No newline at end of file +a7469b251ef4163428476e9e7f51d51bc31820b5 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 782079d1d4..988ff4dd89 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.47\n" +"Project-Id-Version: mono 5.10.0.49\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-01-24 16:26+0000\n" +"POT-Creation-Date: 2018-01-25 18:52+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 0845243baf4e35660ec0d98b27e2708db67ef4e5..568c934ffa13d939147a46aed49ee7ee41de4e02 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*-aG;Ev!t9Hm6QyYzF{t69|I< delta 22 ecmaF1gXP%{mJM-J*-aD-&8&>fHm6QyYzF{s_y~aj diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 2b2ce15e25..95ab821fe3 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -09b625e3b27b5695998de76fb2cd7c04e29f2d20 \ No newline at end of file +59fcbd43b9d0f7a5af0b61dcb410d3306dcf5d1a \ No newline at end of file