Imported Upstream version 5.10.0.137

Former-commit-id: a598022caf837e5c0e35b6dfbe6ec2debbf5366a
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-23 09:18:38 +00:00
parent 4373cb63d5
commit 5b69a2693e
42 changed files with 64 additions and 55 deletions

View File

@ -1 +1 @@
0e5069804c3d90814f4f68a89510b58148390a78
bda83dbed0a353d5c9aae1163f4b999e709735eb

View File

@ -1 +1 @@
e4efeac42335109229714144733b3091f80ae170
eba046d8b65fc42f0134cee4678b67368a542fac

View File

@ -12,15 +12,6 @@ from util.util import *
import functools
# FancyURLopener is incorrectly documented; this working handler was
# copied from
# https://mail.python.org/pipermail/python-bugs-list/2006-February/032155.html
class MyUrlOpener(urllib.FancyURLopener):
def http_error_default(*args, **kwargs):
return urllib.URLopener.http_error_default(*args, **kwargs)
class Package:
def __init__(self, name, version=None, organization=None, configure_flags=None, sources=None, revision=None, git_branch=None, source_dir_name=None, override_properties=None, configure=None):
@ -292,11 +283,10 @@ class Package:
def checkout_archive(archive, cache_dest, workspace_dir):
def create_cache():
progress('Downloading: %s' % archive)
try:
filename, message = MyUrlOpener().retrieve(archive, cache_dest)
except IOError as e:
raise CommandException(
'%s error downloading %s' % (e[1], archive))
curl_bin = which('curl')
if not curl_bin:
error('curl not found in PATH')
run (curl_bin,['-L','-o', cache_dest, archive], None)
def update_cache():
pass

View File

@ -674,7 +674,7 @@ def run(cmd, args, cwd, env=None):
proc = subprocess.Popen(cmd_list, shell=False, cwd=cwd,
env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except Exception as e:
error(e)
error(str(e))
stdout, stderr = proc.communicate()
exit_code = proc.returncode

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.132";
public const string MonoVersion = "5.10.0.137";
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

@ -0,0 +1,7 @@
namespace System.Xml
{
static class BinaryCompatibility
{
public static bool TargetsAtLeast_Desktop_V4_5_2 => true;
}
}

View File

@ -5,6 +5,7 @@ Assembly/AssemblyInfo.cs
ReferenceSources/Res.cs
ReferenceSources/LocalAppContextSwitches.cs
ReferenceSources/ThisAssembly.cs
ReferenceSources/BinaryCompatibility.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs
@ -237,7 +238,6 @@ ReferenceSources/ThisAssembly.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeView.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeViewPropertyDescriptor.cs
../referencesource/System.Xml/System/Xml/Core/BinaryCompatibility.cs
../referencesource/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs
../referencesource/System.Xml/System/Xml/Core/ConformanceLevel.cs
../referencesource/System.Xml/System/Xml/Core/DtdProcessing.cs

View File

@ -1 +1 @@
ce18802ab9fddeab8c3df4d80d4920c0078beb8a
044ae0ba30360ac8046e2a0e515420f95b288f46

View File

@ -1 +1 @@
70bd018a65dbc16d9249e9f89aeb73904e06ae5a
cc673b22139b4cc71266e2ee597fe4e505845566

View File

@ -1 +1 @@
d66447f952feb4ec5829e5829e3d25dd8af939e4
7751944281f48f2205099723e6efbfb26620a396

View File

@ -1 +1 @@
bc2df173bcd5877ac4b9a0147065291f7090ede0
de07b190ab40f5a096608c4d885bbd098152cd0b

View File

@ -1 +1 @@
5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a
edd8ee3d35b335e383a211e9b690fb94721f2abb

View File

@ -1 +1 @@
73f330f118271340beadba9943f025f51326505b
f4927f8651f063086e19752ea214536075e84c1d

View File

@ -1 +1 @@
90445e4b34c276c86330ebdab580339e96320d17
62aa938719e0ef286376395e6c8f851ecfd89337

View File

@ -1 +1 @@
ce18802ab9fddeab8c3df4d80d4920c0078beb8a
044ae0ba30360ac8046e2a0e515420f95b288f46

View File

@ -1 +1 @@
70bd018a65dbc16d9249e9f89aeb73904e06ae5a
cc673b22139b4cc71266e2ee597fe4e505845566

View File

@ -1 +1 @@
d66447f952feb4ec5829e5829e3d25dd8af939e4
7751944281f48f2205099723e6efbfb26620a396

View File

@ -1 +1 @@
bc2df173bcd5877ac4b9a0147065291f7090ede0
de07b190ab40f5a096608c4d885bbd098152cd0b

View File

@ -1 +1 @@
5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a
edd8ee3d35b335e383a211e9b690fb94721f2abb

View File

@ -1 +1 @@
73f330f118271340beadba9943f025f51326505b
f4927f8651f063086e19752ea214536075e84c1d

View File

@ -1 +1 @@
90445e4b34c276c86330ebdab580339e96320d17
62aa938719e0ef286376395e6c8f851ecfd89337

View File

@ -1 +1 @@
ce18802ab9fddeab8c3df4d80d4920c0078beb8a
044ae0ba30360ac8046e2a0e515420f95b288f46

View File

@ -1 +1 @@
70bd018a65dbc16d9249e9f89aeb73904e06ae5a
cc673b22139b4cc71266e2ee597fe4e505845566

View File

@ -1 +1 @@
d66447f952feb4ec5829e5829e3d25dd8af939e4
7751944281f48f2205099723e6efbfb26620a396

View File

@ -1 +1 @@
bc2df173bcd5877ac4b9a0147065291f7090ede0
de07b190ab40f5a096608c4d885bbd098152cd0b

View File

@ -1 +1 @@
5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a
edd8ee3d35b335e383a211e9b690fb94721f2abb

View File

@ -1 +1 @@
73f330f118271340beadba9943f025f51326505b
f4927f8651f063086e19752ea214536075e84c1d

View File

@ -1 +1 @@
90445e4b34c276c86330ebdab580339e96320d17
62aa938719e0ef286376395e6c8f851ecfd89337

View File

@ -786,6 +786,9 @@ llvmaotcheck:
gsharedvtcheck:
$(MAKE) fullaotcheck GSHAREDVT=1
hybridcheck:
$(MAKE) fullaotcheck HYBRID=1
fullaot_regtests = $(regtests)
fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll
@ -818,15 +821,18 @@ FULLAOT_LIBS = $(filter-out $(FULLAOT_LIBS_DISABLED),$(FULLAOT_LIBS_UNIVERSAL))
FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp
FULLAOT_AOT_ARGS=$(if $(HYBRID),hybrid,full)
FULLAOT_ARGS=$(if $(HYBRID),--hybrid-aot,--full-aot)
# This currently only works on amd64/arm
fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps)
rm -rf $(FULLAOT_TMP_DIR)
mkdir $(FULLAOT_TMP_DIR)
$(MAKE) fullaot-libs AOT_FLAGS="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
$(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --full-aot $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
# This can run in parallel
fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS))

