Imported Upstream version 5.10.0.49

Former-commit-id: 26d56271ea25d4854e5aa56dee7109315d571761
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-01-25 19:12:49 +00:00
parent e46a49ecf1
commit cb2f3eca2f
42 changed files with 49 additions and 39 deletions

View File

@ -1 +1 @@
d13f7ea6116e119ab479d11eb1c2998854e15762
9235bb579dc4f949ba8acb513249945ef9c4b103

View File

@ -1 +1 @@
c88fcfe91d4abdcba2e28a486d695c94df35b127
3b32b361ca53f90f6eee4ed42e33d91a3ec6485a

View File

@ -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";

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
0c6b96cabb87945e181555cd14696eec7f413c96
cd7c43f8dffa2586b1282b8887479e468a95d75c

View File

@ -1 +1 @@
26cf699a882dad8e6745e3095e542f9be2ec3dfd
731475c0dbf86b158bd24be0310a9846abe60a58

View File

@ -1 +1 @@
2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5
17220641ad6d74a4699900869da6bff91029bfeb

View File

@ -1 +1 @@
6e98556edcd87d96ce3c96881c77122a9329f179
5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9

View File

@ -1 +1 @@
58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52
e0a5c2029b5171ed9d510390ec114ffc0f330336

View File

@ -1 +1 @@
c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2
6bcfc2ce9660079db605d187ed4985a9ba7d0d80

View File

@ -1 +1 @@
8b46bae8f7d8fd173ad9d80dac69406758078f63
c567160c9b24180b335d37858188d402e39c610c

View File

@ -1 +1 @@
0c6b96cabb87945e181555cd14696eec7f413c96
cd7c43f8dffa2586b1282b8887479e468a95d75c

View File

@ -1 +1 @@
26cf699a882dad8e6745e3095e542f9be2ec3dfd
731475c0dbf86b158bd24be0310a9846abe60a58

View File

@ -1 +1 @@
2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5
17220641ad6d74a4699900869da6bff91029bfeb

View File

@ -1 +1 @@
6e98556edcd87d96ce3c96881c77122a9329f179
5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9

View File

@ -1 +1 @@
58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52
e0a5c2029b5171ed9d510390ec114ffc0f330336

View File

@ -1 +1 @@
c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2
6bcfc2ce9660079db605d187ed4985a9ba7d0d80

View File

@ -1 +1 @@
8b46bae8f7d8fd173ad9d80dac69406758078f63
c567160c9b24180b335d37858188d402e39c610c

View File

@ -1 +1 @@
0c6b96cabb87945e181555cd14696eec7f413c96
cd7c43f8dffa2586b1282b8887479e468a95d75c

View File

@ -1 +1 @@
26cf699a882dad8e6745e3095e542f9be2ec3dfd
731475c0dbf86b158bd24be0310a9846abe60a58

View File

@ -1 +1 @@
2f5bd8adba2dd7c5397860de0a9f4a936a49d0f5
17220641ad6d74a4699900869da6bff91029bfeb

View File

@ -1 +1 @@
6e98556edcd87d96ce3c96881c77122a9329f179
5e294b7788acf5ecd7ca9c6c1b5a8a7aa83291d9

View File

@ -1 +1 @@
58f9fe7c5d0b09d1c0bc81f0759f43aed7760f52
e0a5c2029b5171ed9d510390ec114ffc0f330336

View File

@ -1 +1 @@
c4e7ed7e47bd2bff5470aa5ebb9d990491bfa4b2
6bcfc2ce9660079db605d187ed4985a9ba7d0d80

View File

@ -1 +1 @@
8b46bae8f7d8fd173ad9d80dac69406758078f63
c567160c9b24180b335d37858188d402e39c610c

View File

@ -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);

View File

@ -1 +1 @@
46eeeebf0c1fd15fb72ad7b103d23678dd805d08
0be27681ecbae4d86e37587094491cd49768b9f3

View File

@ -1 +1 @@
00f6f4469e507014efbd8c92076a616d6bf9bcad
c66116963bfc3d54bd7a7e2db807e92d9cca29fc

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/57500fc"
#define FULL_VERSION "explicit/aa440db"

View File

@ -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;
}
}

Binary file not shown.

View File

@ -1 +1 @@
6d5c1c97068430719bdce9599f075c7e38847827
57d7a2b6f1f575527fba5620c38d34bfc4341afd

Binary file not shown.

View File

@ -1 +1 @@
3a0374c4e8e8125017afee2023247d8dc7ffb068
ca9e56c3f41e8b0a357685c51a89c891b8d1589f

Binary file not shown.

View File

@ -1 +1 @@
c5a23b8f1007618619ddadc43914895f847079c4
a7469b251ef4163428476e9e7f51d51bc31820b5

View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
09b625e3b27b5695998de76fb2cd7c04e29f2d20
59fcbd43b9d0f7a5af0b61dcb410d3306dcf5d1a