From d213358eb39b8678afd5cdd90e9afa7915f147cd Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 28 Aug 2019 08:43:56 +0000 Subject: [PATCH] Imported Upstream version 6.4.0.183 Former-commit-id: 85d93be5537556349ef364365576dccf5d99b797 --- acceptance-tests/SUBMODULES.json | 2 +- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../src/System/Net/Http/HttpClient.cs | 4 ++++ mcs/build/common/Consts.cs | 2 +- .../HttpRequestMessage.Mono.cs | 4 ++++ .../Test/System.Net.Http/HttpClientTest.cs | 3 +-- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- 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 +- 49 files changed, 53 insertions(+), 46 deletions(-) diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index a9215de06f..9a87da6692 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -2,7 +2,7 @@ { "name": "roslyn", "url": "git://github.com/mono/roslyn.git", - "rev": "7a840bd5697ef6ea41f554a09d837636fba9d88d", + "rev": "13a40eedacc799a78710aba5c8e4b2dcc80a7e61", "remote-branch": "origin/mono-testing", "branch": "mono-testing", "directory": "roslyn" diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 05f0c82667..fff7ec5bb9 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -ab06dc009f387763965cd03d86acb5f1d549d1a9 \ No newline at end of file +d6866b4fe80b76dd0fa8631abac09a4f0549ee02 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 205e954758..5928036ec8 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -ccb1e8a538dfd6e97ee03e96a16fa6def0f82433 \ No newline at end of file +50d0ad797b45a24feb0dd058be601add40f35588 \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs index aa69194a9f..f7d2963177 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs @@ -666,8 +666,12 @@ namespace System.Net.Http } else { +#if MONO + if (!request.RequestUri.IsAbsoluteUri || request.RequestUri.Scheme == Uri.UriSchemeFile && request.RequestUri.OriginalString.StartsWith ("/", StringComparison.Ordinal)) +#else // If the request Uri is an absolute Uri, just use it. Otherwise try to combine it with the base Uri. if (!request.RequestUri.IsAbsoluteUri) +#endif { if (_baseAddress == null) { diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 28ab4ddb59..fe98a5d177 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.4.0.181"; + public const string MonoVersion = "6.4.0.183"; 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.Net.Http/HttpRequestMessage.Mono.cs b/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs index 87adab770f..91f381915f 100644 --- a/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs +++ b/mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs @@ -12,6 +12,10 @@ namespace System.Net.Http return true; #endif + // Mono URI handling which does not distinguish between file and url absolute paths without scheme + if (uri.Scheme == Uri.UriSchemeFile && uri.OriginalString.StartsWith ("/", StringComparison.Ordinal)) + return true; + return HttpUtilities.IsHttpUri (uri); } } diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs index 2134a5ea93..510c0a2d6d 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs @@ -374,8 +374,7 @@ namespace MonoTests.System.Net.Http Assert.AreEqual (response, client.SendAsync (request).Result, "#1"); } - [Test] - [Category ("NotWorking")] + [Test] public void Send_BaseAddress () { var mh = new HttpMessageHandlerMock (); diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a71b1ffeba..d2f24284b8 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file +84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index a7c54d667d..3706e3ed60 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file +af8c7fac9d6aa5eb7b51ce98009453d3ab969d10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index ed66762641..7977479356 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file +43d9590e4365814ccc62474eee87bc3c1878bb93 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index e884204d50..20e92789ce 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file +402b55a12e64b2ce4670d243f09114f9c52ef06c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index d1ef643276..a6a1502ecb 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file +dc9e0b9629e134ea423a418933f6c18238a213a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index de8722a9a4..d4b052c629 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file +57293eefbd5a400e20b81deae90100ea5244c985 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 0fc2f82455..442bdebe6b 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file +0746ab14270c79f16e1394e71ab25048001370be \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a71b1ffeba..d2f24284b8 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file +84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index a7c54d667d..3706e3ed60 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file +af8c7fac9d6aa5eb7b51ce98009453d3ab969d10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index ed66762641..7977479356 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file +43d9590e4365814ccc62474eee87bc3c1878bb93 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index e884204d50..20e92789ce 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file +402b55a12e64b2ce4670d243f09114f9c52ef06c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index d1ef643276..a6a1502ecb 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file +dc9e0b9629e134ea423a418933f6c18238a213a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index de8722a9a4..d4b052c629 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file +57293eefbd5a400e20b81deae90100ea5244c985 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index cc4c5eb887..ed0ee36ae9 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file +7da81eeed2ece50e3fd34954f3fb044896f74fa8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 0fc2f82455..442bdebe6b 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file +0746ab14270c79f16e1394e71ab25048001370be \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a71b1ffeba..d2f24284b8 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file +84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index a7c54d667d..3706e3ed60 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file +af8c7fac9d6aa5eb7b51ce98009453d3ab969d10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index ed66762641..7977479356 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file +43d9590e4365814ccc62474eee87bc3c1878bb93 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index e884204d50..20e92789ce 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file +402b55a12e64b2ce4670d243f09114f9c52ef06c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index d1ef643276..a6a1502ecb 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file +dc9e0b9629e134ea423a418933f6c18238a213a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index de8722a9a4..d4b052c629 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file +57293eefbd5a400e20b81deae90100ea5244c985 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index cc4c5eb887..ed0ee36ae9 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file +7da81eeed2ece50e3fd34954f3fb044896f74fa8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 0fc2f82455..442bdebe6b 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file +0746ab14270c79f16e1394e71ab25048001370be \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a71b1ffeba..d2f24284b8 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file +84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index a7c54d667d..3706e3ed60 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file +af8c7fac9d6aa5eb7b51ce98009453d3ab969d10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 4b7f9a1ae0..4d09ae4ff1 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0fbe23ab4e57bf05537345c1627fecb4583bebaa \ No newline at end of file +aa4c2c8265d8d01011f0558dd14cb16a21777386 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index e884204d50..20e92789ce 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file +402b55a12e64b2ce4670d243f09114f9c52ef06c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index d1ef643276..a6a1502ecb 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file +dc9e0b9629e134ea423a418933f6c18238a213a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index de8722a9a4..d4b052c629 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file +57293eefbd5a400e20b81deae90100ea5244c985 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index cc4c5eb887..ed0ee36ae9 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file +7da81eeed2ece50e3fd34954f3fb044896f74fa8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index f428433d0d..4eb84b2547 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -af3f69ba6e43443e118264541f28b41d5e9fd70a \ No newline at end of file +2c761638c86c118e9ccd78929305b445efad5c44 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index f428fce1f6..085ceec1d4 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/5ecff82" +#define FULL_VERSION "explicit/99c1602" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 3dd91b5c86..a0d210942d 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1491,10 +1491,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@test-local: -@HOST_WIN32_TRUE@test-local: @CROSS_COMPILE_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local: +@CROSS_COMPILE_TRUE@test-local: +@HOST_WIN32_TRUE@test-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 831a2f94cbed52b5c2230cd3e75d1eee33a91dda..3f13a6ff00bd9259b8cfc7df70ce51dfeb89c3ff 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1Ix{CxQw^}O3Ma+ delta 20 bcmbQIHBW29Q!aLM1p^B!1JliKxQw^}N~Z>T diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 22d57eb1b3..6df168b9c1 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -88f0e769332f884a52c56b22626f4d632a0c5eb0 \ No newline at end of file +be6bcadeef714883f6a68fa5366f7f7d0086366a \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index bf632dd37e190bd2c85902cdc05f28a694df2d33..af33399b7751518d96cb6ae6148c045f14f8b638 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)2f`NsVf#qgX#VK+CQR@b^ delta 20 bcmX?Ef3kjqo+7)sf`NsVf$3&b#VK+CQO5?b diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9d17d3d4ac..117c365606 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -269c3fe708b9608aa227e9718e5b64f2aca6b50c \ No newline at end of file +05c1c4419fa47d42db19fd0a25825d22816e6e76 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 95c17175d725f145540c9f8d91c7b1750ede9f66..c3c9b53967a00915986a9825296a0eb78e4cbf73 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FGt9oB7oXv;bi}2N3`O delta 22 dcmeyri1Gg-#tj_m?B)sv7FGtPoB7oXv;bil2MhoJ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index a27057b4d5..b004cfb088 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -a893f94307c5e44b9455ea19a348b82b97606ea2 \ No newline at end of file +43f766c6317bc4f30549c711e913abac7faf18ce \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index b166be86f9..d4fc35dd4f 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.4.0.181\n" +"Project-Id-Version: mono 6.4.0.183\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-08-27 08:05+0000\n" +"POT-Creation-Date: 2019-08-28 08:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index bb75a37e575bef87ffdbf7ad9dc670a6adc3b854..27ab106c0bcebca6f1ac12ba2dc7d44b27946330 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXMHH>XZzYzF{tGzf

XZzYzF{t5D0<* diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 76374cb317..e5b4cfe665 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -f4ccdfbaae15c5a0d969d63b009f851927437f24 \ No newline at end of file +487dc22721460a1be3b65fee9b880f2797a4febf \ No newline at end of file