From 01c08d50e8f8b1b208405dfeb15791b52d897afe Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 28 Jun 2018 08:19:18 +0000 Subject: [PATCH] Imported Upstream version 5.14.0.148 Former-commit-id: ccfce85f9487e4135d045a812192413d573f33be --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Test/System.Net.Http/HttpClientTest.cs | 2 +- mcs/class/System/System.Net/HttpWebRequest.cs | 65 +++++++++++------- .../System/System.Net/WebResponseStream.cs | 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 +- .../1051400003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400003/System.dll.REMOVED.git-id | 2 +- .../1051400003/mcs.exe.REMOVED.git-id | 2 +- .../1051400003/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 +- .../1051400003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400003/System.dll.REMOVED.git-id | 2 +- .../1051400003/mcs.exe.REMOVED.git-id | 2 +- .../1051400003/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 +- .../1051400003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400003/System.dll.REMOVED.git-id | 2 +- .../1051400003/mcs.exe.REMOVED.git-id | 2 +- .../1051400003/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 +- 40 files changed, 76 insertions(+), 61 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index f7d11f560d..e989f30700 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -713caa60a19e1ee461b6a5c649af0cc5b13ed0d8 \ No newline at end of file +e789bf066e17b66380a6d80f845e05195c813c63 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index ccc59e6c5e..71c5002309 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -55898c9df985bda0d229f0e58ed686a170b20ebd \ No newline at end of file +af067b29dfbfeb81540f1127a7bd9613dd7b0bfa \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 2a7a44bdfd..be239caf6c 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.14.0.147"; + public const string MonoVersion = "5.14.0.148"; 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/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs index 62e260b37e..63cddcda8f 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 @@ -769,7 +769,7 @@ namespace MonoTests.System.Net.Http client.SendAsync (request, HttpCompletionOption.ResponseHeadersRead).Wait (); Assert.Fail ("#1"); } catch (AggregateException e) { - Assert.AreEqual (typeof (ProtocolViolationException), e.InnerException.GetType (), "#2"); + Assert.AreEqual (typeof (InvalidOperationException), e.InnerException.GetType (), "#2"); } Assert.IsNull (failed, "#102"); } finally { diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs index 04f3ac1e4d..74dd159762 100644 --- a/mcs/class/System/System.Net/HttpWebRequest.cs +++ b/mcs/class/System/System.Net/HttpWebRequest.cs @@ -434,7 +434,6 @@ namespace System.Net } public string Host { - get { Uri uri = hostUri ?? Address; return (hostUri == null || !hostHasPort) && Address.IsDefaultPort ? @@ -858,22 +857,21 @@ namespace System.Net if (Aborted) throw CreateRequestAbortedException (); - bool send = !(method == "GET" || method == "CONNECT" || method == "HEAD" || - method == "TRACE"); + bool send = !(method == "GET" || method == "CONNECT" || method == "HEAD" || method == "TRACE"); if (method == null || !send) - throw new ProtocolViolationException ("Cannot send data when method is: " + method); + throw new ProtocolViolationException (SR.net_nouploadonget); if (contentLength == -1 && !sendChunked && !allowBuffering && KeepAlive) throw new ProtocolViolationException ("Content-Length not set"); string transferEncoding = TransferEncoding; if (!sendChunked && transferEncoding != null && transferEncoding.Trim () != "") - throw new ProtocolViolationException ("SendChunked should be true."); + throw new InvalidOperationException (SR.net_needchunked); WebOperation operation; lock (locker) { if (getResponseCalled) - throw new InvalidOperationException ("The operation cannot be performed once the request has been submitted."); + throw new InvalidOperationException (SR.net_reqsubmitted); operation = currentOperation; if (operation == null) { @@ -900,7 +898,7 @@ namespace System.Net try { return TaskToApm.End (asyncResult); } catch (Exception e) { - throw FlattenException (e); + throw GetWebException (e); } } @@ -909,7 +907,7 @@ namespace System.Net try { return GetRequestStreamAsync ().Result; } catch (Exception e) { - throw FlattenException (e); + throw GetWebException (e); } } @@ -925,17 +923,18 @@ namespace System.Net } internal static Task RunWithTimeout ( - Func> func, int timeout, Action abort) + Func> func, int timeout, Action abort, + Func aborted, CancellationToken cancellationToken) { + var cts = CancellationTokenSource.CreateLinkedTokenSource (cancellationToken); // Call `func` here to propagate any potential exception that it // might throw to our caller rather than returning a faulted task. - var cts = new CancellationTokenSource (); var workerTask = func (cts.Token); - return RunWithTimeoutWorker (workerTask, timeout, abort, cts); + return RunWithTimeoutWorker (workerTask, timeout, abort, aborted, cts); } static async Task RunWithTimeoutWorker ( - Task workerTask, int timeout, Action abort, + Task workerTask, int timeout, Action abort, Func aborted, CancellationTokenSource cts) { try { @@ -949,7 +948,7 @@ namespace System.Net } throw new WebException (SR.net_timeout, WebExceptionStatus.Timeout); } catch (Exception ex) { - throw FlattenException (ex); + throw GetWebException (ex, aborted ()); } finally { cts.Dispose (); } @@ -957,7 +956,11 @@ namespace System.Net Task RunWithTimeout (Func> func) { - return RunWithTimeout (func, timeout, Abort); + // Call `func` here to propagate any potential exception that it + // might throw to our caller rather than returning a faulted task. + var cts = new CancellationTokenSource (); + var workerTask = func (cts.Token); + return RunWithTimeoutWorker (workerTask, timeout, Abort, () => Aborted, cts); } async Task MyGetResponseAsync (CancellationToken cancellationToken) @@ -965,13 +968,6 @@ namespace System.Net if (Aborted) throw CreateRequestAbortedException (); - if (method == null) - throw new ProtocolViolationException ("Method is null."); - - string transferEncoding = TransferEncoding; - if (!sendChunked && transferEncoding != null && transferEncoding.Trim () != "") - throw new ProtocolViolationException ("SendChunked should be true."); - var completion = new WebCompletionSource (); WebOperation operation; lock (locker) { @@ -1145,13 +1141,18 @@ namespace System.Net } WebException GetWebException (Exception e) + { + return GetWebException (e, Aborted); + } + + static WebException GetWebException (Exception e, bool aborted) { e = FlattenException (e); if (e is WebException wexc) { - if (!Aborted || wexc.Status == WebExceptionStatus.RequestCanceled || wexc.Status == WebExceptionStatus.Timeout) + if (!aborted || wexc.Status == WebExceptionStatus.RequestCanceled || wexc.Status == WebExceptionStatus.Timeout) return wexc; } - if (Aborted || e is OperationCanceledException || e is ObjectDisposedException) + if (aborted || e is OperationCanceledException || e is ObjectDisposedException) return CreateRequestAbortedException (); return new WebException (e.Message, e, WebExceptionStatus.UnknownError, null); } @@ -1166,6 +1167,20 @@ namespace System.Net if (Aborted) throw CreateRequestAbortedException (); + string transferEncoding = TransferEncoding; + if (!sendChunked && transferEncoding != null && transferEncoding.Trim () != "") { + /* + * The only way we could get here without already catching this in the + * `TransferEncoding` property settor is via HttpClient, which does not + * do strict checking on all headers. + * + * We can remove this check again after switching to the CoreFX version + * of HttpClient. + * + */ + throw new InvalidOperationException (SR.net_needchunked); + } + return TaskToApm.Begin (RunWithTimeout (MyGetResponseAsync), callback, state); } @@ -1177,7 +1192,7 @@ namespace System.Net try { return TaskToApm.End (asyncResult); } catch (Exception e) { - throw FlattenException (e); + throw GetWebException (e); } } @@ -1195,7 +1210,7 @@ namespace System.Net try { return GetResponseAsync ().Result; } catch (Exception e) { - throw FlattenException (e); + throw GetWebException (e); } } diff --git a/mcs/class/System/System.Net/WebResponseStream.cs b/mcs/class/System/System.Net/WebResponseStream.cs index 087f714c39..64bc8bee27 100644 --- a/mcs/class/System/System.Net/WebResponseStream.cs +++ b/mcs/class/System/System.Net/WebResponseStream.cs @@ -149,7 +149,7 @@ namespace System.Net ReadTimeout, () => { Operation.Abort (); InnerStream.Dispose (); - }).ConfigureAwait (false); + }, () => Operation.Aborted, cancellationToken).ConfigureAwait (false); } catch (Exception e) { throwMe = GetReadException (WebExceptionStatus.ReceiveFailure, e, "ReadAsync"); } diff --git a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id index d17062cd91..4ac7a7eb9a 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -befc828e193756128a4b0755432ce5d10d2cc1e4 \ No newline at end of file +b81e5105b4a226b866e9d4b525c04d6024ed558b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id index 200a3a58c8..f757b3cf9b 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -5c0ce009774f46b70774aaa482b92dc2e5314b5c \ No newline at end of file +d562da103406d82c4e5700336bbb136672c0b595 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id index ab97743aa0..dfb01f7d83 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -0877f763271af8603501edfa1e24eaf3e318198e \ No newline at end of file +8e12b0c40d4b90a82ade721f380a924720127548 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id index 0403cbcd14..69ad94c197 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -09995e4e66ac0a22fe41587750417656bfce0821 \ No newline at end of file +1f42617e7b8e00a04125fc85967729855b0bbd3c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id index 81639e881b..f4aad084fd 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5e3eda678d1f01b2aa295f260a86a9621a1396b3 \ No newline at end of file +fda09093e5973afedf30878b4b04bcdb9ce7302f \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id index e7569f2de9..a09d415870 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id @@ -1 +1 @@ -c218c037bb6d75c7b3868cc3ce7ef93c29ef1b3d \ No newline at end of file +0d4c53cdf0f5e83e2808231a255da37be341cbca \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id index 0a9027efde..1a728a3d83 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4eaf1e484ad4d32e688d1fd92002bc14e8d9b408 \ No newline at end of file +6cd85b1ade15d3d15c5d45f15729344bfc58f191 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id index e40e902fba..9d30413107 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8d8905f64181bf039084412317cab6664dd1577f \ No newline at end of file +9aca22f64e9b0800a2247930d7d53ddb4570059f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id index d17062cd91..4ac7a7eb9a 100644 --- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -befc828e193756128a4b0755432ce5d10d2cc1e4 \ No newline at end of file +b81e5105b4a226b866e9d4b525c04d6024ed558b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id index 200a3a58c8..f757b3cf9b 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -5c0ce009774f46b70774aaa482b92dc2e5314b5c \ No newline at end of file +d562da103406d82c4e5700336bbb136672c0b595 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id index ab97743aa0..dfb01f7d83 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -0877f763271af8603501edfa1e24eaf3e318198e \ No newline at end of file +8e12b0c40d4b90a82ade721f380a924720127548 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id index 0403cbcd14..69ad94c197 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -09995e4e66ac0a22fe41587750417656bfce0821 \ No newline at end of file +1f42617e7b8e00a04125fc85967729855b0bbd3c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id index 81639e881b..f4aad084fd 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5e3eda678d1f01b2aa295f260a86a9621a1396b3 \ No newline at end of file +fda09093e5973afedf30878b4b04bcdb9ce7302f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id index e7569f2de9..a09d415870 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id @@ -1 +1 @@ -c218c037bb6d75c7b3868cc3ce7ef93c29ef1b3d \ No newline at end of file +0d4c53cdf0f5e83e2808231a255da37be341cbca \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id index 0a9027efde..1a728a3d83 100644 --- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4eaf1e484ad4d32e688d1fd92002bc14e8d9b408 \ No newline at end of file +6cd85b1ade15d3d15c5d45f15729344bfc58f191 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id index e40e902fba..9d30413107 100644 --- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8d8905f64181bf039084412317cab6664dd1577f \ No newline at end of file +9aca22f64e9b0800a2247930d7d53ddb4570059f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id index d17062cd91..4ac7a7eb9a 100644 --- a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -befc828e193756128a4b0755432ce5d10d2cc1e4 \ No newline at end of file +b81e5105b4a226b866e9d4b525c04d6024ed558b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id index 200a3a58c8..f757b3cf9b 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -5c0ce009774f46b70774aaa482b92dc2e5314b5c \ No newline at end of file +d562da103406d82c4e5700336bbb136672c0b595 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id index ab97743aa0..dfb01f7d83 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -0877f763271af8603501edfa1e24eaf3e318198e \ No newline at end of file +8e12b0c40d4b90a82ade721f380a924720127548 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id index 0403cbcd14..69ad94c197 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -09995e4e66ac0a22fe41587750417656bfce0821 \ No newline at end of file +1f42617e7b8e00a04125fc85967729855b0bbd3c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id index 81639e881b..f4aad084fd 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5e3eda678d1f01b2aa295f260a86a9621a1396b3 \ No newline at end of file +fda09093e5973afedf30878b4b04bcdb9ce7302f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.dll.REMOVED.git-id index e7569f2de9..a09d415870 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.dll.REMOVED.git-id @@ -1 +1 @@ -c218c037bb6d75c7b3868cc3ce7ef93c29ef1b3d \ No newline at end of file +0d4c53cdf0f5e83e2808231a255da37be341cbca \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id index 0a9027efde..1a728a3d83 100644 --- a/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4eaf1e484ad4d32e688d1fd92002bc14e8d9b408 \ No newline at end of file +6cd85b1ade15d3d15c5d45f15729344bfc58f191 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id index e40e902fba..9d30413107 100644 --- a/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8d8905f64181bf039084412317cab6664dd1577f \ No newline at end of file +9aca22f64e9b0800a2247930d7d53ddb4570059f \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 8a9efb3d8c..571394611d 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/3645833" +#define FULL_VERSION "explicit/d0bb0ce" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 86f177fed04c906a76c5f961020b3e172c939b49..18502c60f3e767e3b3aea78e96dda6e64a320a37 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1LMtaxQw^}N~Z>S delta 20 bcmbQIHBW29Q!aKh1p^B!1EbAvxQw^}N{I$` diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index b5f3340b9e..5d72dbd3b7 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -5037f0a0d0e6f285f1bc22f8504e95fe27137c93 \ No newline at end of file +cf13e946b0ca24c9f81b985f48bfb79ad4be4145 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 23dc4d01e9071ab8fff5aebf67926ceb9d886bfe..0952855d1c88b6c18c68815850541dc07dd95167 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)2f`NsVf$?Tj#VK+CQO5?a delta 20 bcmX?Ef3kjqo+7)Mf`NsVfzf7D#VK+CQK<&3 diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index e82a0d2d28..89687d7862 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -c230238a3cd9158ba72f112956ffc95b7d746821 \ No newline at end of file +fd513a0cf57ccca8719e734438ca1c504ef26132 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d486be261747b158bcd76e9581a4d540750229a5..62142c57df10d5db560eb5201fca7ea399a6b0b2 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FGtvoB7oXv;bil2MYiI delta 22 dcmeyri1Gg-#tj_m>}CoE7FGsEoB7oXv;biH2M7QF diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 8c9ad8b444..fbe97b0570 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -d633618cc9cb3e22c7ad209dceda11bb2c56a3b7 \ No newline at end of file +3607588cbe016ea6780d62dbb000dd8f275929d2 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 37e1454541..3bbaa7c34a 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.14.0.147\n" +"Project-Id-Version: mono 5.14.0.148\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-06-26 08:02+0000\n" +"POT-Creation-Date: 2018-06-28 08:03+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 24d8cf2bd4630a21ad6ce9773938b5943bc023ed..ba9dda89bd2a1bb69dee86178ac57c1fa76e3227 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXNSH>XZzYzF{t5D0+) delta 22 ecmaF1gXP%{mJM-J+07ITEUXNSHm6QyYzF{s@(6wa diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 7fd202b4da..77e0c95284 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -d6836e7be2aa66b62b3b706b24b764b223574f29 \ No newline at end of file +aa5447eefa7b1263ac6fbfcf00dcda715382050d \ No newline at end of file