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 tools_dir = tools
endif endif
if BUILD_SUPPORT SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
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
# Keep in sync with SUBDIRS # 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 all: update_submodules

View File

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

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

View File

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

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