From 860af8198ed247a7f5edcce8ddc3535ddf0ce71b Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 14 Jun 2019 08:42:46 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.300 Former-commit-id: 5d008a9f41819eeae8c2feef3b41fc6cbf03e9fb --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../System.Net.Http/HttpClientHandler.cs | 6 ++++++ .../System.Net.Http/IMonoHttpClientHandler.cs | 3 +++ .../System.Net.Http/MonoWebRequestHandler.cs | 9 +++++++++ .../System.Net.Http/HttpClient.cs | 3 +++ .../HttpClientHandler.platformnotsupported.cs | 3 +++ .../System.Net.Http/HttpMessageInvoker.cs | 2 +- .../corefx/SocketsHttpHandler.Mono.cs | 5 +++++ .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 +- 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 +- 52 files changed, 68 insertions(+), 39 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 0c4b85da8e..fc6e85978a 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -bfddb03c995a54a8367cd96b232d2c10364544db \ No newline at end of file +32032351f05623ddf476bdcb57a30b529b3d2e8d \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 829add97c6..7d58b67ea2 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -2b32e12835f376e47158033368c4a732d55a5047 \ No newline at end of file +19a2e7c59e1e46b86ca76d5200cbc4328a92171a \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 5fd12131a4..474d6dd772 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.0.0.299"; + public const string MonoVersion = "6.0.0.300"; 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/HttpClientHandler.cs b/mcs/class/System.Net.Http/HttpClientHandler.cs index 6d8a057bcb..d16093276b 100644 --- a/mcs/class/System.Net.Http/HttpClientHandler.cs +++ b/mcs/class/System.Net.Http/HttpClientHandler.cs @@ -188,6 +188,12 @@ namespace System.Net.Http public IDictionary Properties => _delegatingHandler.Properties; + // Only used in MonoWebRequestHandler and ignored by the other handlers. + internal void SetWebRequestTimeout (TimeSpan timeout) + { + _delegatingHandler.SetWebRequestTimeout (timeout); + } + protected internal override Task SendAsync (HttpRequestMessage request, CancellationToken cancellationToken) => _delegatingHandler.SendAsync (request, cancellationToken); } diff --git a/mcs/class/System.Net.Http/IMonoHttpClientHandler.cs b/mcs/class/System.Net.Http/IMonoHttpClientHandler.cs index 7422985ae4..0d571a89ea 100644 --- a/mcs/class/System.Net.Http/IMonoHttpClientHandler.cs +++ b/mcs/class/System.Net.Http/IMonoHttpClientHandler.cs @@ -78,5 +78,8 @@ namespace System.Net.Http } Task SendAsync (HttpRequestMessage request, CancellationToken cancellationToken); + + // Only used by MonoWebRequestHandler and ignored by the other handlers. + void SetWebRequestTimeout (TimeSpan timeout); } } diff --git a/mcs/class/System.Net.Http/MonoWebRequestHandler.cs b/mcs/class/System.Net.Http/MonoWebRequestHandler.cs index ba66d28cf8..166947ad2f 100644 --- a/mcs/class/System.Net.Http/MonoWebRequestHandler.cs +++ b/mcs/class/System.Net.Http/MonoWebRequestHandler.cs @@ -67,6 +67,7 @@ namespace System.Net.Http bool unsafeAuthenticatedConnectionSharing; bool sentRequest; string connectionGroupName; + TimeSpan? timeout; bool disposed; internal MonoWebRequestHandler () @@ -368,6 +369,9 @@ namespace System.Net.Http wr.ServicePoint.Expect100Continue = request.Headers.ExpectContinue == true; + if (timeout != null) + wr.Timeout = (int)timeout.Value.TotalMilliseconds; + // Add request headers var headers = wr.Headers; foreach (var header in request.Headers) { @@ -533,5 +537,10 @@ namespace System.Net.Http throw new NotImplementedException (); } } + + void IMonoHttpClientHandler.SetWebRequestTimeout (TimeSpan timeout) + { + this.timeout = timeout; + } } } diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs index a4cb8ac68f..eaeb02d644 100644 --- a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs +++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs @@ -269,6 +269,9 @@ namespace System.Net.Http async Task SendAsyncWorker (HttpRequestMessage request, HttpCompletionOption completionOption, CancellationToken cancellationToken) { using (var lcts = CancellationTokenSource.CreateLinkedTokenSource (cts.Token, cancellationToken)) { + // Hack to pass the timeout to the HttpWebRequest that's created by MonoWebRequestHandler; all other handlers ignore this. + if (handler is HttpClientHandler clientHandler) + clientHandler.SetWebRequestTimeout (timeout); lcts.CancelAfter (timeout); var task = base.SendAsync (request, lcts.Token); diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs index f796a202d5..4b6b666e69 100644 --- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs +++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs @@ -169,5 +169,8 @@ namespace System.Net.Http get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } } + + // Only used in MonoWebRequestHandler and ignored by the other handlers. + internal void SetWebRequestTimeout (TimeSpan timeout) => throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } } diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpMessageInvoker.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpMessageInvoker.cs index 3843bf4278..f83d0b8a1d 100644 --- a/mcs/class/System.Net.Http/System.Net.Http/HttpMessageInvoker.cs +++ b/mcs/class/System.Net.Http/System.Net.Http/HttpMessageInvoker.cs @@ -33,7 +33,7 @@ namespace System.Net.Http { public class HttpMessageInvoker : IDisposable { - HttpMessageHandler handler; + protected private HttpMessageHandler handler; readonly bool disposeHandler; public HttpMessageInvoker (HttpMessageHandler handler) diff --git a/mcs/class/System.Net.Http/corefx/SocketsHttpHandler.Mono.cs b/mcs/class/System.Net.Http/corefx/SocketsHttpHandler.Mono.cs index 9c19ad4cf5..51e8ce11c9 100644 --- a/mcs/class/System.Net.Http/corefx/SocketsHttpHandler.Mono.cs +++ b/mcs/class/System.Net.Http/corefx/SocketsHttpHandler.Mono.cs @@ -40,6 +40,11 @@ namespace System.Net.Http } } + // This is only used by MonoWebRequestHandler. + void IMonoHttpClientHandler.SetWebRequestTimeout (TimeSpan timeout) + { + } + Task IMonoHttpClientHandler.SendAsync (HttpRequestMessage request, CancellationToken cancellationToken) => SendAsync (request, cancellationToken); } } diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 6066066026..95e187949a 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -8819bfc5318a074dcb1a11cd1ce8404e35920142 \ No newline at end of file +610f149d02b43843d60ea943b1dbda131da50857 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index ffc1c767c1..bf570c56f7 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -8135c87708bb0e6972b341ed4dcf542c8c5d38b5 \ No newline at end of file +ac5a904a97698ca709eefcd4adf1163eb0018487 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 14c73cd4e8..f7b7016699 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -692db1871a0f948ec05d95e07e58d1adddfbecf1 \ No newline at end of file +ef3898ec0a1a2fb4899d555333cf761c9d5ec07e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index c301bdd9f9155f10c093a41a2ae07924f03f1915..f44a314bccf123d8b216d6f4b9e833544079f2cc 100644 GIT binary patch delta 62 zcmZqZU~A}Lo6x~>e(%5ijXhg?7;o);xpPj@wW0Fm7ODH)5~^ SLapfwY8kb*uM}nsF8}~YrWj`c diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index d4d7b2991d..3d49ad4b90 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2182f88cde39994cb80a1c0ba96d000b36ae677c \ No newline at end of file +fc7585fb16e851b662b878b39f8e32d3018fd668 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 5eb5a1569b..41cd3722c3 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21f452516f31f530997437d1d43a960d20dac2e8 \ No newline at end of file +e393df6726ee3ea4e5f940dbb797c5f6d65cbdab \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index c1dd92f1d4..be5be5c090 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -33a72ca489db0746e188e3669710a57cdc45784b \ No newline at end of file +ba75dd4ee877c8ff21c4dbc8dc2f4ff9684ccee3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 33d800df28..1e1043825f 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a52112a39f56dfda49caef9f0da0c495b036bce0 \ No newline at end of file +921d504a42685c599326466181ff27a39e20ad8e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 6066066026..95e187949a 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -8819bfc5318a074dcb1a11cd1ce8404e35920142 \ No newline at end of file +610f149d02b43843d60ea943b1dbda131da50857 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index ffc1c767c1..bf570c56f7 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -8135c87708bb0e6972b341ed4dcf542c8c5d38b5 \ No newline at end of file +ac5a904a97698ca709eefcd4adf1163eb0018487 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 14c73cd4e8..f7b7016699 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -692db1871a0f948ec05d95e07e58d1adddfbecf1 \ No newline at end of file +ef3898ec0a1a2fb4899d555333cf761c9d5ec07e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index c301bdd9f9155f10c093a41a2ae07924f03f1915..f44a314bccf123d8b216d6f4b9e833544079f2cc 100644 GIT binary patch delta 62 zcmZqZU~A}Lo6x~>e(%5ijXhg?7;o);xpPj@wW0Fm7ODH)5~^ SLapfwY8kb*uM}nsF8}~YrWj`c diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index d4d7b2991d..3d49ad4b90 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2182f88cde39994cb80a1c0ba96d000b36ae677c \ No newline at end of file +fc7585fb16e851b662b878b39f8e32d3018fd668 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 5eb5a1569b..41cd3722c3 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21f452516f31f530997437d1d43a960d20dac2e8 \ No newline at end of file +e393df6726ee3ea4e5f940dbb797c5f6d65cbdab \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index c1dd92f1d4..be5be5c090 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -33a72ca489db0746e188e3669710a57cdc45784b \ No newline at end of file +ba75dd4ee877c8ff21c4dbc8dc2f4ff9684ccee3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 33d800df28..1e1043825f 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a52112a39f56dfda49caef9f0da0c495b036bce0 \ No newline at end of file +921d504a42685c599326466181ff27a39e20ad8e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 6066066026..95e187949a 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -8819bfc5318a074dcb1a11cd1ce8404e35920142 \ No newline at end of file +610f149d02b43843d60ea943b1dbda131da50857 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index ffc1c767c1..bf570c56f7 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -8135c87708bb0e6972b341ed4dcf542c8c5d38b5 \ No newline at end of file +ac5a904a97698ca709eefcd4adf1163eb0018487 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 14c73cd4e8..f7b7016699 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -692db1871a0f948ec05d95e07e58d1adddfbecf1 \ No newline at end of file +ef3898ec0a1a2fb4899d555333cf761c9d5ec07e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index c301bdd9f9155f10c093a41a2ae07924f03f1915..f44a314bccf123d8b216d6f4b9e833544079f2cc 100644 GIT binary patch delta 62 zcmZqZU~A}Lo6x~>e(%5ijXhg?7;o);xpPj@wW0Fm7ODH)5~^ SLapfwY8kb*uM}nsF8}~YrWj`c diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index d4d7b2991d..3d49ad4b90 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2182f88cde39994cb80a1c0ba96d000b36ae677c \ No newline at end of file +fc7585fb16e851b662b878b39f8e32d3018fd668 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 5eb5a1569b..41cd3722c3 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21f452516f31f530997437d1d43a960d20dac2e8 \ No newline at end of file +e393df6726ee3ea4e5f940dbb797c5f6d65cbdab \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index c1dd92f1d4..be5be5c090 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -33a72ca489db0746e188e3669710a57cdc45784b \ No newline at end of file +ba75dd4ee877c8ff21c4dbc8dc2f4ff9684ccee3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 33d800df28..1e1043825f 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a52112a39f56dfda49caef9f0da0c495b036bce0 \ No newline at end of file +921d504a42685c599326466181ff27a39e20ad8e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 6066066026..95e187949a 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -8819bfc5318a074dcb1a11cd1ce8404e35920142 \ No newline at end of file +610f149d02b43843d60ea943b1dbda131da50857 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index ffc1c767c1..bf570c56f7 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -8135c87708bb0e6972b341ed4dcf542c8c5d38b5 \ No newline at end of file +ac5a904a97698ca709eefcd4adf1163eb0018487 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 42c05717fc..8587163e86 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b362ea5481e288265bd38ef1b5ebe847095bf22c \ No newline at end of file +109ef5fa2134bda6d786295cc1092f58492f0ecf \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index c301bdd9f9155f10c093a41a2ae07924f03f1915..f44a314bccf123d8b216d6f4b9e833544079f2cc 100644 GIT binary patch delta 62 zcmZqZU~A}Lo6x~>e(%5ijXhg?7;o);xpPj@wW0Fm7ODH)5~^ SLapfwY8kb*uM}nsF8}~YrWj`c diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index d4d7b2991d..3d49ad4b90 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2182f88cde39994cb80a1c0ba96d000b36ae677c \ No newline at end of file +fc7585fb16e851b662b878b39f8e32d3018fd668 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 5eb5a1569b..41cd3722c3 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21f452516f31f530997437d1d43a960d20dac2e8 \ No newline at end of file +e393df6726ee3ea4e5f940dbb797c5f6d65cbdab \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index c1dd92f1d4..be5be5c090 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -33a72ca489db0746e188e3669710a57cdc45784b \ No newline at end of file +ba75dd4ee877c8ff21c4dbc8dc2f4ff9684ccee3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 0ed4b5ccaa..ecb8f24b92 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -2564cad58c4a4dd6bd8b5433b6f843009913236f \ No newline at end of file +7dd2f3d40d447e8f4a757f77325c121f15c887f2 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index a5e8845fbd..4e700c952b 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/d563138" +#define FULL_VERSION "explicit/52f6ea1" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 1562af9219b44f28070e20c87bf2ccd6b443e485..68e0abe1311177ec06ace8f6d28594a00c4df91e 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKB1p^B!1B=aXxQw^}N|gqB delta 20 bcmbQIHBW29Q!aL61p^B!Bje3)xQw^}N_hr$ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 6fdbcfb001..e3b63ddee0 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -0a75ff98651260f03302b2ec11151b1f8d4ee1ab \ No newline at end of file +35858a58c9cca01515d5e56d8c2bdd27b11e3d0e \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index a9b22af9c5a5196e6c43f0f6a9ef443939015313..d3754b1374ac62f22373044445d217f47e992ec9 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)6f`NsVfyHK1#VK+CQMCrJ delta 20 bcmX?Ef3kjqo+7)kf`NsVk@03z#VK+CQJDs; diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 2e9fc225f2..6b0e1fa234 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -1663d55fb672628d6ec044f619cae17cc77c86f3 \ No newline at end of file +8247971707c68040471dabc7b3b9fc2dc05fcdb8 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 9bb1f8c039e500d2d9017956ee036eec99caa314..b77cc87bb63d353121d3272c5676a884591663d6 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>?R5Z7FGrpoB7oXv;biT2MhoJ delta 22 dcmeyri1Gg-#tj_m?8XWP7FI^aoB7oXv;bi12M7QF diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 00423e24de..c283978c18 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -89453a46146bc867e2070c63aa6832a764dfd062 \ No newline at end of file +c3eea70da1a0c2a30b11f370b77d988850744f0c \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index bf09a0d9eb..d791a8f1aa 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.299\n" +"Project-Id-Version: mono 6.0.0.300\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-13 08:23+0000\n" +"POT-Creation-Date: 2019-06-14 08:08+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 ec9679b9efa7dc87c50f42bac5905ecee3aae53a..1fa12baf728d7db9443d131455dd177ca61b3430 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*-aD-EUXMHHm6QyYzF{s{s@8q delta 22 ecmaF1gXP%{mJM-J*^LzpEUb)-H>XZzYzF{s;s|~K diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 0a83d39d72..7e49807501 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -be68d34584641f65526ca88a1ed82c4f949a286d \ No newline at end of file +d9eee91f60bd1f5c08357637bb98da1529bb8bff \ No newline at end of file