From 206c5280431ad5c8d5813c447003352b6fae5310 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 20 Mar 2018 09:34:06 +0000 Subject: [PATCH] Imported Upstream version 5.10.1.2 Former-commit-id: 4a4d20b03e9e509d6d89eaf6a6226999e9214e2a --- Makefile.am | 10 ++-------- Makefile.in | 6 ++---- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/class/System/System.Net/Dns.cs | 6 ++---- mcs/class/System/Test/System.Net/DnsTest.cs | 7 +++++++ .../System/Test/System.Net/IPAddressTest.cs | 6 ------ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/System.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/System.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/System.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- support/Makefile.am | 3 +++ support/Makefile.in | 12 +++++++----- 44 files changed, 57 insertions(+), 61 deletions(-) diff --git a/Makefile.am b/Makefile.am index f9dd1784c8..12b27f14b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/Makefile.in b/Makefile.in index 1bb91399bc..9c6afa43c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index ff49267aff..6e4cb4e792 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -c5f70c0f39376db354a20786c6e0272fcc830441 \ No newline at end of file +076c7f7ea710f371f2b456306d293464fb64345c \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 2e2d75b567..58c223a87e 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -d6ac4f046b36cae93b5e18465e1aa689b4ba4e62 \ No newline at end of file +3dfc7bdce20df1f718af232b5a9e164e9cbc125c \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index abed3fa30d..9b7112be4d 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/System/System.Net/Dns.cs b/mcs/class/System/System.Net/Dns.cs index 5338cd09d0..df56625330 100644 --- a/mcs/class/System/System.Net/Dns.cs +++ b/mcs/class/System/System.Net/Dns.cs @@ -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 diff --git a/mcs/class/System/Test/System.Net/DnsTest.cs b/mcs/class/System/Test/System.Net/DnsTest.cs index 6fba07a8a1..740712500c 100644 --- a/mcs/class/System/Test/System.Net/DnsTest.cs +++ b/mcs/class/System/Test/System.Net/DnsTest.cs @@ -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 () { diff --git a/mcs/class/System/Test/System.Net/IPAddressTest.cs b/mcs/class/System/Test/System.Net/IPAddressTest.cs index f3c9ad8367..c3ebb33ee2 100644 --- a/mcs/class/System/Test/System.Net/IPAddressTest.cs +++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs @@ -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]; diff --git a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index c90fdb9ac8..cf74bac7b9 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -70e29cd0e8b0b23bc8dc7580de11d973783d714e \ No newline at end of file +782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index 252b1b64a1..7a169fd711 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ac71f3f0709ddd3ac74b143c165630ddd064ba97 \ No newline at end of file +397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index 85a080d990..fb652f473c 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -355ee74171cf5daf899b3cdc85a62836bf07fc25 \ No newline at end of file +a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 573eb7e98f..5f61f0a9f6 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -378f224b082f58447996654813b4ea04385c49ad \ No newline at end of file +b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index c07e478343..b9b04549fb 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d313843506c752224b1125738296aee06010db07 \ No newline at end of file +00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id index d4ea265019..b98e9a4f09 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -7b8696a9592252dafa94d4a38f88fa5e993f747e \ No newline at end of file +72326c29d144b8f48bb26a50f5f689488e4eca0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index 677f3344f1..af7dbbbea8 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f317c715c40a29b6569c4e5e41a8af8032b7949 \ No newline at end of file +a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index fd1f84d47a..def4f016c0 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a3d1a27dada9d8e5b43cb31d116ce5231b684feb \ No newline at end of file +fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index c90fdb9ac8..cf74bac7b9 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -70e29cd0e8b0b23bc8dc7580de11d973783d714e \ No newline at end of file +782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index 252b1b64a1..7a169fd711 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ac71f3f0709ddd3ac74b143c165630ddd064ba97 \ No newline at end of file +397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index 85a080d990..fb652f473c 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -355ee74171cf5daf899b3cdc85a62836bf07fc25 \ No newline at end of file +a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 573eb7e98f..5f61f0a9f6 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -378f224b082f58447996654813b4ea04385c49ad \ No newline at end of file +b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index c07e478343..b9b04549fb 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d313843506c752224b1125738296aee06010db07 \ No newline at end of file +00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id index d4ea265019..b98e9a4f09 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -7b8696a9592252dafa94d4a38f88fa5e993f747e \ No newline at end of file +72326c29d144b8f48bb26a50f5f689488e4eca0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index 677f3344f1..af7dbbbea8 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f317c715c40a29b6569c4e5e41a8af8032b7949 \ No newline at end of file +a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index fd1f84d47a..def4f016c0 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a3d1a27dada9d8e5b43cb31d116ce5231b684feb \ No newline at end of file +fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index c90fdb9ac8..cf74bac7b9 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -70e29cd0e8b0b23bc8dc7580de11d973783d714e \ No newline at end of file +782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index 252b1b64a1..7a169fd711 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ac71f3f0709ddd3ac74b143c165630ddd064ba97 \ No newline at end of file +397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index 85a080d990..fb652f473c 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -355ee74171cf5daf899b3cdc85a62836bf07fc25 \ No newline at end of file +a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 573eb7e98f..5f61f0a9f6 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -378f224b082f58447996654813b4ea04385c49ad \ No newline at end of file +b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index c07e478343..b9b04549fb 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d313843506c752224b1125738296aee06010db07 \ No newline at end of file +00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id index d4ea265019..b98e9a4f09 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -7b8696a9592252dafa94d4a38f88fa5e993f747e \ No newline at end of file +72326c29d144b8f48bb26a50f5f689488e4eca0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index 677f3344f1..af7dbbbea8 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f317c715c40a29b6569c4e5e41a8af8032b7949 \ No newline at end of file +a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index fd1f84d47a..def4f016c0 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a3d1a27dada9d8e5b43cb31d116ce5231b684feb \ No newline at end of file +fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 365b6a412b..e82815cb5f 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/dac6077" +#define FULL_VERSION "explicit/225ba3e" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 83569b0ca1b1ad8277d4eab3510f5500a6a2f91f..0971ee244a5c0f3d37a59e364e61944d8ef1e872 100644 GIT binary patch delta 21 ccmbQIHBW296D|%T0|f&MD`TV0Z@7%O08kYMr2qf` delta 21 ccmbQIHBW296D|%za|HtnD\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index dbb8fd061def65bf6aaae5c81465ef46139d9779..8382a82c5891a84be578bf131fd8cbeab087738d 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAVx3@ogSjW(xFWo!okbv6jC delta 23 fcmaF1gXP%{mJP8}ISkDe3@ogSOg5)ZWo!okb%F@A diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 39842728e8..5ded7651d0 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -8f085a6f6ac9d02637f38571f84486e5f6e44005 \ No newline at end of file +130a38c1cd091db0a16920934c97c2bd25620cb7 \ No newline at end of file diff --git a/support/Makefile.am b/support/Makefile.am index 969ff60e4d..f34e707130 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -3,9 +3,12 @@ SUPPORT= else SUPPORT=libMonoSupportW.la endif + +if BUILD_SUPPORT lib_LTLIBRARIES = \ libMonoPosixHelper.la \ $(SUPPORT) +endif AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ diff --git a/support/Makefile.in b/support/Makefile.in index fe144d1641..b2943b5015 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -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)