Imported Upstream version 5.10.1.2

Former-commit-id: 4a4d20b03e9e509d6d89eaf6a6226999e9214e2a
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-20 09:34:06 +00:00
parent 67cbe538ec
commit 206c528043
44 changed files with 57 additions and 61 deletions

View File

@ -11,15 +11,9 @@ else
tools_dir = tools
endif
if BUILD_SUPPORT
support_dir = support
else
support_dir =
endif
SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
# Keep in sync with SUBDIRS
DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
all: update_submodules

View File

@ -444,11 +444,9 @@ MONOTOUCH_SUBDIRS = $(libgc_dir) mono
# Some tools might not build when cross-compiling
@CROSS_COMPILING_TRUE@tools_dir =
@BUILD_SUPPORT_FALSE@support_dir =
@BUILD_SUPPORT_TRUE@support_dir = support
SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
# Keep in sync with SUBDIRS
DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
SUBMODULE_ERROR = 'Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
EXTRA_DIST = \
README.md \

View File

@ -1 +1 @@
c5f70c0f39376db354a20786c6e0272fcc830441
076c7f7ea710f371f2b456306d293464fb64345c

View File

@ -1 +1 @@
d6ac4f046b36cae93b5e18465e1aa689b4ba4e62
3dfc7bdce20df1f718af232b5a9e164e9cbc125c

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

