Merge branch 'upstream'

Former-commit-id: 10be295124ba8ca353b2bca9aceea44370e791ed
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-05-31 09:05:26 +00:00
commit da71f93c79
38 changed files with 33 additions and 37 deletions

View File

@ -1 +1 @@
50f6f550476390e9564c961706652c05b9ed6e91 44df991ba30f88ca18964668fe7dfeedaad59fbb

View File

@ -1 +1 @@
6a360cf8eb453ab5eff6ca8d03b42b765d3cca86 6d86be4bee4429c6d41d6bbefa217551f0d0f345

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.14.0.107"; public const string MonoVersion = "5.14.0.110";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
d99c5e817bd2d36b9481f50241ed6fc96258bef8 061d164b61dd4f5d7b45ea45d24beb68e090aa1d

View File

@ -1 +1 @@
d0d386aaa3c7db88dfd01c851392a5ed8d2fd1cf cb48e0acfece34c129d2f0df12736b761894e6ff

View File

@ -1 +1 @@
1e453ea14a0ea95f7899aacd7db4f4f992a51ab3 d9216fb81ca067b812c2af0244ab4b09fda355cc

View File

@ -1 +1 @@
abb6990b1ab01f76c8790818de8463c5ebe1143d 5e57c68548c3d4b813e8afcd3faa90d664d333ee

View File

@ -1 +1 @@
22b720a8610cadc0b2833a54a517b6f8419d9f2f 27f33bdbdeb3aeb2cd0603faa95162b9e685b44c

View File

@ -1 +1 @@
ed5f771051af9034913852471dd016b7e03d85ce 6f76e77a06b2bdc54f25fbd8a4f39aa04c431c44

View File

@ -1 +1 @@
480d6e373d6fdcce197dcc5b5d0c4a50b50ee768 7cb730ea0b4be07c4176b3f102c6e4a6e5697768

View File

@ -1 +1 @@
d99c5e817bd2d36b9481f50241ed6fc96258bef8 061d164b61dd4f5d7b45ea45d24beb68e090aa1d

View File

@ -1 +1 @@
d0d386aaa3c7db88dfd01c851392a5ed8d2fd1cf cb48e0acfece34c129d2f0df12736b761894e6ff

View File

@ -1 +1 @@
1e453ea14a0ea95f7899aacd7db4f4f992a51ab3 d9216fb81ca067b812c2af0244ab4b09fda355cc

View File

@ -1 +1 @@
abb6990b1ab01f76c8790818de8463c5ebe1143d 5e57c68548c3d4b813e8afcd3faa90d664d333ee

View File

@ -1 +1 @@
22b720a8610cadc0b2833a54a517b6f8419d9f2f 27f33bdbdeb3aeb2cd0603faa95162b9e685b44c

View File

@ -1 +1 @@
ed5f771051af9034913852471dd016b7e03d85ce 6f76e77a06b2bdc54f25fbd8a4f39aa04c431c44

View File

@ -1 +1 @@
480d6e373d6fdcce197dcc5b5d0c4a50b50ee768 7cb730ea0b4be07c4176b3f102c6e4a6e5697768

View File

@ -1 +1 @@
d99c5e817bd2d36b9481f50241ed6fc96258bef8 061d164b61dd4f5d7b45ea45d24beb68e090aa1d

View File

@ -1 +1 @@
d0d386aaa3c7db88dfd01c851392a5ed8d2fd1cf cb48e0acfece34c129d2f0df12736b761894e6ff

View File

@ -1 +1 @@
1e453ea14a0ea95f7899aacd7db4f4f992a51ab3 d9216fb81ca067b812c2af0244ab4b09fda355cc

View File

@ -1 +1 @@
abb6990b1ab01f76c8790818de8463c5ebe1143d 5e57c68548c3d4b813e8afcd3faa90d664d333ee

View File

@ -1 +1 @@
22b720a8610cadc0b2833a54a517b6f8419d9f2f 27f33bdbdeb3aeb2cd0603faa95162b9e685b44c

View File

@ -1 +1 @@
ed5f771051af9034913852471dd016b7e03d85ce 6f76e77a06b2bdc54f25fbd8a4f39aa04c431c44

View File

@ -1 +1 @@
480d6e373d6fdcce197dcc5b5d0c4a50b50ee768 7cb730ea0b4be07c4176b3f102c6e4a6e5697768

View File

@ -48,7 +48,7 @@ net_4_5_dirs := \
mono-symbolicate \ mono-symbolicate \
linker-analyzer linker-analyzer
build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr linker cil-strip build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr linker cil-strip corcompare mono-api-html
monodroid_tools_SUBDIRS = cil-strip linker-analyzer mkbundle mdoc mono-symbolicate monodroid_tools_SUBDIRS = cil-strip linker-analyzer mkbundle mdoc mono-symbolicate
monodroid_SUBDIRS = nunit-lite monodroid_SUBDIRS = nunit-lite
monotouch_SUBDIRS = nunit-lite monotouch_SUBDIRS = nunit-lite

View File

@ -156,8 +156,6 @@ libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp llvm-jit.cpp
libmono_llvm_la_LIBADD = $(GLIB_LIBS) $(LLVM_LIBS) $(LLVM_LDFLAGS) libmono_llvm_la_LIBADD = $(GLIB_LIBS) $(LLVM_LIBS) $(LLVM_LDFLAGS)
if HOST_DARWIN if HOST_DARWIN
libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace
else
libmono_llvm_la_LIBADD += $(top_builddir)/mono/mini/libmonoboehm-$(API_VER).la $(boehm_libs)
endif endif
endif endif

View File

@ -156,8 +156,6 @@ libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp llvm-jit.cpp
libmono_llvm_la_LIBADD = $(GLIB_LIBS) $(LLVM_LIBS) $(LLVM_LDFLAGS) libmono_llvm_la_LIBADD = $(GLIB_LIBS) $(LLVM_LIBS) $(LLVM_LDFLAGS)
if HOST_DARWIN if HOST_DARWIN
libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace
else
libmono_llvm_la_LIBADD += $(top_builddir)/mono/mini/libmonoboehm-$(API_VER).la $(boehm_libs)
endif endif
endif endif

View File

@ -1 +1 @@
8b16980c1c29fc6be7db009b71c5c13d0f9f51d7 52f3fcfcf39f747768604ebe620eec382d7825ca

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/fa9903b" #define FULL_VERSION "explicit/2987232"

Binary file not shown.

View File

@ -1 +1 @@
d19b56ff4ebe629bcd32c06248532440140da297 c4e5b70a3f59cdb005d5cdca831827f4d06f26c1

Binary file not shown.

View File

@ -1 +1 @@
2109c83bc9ed3f88df56c1962fb1734c6c3a9a71 a325b0f35c584b9934e4333e4d23d76b0ef1355a

Binary file not shown.

View File

@ -1 +1 @@
f0600289d0a5ea2e9735d2632e532721d564ca5d 890e4f0aab1f73ab3c5f0756055d7fb60a3b2577

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.14.0.107\n" "Project-Id-Version: mono 5.14.0.110\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-05-30 08:20+0000\n" "POT-Creation-Date: 2018-05-31 08:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
b399f5beb558153bdb519de523fcb7af2fb26b3f c5bd43ccb5758441f44946f9d01400aced3e69e7