View File

@ -786,6 +786,9 @@ llvmaotcheck:
gsharedvtcheck:
$(MAKE) fullaotcheck GSHAREDVT=1
hybridcheck:
$(MAKE) fullaotcheck HYBRID=1
fullaot_regtests = $(regtests)
fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll
@ -818,15 +821,18 @@ FULLAOT_LIBS = $(filter-out $(FULLAOT_LIBS_DISABLED),$(FULLAOT_LIBS_UNIVERSAL))
FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp
FULLAOT_AOT_ARGS=$(if $(HYBRID),hybrid,full)
FULLAOT_ARGS=$(if $(HYBRID),--hybrid-aot,--full-aot)
# This currently only works on amd64/arm
fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps)
rm -rf $(FULLAOT_TMP_DIR)
mkdir $(FULLAOT_TMP_DIR)
$(MAKE) fullaot-libs AOT_FLAGS="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
$(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --full-aot $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
# This can run in parallel
fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS))

View File

@ -1 +1 @@
5ca98ed1bfac018a95c2b108d05f285184da0b02
22a194c7230dfadcaa4ff33d31d209c6c51c388e

View File

@ -1 +1 @@
202218e11ec57b6a554aa3c292d81c9715ace2e6
af642c20307dbff5cb4f53ca18e050e56fb26cb4

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/4adf822"
#define FULL_VERSION "explicit/947e457"

Binary file not shown.

View File

@ -1 +1 @@
7770d52688c3155ae03c4f0ec0ddc7e4260c3f1a
7846070327214765b6c27bedaeb95a3aa33b1acf

Binary file not shown.

View File

@ -1 +1 @@
a4c3dcf6e6b105951fb200e08d3fd2a43daa7c7f
2febbd8b2edd63be6567c8d23d0a4adde9f8757b

Binary file not shown.

View File

@ -1 +1 @@
692d6f200d94510c881b88aaeec2314f2bb56246
75ce49627aba359ce842d79b6963923661f61535

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.132\n"
"Project-Id-Version: mono 5.10.0.137\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-22 08:43+0000\n"
"POT-Creation-Date: 2018-02-23 08:31+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 @@
117455723803c35ee7acd85c13d14c19df38f54c
3be49746c9290b85c3e75df915642f1f43af201c