Merge branch 'upstream'

Former-commit-id: fb9208a032cb564bcc4f4729d7519ec29470861f
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-01-25 19:20:59 +00:00
commit 6cd7e59c9a
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

Some files were not shown because too many files have changed in this diff Show More