@ -320,11 +320,9 @@ namespace System.Net {
try {
IPAddress newAddress = IPAddress.Parse(h_addrlist[i]);
#pragma warning disable 618
if( (Socket.SupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
(Socket.SupportsIPv4 && newAddress.AddressFamily == AddressFamily.InterNetwork) )
if( (Socket.OSSupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
(Socket.OSSupportsIPv4 && newAddress.AddressFamily == AddressFamily.InterNetwork) )
addrlist.Add(newAddress);
#pragma warning restore 618
} catch (ArgumentNullException) {
/* Ignore this, as the
* internal call might have

View File

@ -209,6 +209,13 @@ namespace MonoTests.System.Net
}
}
[Test]
[Category("NotOnWindows")]
public void GetHostAddresses_IPv6 ()
{
var address = Dns.GetHostAddresses("ipv6.google.com");
}
[Test]
public void GetHostName ()
{

View File

@ -241,9 +241,6 @@ public class IPAddressTest
[Test]
public void IsLoopbackV6 ()
{
// if (!Socket.SupportsIPv6)
// Assert.Ignore ("IPv6 must be enabled in machine.config");
IPAddress ip = IPAddress.IPv6Loopback;
Assert.IsTrue (IPAddress.IsLoopback (ip), "#1");
@ -612,9 +609,6 @@ public class IPAddressTest
[Test]
public void ParseWrongV6 ()
{
//if (!Socket.SupportsIPv6)
// Assert.Ignore ("IPv6 must be enabled in machine.config");
for (int i = 0; i < ipv6ParseWrong.Length; i++) {
string ipAddress = ipv6ParseWrong [i];

View File

@ -1 +1 @@
70e29cd0e8b0b23bc8dc7580de11d973783d714e
782ff3108fa8594e8f79418d1c0a5493c1f41b9e

View File

@ -1 +1 @@
ac71f3f0709ddd3ac74b143c165630ddd064ba97
397304064b2cf8faea733540adc178294323fa7c

View File

@ -1 +1 @@
355ee74171cf5daf899b3cdc85a62836bf07fc25
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea

View File

@ -1 +1 @@
378f224b082f58447996654813b4ea04385c49ad
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730

View File

@ -1 +1 @@
d313843506c752224b1125738296aee06010db07
00489f90d93ff78c4a085a84390061140e81a9af

View File

@ -1 +1 @@
7b8696a9592252dafa94d4a38f88fa5e993f747e
72326c29d144b8f48bb26a50f5f689488e4eca0b

View File

@ -1 +1 @@
4f317c715c40a29b6569c4e5e41a8af8032b7949
a43fee480db4e61c27d272bea6ba535d161d1cc2

View File

@ -1 +1 @@
a3d1a27dada9d8e5b43cb31d116ce5231b684feb
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f

View File

@ -1 +1 @@
70e29cd0e8b0b23bc8dc7580de11d973783d714e
782ff3108fa8594e8f79418d1c0a5493c1f41b9e

View File

@ -1 +1 @@
ac71f3f0709ddd3ac74b143c165630ddd064ba97
397304064b2cf8faea733540adc178294323fa7c

View File

@ -1 +1 @@
355ee74171cf5daf899b3cdc85a62836bf07fc25
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea

View File

@ -1 +1 @@
378f224b082f58447996654813b4ea04385c49ad
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730

View File

@ -1 +1 @@
d313843506c752224b1125738296aee06010db07
00489f90d93ff78c4a085a84390061140e81a9af

View File

@ -1 +1 @@
7b8696a9592252dafa94d4a38f88fa5e993f747e
72326c29d144b8f48bb26a50f5f689488e4eca0b

View File

@ -1 +1 @@
4f317c715c40a29b6569c4e5e41a8af8032b7949
a43fee480db4e61c27d272bea6ba535d161d1cc2

View File

@ -1 +1 @@
a3d1a27dada9d8e5b43cb31d116ce5231b684feb
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f

View File

@ -1 +1 @@
70e29cd0e8b0b23bc8dc7580de11d973783d714e
782ff3108fa8594e8f79418d1c0a5493c1f41b9e

View File

@ -1 +1 @@
ac71f3f0709ddd3ac74b143c165630ddd064ba97
397304064b2cf8faea733540adc178294323fa7c

View File

@ -1 +1 @@
355ee74171cf5daf899b3cdc85a62836bf07fc25
a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea

View File

@ -1 +1 @@
378f224b082f58447996654813b4ea04385c49ad
b13ba9b6351fc5188afd7b6f83a6a9c0a4844730

View File

@ -1 +1 @@
d313843506c752224b1125738296aee06010db07
00489f90d93ff78c4a085a84390061140e81a9af

View File

@ -1 +1 @@
7b8696a9592252dafa94d4a38f88fa5e993f747e
72326c29d144b8f48bb26a50f5f689488e4eca0b

View File

@ -1 +1 @@
4f317c715c40a29b6569c4e5e41a8af8032b7949
a43fee480db4e61c27d272bea6ba535d161d1cc2

View File

@ -1 +1 @@
a3d1a27dada9d8e5b43cb31d116ce5231b684feb
fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/dac6077"
#define FULL_VERSION "explicit/225ba3e"

Binary file not shown.

View File

@ -1 +1 @@
4c3aa55d22efa7b9267d68674b2358fdfb502ecc
6cf6f2210ec4a21fd2ee54151620ab5755280e16

Binary file not shown.

View File

@ -1 +1 @@
ab91734d1764b819840aa69bdf1d0325891b361a
bdc5472e5725fbd40711d72a9b664e5511b4c9d4

Binary file not shown.

View File

@ -1 +1 @@
ce9e74bb2e841577d90f1c0a987ecb80a12afb99
3c687d35289e5d749f66884ff92d3f0ade36db0d

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.179\n"
"Project-Id-Version: mono 5.10.1.2\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-17 08:24+0000\n"
"POT-Creation-Date: 2018-03-20 08:32+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 @@
8f085a6f6ac9d02637f38571f84486e5f6e44005
130a38c1cd091db0a16920934c97c2bd25620cb7

View File

@ -3,9 +3,12 @@ SUPPORT=
else
SUPPORT=libMonoSupportW.la
endif
if BUILD_SUPPORT
lib_LTLIBRARIES = \
libMonoPosixHelper.la \
$(SUPPORT)
endif
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \

View File

@ -170,6 +170,7 @@ libMonoPosixHelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libMonoPosixHelper_la_LDFLAGS) \
$(LDFLAGS) -o $@
@BUILD_SUPPORT_TRUE@am_libMonoPosixHelper_la_rpath = -rpath $(libdir)
libMonoSupportW_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libMonoSupportW_la_OBJECTS = supportw.lo support-heap.lo
@ -178,7 +179,8 @@ libMonoSupportW_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libMonoSupportW_la_LDFLAGS) \
$(LDFLAGS) -o $@
@HOST_WIN32_FALSE@am_libMonoSupportW_la_rpath = -rpath $(libdir)
@BUILD_SUPPORT_TRUE@@HOST_WIN32_FALSE@am_libMonoSupportW_la_rpath = \
@BUILD_SUPPORT_TRUE@@HOST_WIN32_FALSE@ -rpath $(libdir)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@ -475,9 +477,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@HOST_WIN32_FALSE@SUPPORT = libMonoSupportW.la
@HOST_WIN32_TRUE@SUPPORT =
lib_LTLIBRARIES = \
libMonoPosixHelper.la \
$(SUPPORT)
@BUILD_SUPPORT_TRUE@lib_LTLIBRARIES = \
@BUILD_SUPPORT_TRUE@ libMonoPosixHelper.la \
@BUILD_SUPPORT_TRUE@ $(SUPPORT)
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
@ -673,7 +675,7 @@ minizip/zip.lo: minizip/$(am__dirstamp) \
minizip/$(DEPDIR)/$(am__dirstamp)
libMonoPosixHelper.la: $(libMonoPosixHelper_la_OBJECTS) $(libMonoPosixHelper_la_DEPENDENCIES) $(EXTRA_libMonoPosixHelper_la_DEPENDENCIES)
$(AM_V_CCLD)$(libMonoPosixHelper_la_LINK) -rpath $(libdir) $(libMonoPosixHelper_la_OBJECTS) $(libMonoPosixHelper_la_LIBADD) $(LIBS)
$(AM_V_CCLD)$(libMonoPosixHelper_la_LINK) $(am_libMonoPosixHelper_la_rpath) $(libMonoPosixHelper_la_OBJECTS) $(libMonoPosixHelper_la_LIBADD) $(LIBS)
libMonoSupportW.la: $(libMonoSupportW_la_OBJECTS) $(libMonoSupportW_la_DEPENDENCIES) $(EXTRA_libMonoSupportW_la_DEPENDENCIES)
$(AM_V_CCLD)$(libMonoSupportW_la_LINK) $(am_libMonoSupportW_la_rpath) $(libMonoSupportW_la_OBJECTS) $(libMonoSupportW_la_LIBADD) $(LIBS)