diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1f7c282ab2..403d9d265a 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -df7ae798f41d86d2f488e6f7a71e6337bde019c5 \ No newline at end of file +cbbc8cbbdd0d8f33f327e39d59e267d63ec43436 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 6fac1c00bc..9ba8f14275 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -84e3f78cba33f680a96d14b2e7193e98c007a699 \ No newline at end of file +18c90a85a208f0899ccd35e437481a76934ca350 \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs index 9701716f1a..e7ffaef7bc 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs @@ -193,6 +193,19 @@ namespace System.Net.Http _readAheadTask = new ValueTask(0); } +#if MONO + if (!_readAheadTask.Value.IsCompleted && _socket != null) + { + try + { + return _socket.Poll(0, SelectMode.SelectRead); + } + catch + { + return false; + } + } +#endif return _readAheadTask.Value.IsCompleted; // equivalent to polling } diff --git a/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ConnectionReuse.cs b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ConnectionReuse.cs new file mode 100644 index 0000000000..b17839048b --- /dev/null +++ b/external/corefx/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.ConnectionReuse.cs @@ -0,0 +1,65 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Collections.Generic; +using System.Net.Sockets; +using System.Net.Test.Common; +using System.Text; +using System.Threading.Tasks; + +#if !MONO +using Microsoft.DotNet.XUnitExtensions; +using Microsoft.DotNet.RemoteExecutor; +#endif + +using Xunit; +using Xunit.Abstractions; + +namespace System.Net.Http.Functional.Tests +{ + using Configuration = System.Net.Test.Common.Configuration; + + public class HttpClientHandler_ConnectionReuse_Test : HttpClientTestBase + { + [Fact] + public async Task Test17710() + { + using (HttpClient client = CreateHttpClient()) + { + const string text = "THE POST CONTENT"; + var data = new StringContent(text); + await LoopbackServer.CreateServerAsync(async (server, url) => + { + Task serverTask1 = server.AcceptConnectionAsync(async connection1 => + { + await connection1.ReadRequestHeaderAsync(); + var buffer = new char[text.Length]; + var ret = await connection1.Reader.ReadBlockAsync(buffer, 0, buffer.Length); + Assert.Equal(text.Length, ret); + await connection1.SendResponseAsync(HttpStatusCode.OK, null, "hello"); + await Task.Delay(500); + connection1.Dispose(); + }); + + await client.PostAsync(url, data); + + await serverTask1; + + Task serverTask2 = server.AcceptConnectionAsync(async connection2 => + { + await connection2.ReadRequestHeaderAsync(); + var buffer = new char[text.Length]; + var ret = await connection2.Reader.ReadBlockAsync(buffer, 0, buffer.Length); + Assert.Equal(text.Length, ret); + await connection2.SendResponseAsync(HttpStatusCode.OK, null, "hello"); + await Task.Delay(500); + connection2.Dispose(); + }); + + await client.PostAsync(url, data); + }); + } + } + } +} diff --git a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/MultipleConnectAsync.cs b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/MultipleConnectAsync.cs index 5a3d9f897e..c9c5afa7d0 100644 --- a/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/MultipleConnectAsync.cs +++ b/external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/MultipleConnectAsync.cs @@ -187,6 +187,15 @@ namespace System.Net.Sockets // Keep track of this because it will be overwritten by AttemptConnection SocketError currentFailure = args.SocketError; +#if MONO + // Make sure we're always resetting the Mono-specific `in_progress` field when + // re-attempting a connection. + // If a previous connection failed asynchronously, then it will already have been + // resetted, but not on synchronous connection failures (such as for instance, the + // host not supporting IPv6 or the network being down). + // This should fix https://github.com/mono/mono/issues/18030. + args.in_progress = 0; +#endif Exception connectException = AttemptConnection(); if (connectException == null) diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c96fb228fa..04463d5355 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.8.0.92"; + public const string MonoVersion = "6.8.0.95"; 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/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 4a323887e1..10c8a6c694 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c1da8742597f6660c042c03ff11d30008a67e65 \ No newline at end of file +b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index de0ef82212..a6b142d09c 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e691ea5e21af141655735f8d9691d8ff5b06be96 \ No newline at end of file +f6f8d0b05ebac65dbd253511d88708db62560880 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index 572234c9f3..7811368126 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -720df441200162ca0519105808f019dad4139afc \ No newline at end of file +334a143b5e7ccd8e120b3ceeb20460aba527bd92 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 0c3da6b688..eba8fd0d9b 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -fa39d39f4d05c288fe698177b8974f92f7cc2a9a \ No newline at end of file +c46287bc4da9298130e80bec9c7ea258fb0ae0e9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index ec2625a590..9d86a1a337 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -e41e90ce5c31929399abcda80843a8bfce4bd009 \ No newline at end of file +5fc58a69d67cfd5f621cdf71146508cd165cd069 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index d5198daab1..cc31881d43 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -eb4f894ce6172cf836822ebe31020c3b55ebdc4d \ No newline at end of file +72da64886b1e1b7be52cfce60e1d5d76c9302efe \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id index 1da0a39144..0447860dca 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id @@ -1 +1 @@ -b6716754948d7efce40aa18bffdbf0cfce6ca68b \ No newline at end of file +9ed745d33db923ec20a3aa2fc4f6eca2e7f32b66 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 8f5b694a94..3c3a4cc28b 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -29633af9bdd9547d92140e4f6b94e624efc889dd \ No newline at end of file +51c742b93e604e3680f39bb5f52a43e3dde60565 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 263ebddf14..b57bbe5d2a 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b9ab9f79a978ef2b4c2329ec761d044f92b1da9e \ No newline at end of file +e37511b1871a2ff62b8a917600e19c71a9ba0457 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 4a323887e1..10c8a6c694 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c1da8742597f6660c042c03ff11d30008a67e65 \ No newline at end of file +b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index de0ef82212..a6b142d09c 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e691ea5e21af141655735f8d9691d8ff5b06be96 \ No newline at end of file +f6f8d0b05ebac65dbd253511d88708db62560880 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index 572234c9f3..7811368126 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -720df441200162ca0519105808f019dad4139afc \ No newline at end of file +334a143b5e7ccd8e120b3ceeb20460aba527bd92 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 0c3da6b688..eba8fd0d9b 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -fa39d39f4d05c288fe698177b8974f92f7cc2a9a \ No newline at end of file +c46287bc4da9298130e80bec9c7ea258fb0ae0e9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index ec2625a590..9d86a1a337 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -e41e90ce5c31929399abcda80843a8bfce4bd009 \ No newline at end of file +5fc58a69d67cfd5f621cdf71146508cd165cd069 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index d5198daab1..cc31881d43 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -eb4f894ce6172cf836822ebe31020c3b55ebdc4d \ No newline at end of file +72da64886b1e1b7be52cfce60e1d5d76c9302efe \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id index 1da0a39144..0447860dca 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id @@ -1 +1 @@ -b6716754948d7efce40aa18bffdbf0cfce6ca68b \ No newline at end of file +9ed745d33db923ec20a3aa2fc4f6eca2e7f32b66 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 8f5b694a94..3c3a4cc28b 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -29633af9bdd9547d92140e4f6b94e624efc889dd \ No newline at end of file +51c742b93e604e3680f39bb5f52a43e3dde60565 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 263ebddf14..b57bbe5d2a 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b9ab9f79a978ef2b4c2329ec761d044f92b1da9e \ No newline at end of file +e37511b1871a2ff62b8a917600e19c71a9ba0457 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 4a323887e1..10c8a6c694 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c1da8742597f6660c042c03ff11d30008a67e65 \ No newline at end of file +b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index de0ef82212..a6b142d09c 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e691ea5e21af141655735f8d9691d8ff5b06be96 \ No newline at end of file +f6f8d0b05ebac65dbd253511d88708db62560880 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index 572234c9f3..7811368126 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -720df441200162ca0519105808f019dad4139afc \ No newline at end of file +334a143b5e7ccd8e120b3ceeb20460aba527bd92 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 0c3da6b688..eba8fd0d9b 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -fa39d39f4d05c288fe698177b8974f92f7cc2a9a \ No newline at end of file +c46287bc4da9298130e80bec9c7ea258fb0ae0e9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index ec2625a590..9d86a1a337 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -e41e90ce5c31929399abcda80843a8bfce4bd009 \ No newline at end of file +5fc58a69d67cfd5f621cdf71146508cd165cd069 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index d5198daab1..cc31881d43 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -eb4f894ce6172cf836822ebe31020c3b55ebdc4d \ No newline at end of file +72da64886b1e1b7be52cfce60e1d5d76c9302efe \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id index 1da0a39144..0447860dca 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id @@ -1 +1 @@ -b6716754948d7efce40aa18bffdbf0cfce6ca68b \ No newline at end of file +9ed745d33db923ec20a3aa2fc4f6eca2e7f32b66 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 8f5b694a94..3c3a4cc28b 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -29633af9bdd9547d92140e4f6b94e624efc889dd \ No newline at end of file +51c742b93e604e3680f39bb5f52a43e3dde60565 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 263ebddf14..b57bbe5d2a 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b9ab9f79a978ef2b4c2329ec761d044f92b1da9e \ No newline at end of file +e37511b1871a2ff62b8a917600e19c71a9ba0457 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 4a323887e1..10c8a6c694 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c1da8742597f6660c042c03ff11d30008a67e65 \ No newline at end of file +b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index de0ef82212..a6b142d09c 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e691ea5e21af141655735f8d9691d8ff5b06be96 \ No newline at end of file +f6f8d0b05ebac65dbd253511d88708db62560880 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index 5cb1d36764..ae11a400c4 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c701a66fb1c9650ac2232ac64f7893c1b4cb15d9 \ No newline at end of file +80471a449b7f3854c546f0ab0654a4bf914650e1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 0c3da6b688..eba8fd0d9b 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -fa39d39f4d05c288fe698177b8974f92f7cc2a9a \ No newline at end of file +c46287bc4da9298130e80bec9c7ea258fb0ae0e9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index ec2625a590..9d86a1a337 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -e41e90ce5c31929399abcda80843a8bfce4bd009 \ No newline at end of file +5fc58a69d67cfd5f621cdf71146508cd165cd069 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index d5198daab1..cc31881d43 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -eb4f894ce6172cf836822ebe31020c3b55ebdc4d \ No newline at end of file +72da64886b1e1b7be52cfce60e1d5d76c9302efe \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id index 1da0a39144..0447860dca 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.dll.REMOVED.git-id @@ -1 +1 @@ -b6716754948d7efce40aa18bffdbf0cfce6ca68b \ No newline at end of file +9ed745d33db923ec20a3aa2fc4f6eca2e7f32b66 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 8f5b694a94..3c3a4cc28b 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -29633af9bdd9547d92140e4f6b94e624efc889dd \ No newline at end of file +51c742b93e604e3680f39bb5f52a43e3dde60565 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index aa0e9ccbf0..ffe40d632e 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -7411fe93ff2b915ad7eff6458f23c193be8daf10 \ No newline at end of file +880ec3d143f504e5ae7d0397527a8d4abac5f233 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 45538ee00d..77008c8115 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/ca47edd" +#define FULL_VERSION "explicit/41f9a07" diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 7bd8058722..3f7935e25c 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -526,8 +526,8 @@ 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." -@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@install-exec-local: +@ENABLE_MSVC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 0cda7d3fde..dcc0261101 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 074a94ebc8..1bee838203 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -45efb7f52a4a160dc77367ae5efade186e7da402 \ No newline at end of file +3fb6b9214b096e5b07be09875c393ee6df3fab92 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 263ecb5ce9..ec2c4dbb7f 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 8617d597b3..fa805549d6 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -098dd8aabe26527d81556f892223f458442103eb \ No newline at end of file +9a3d6c33ac46d73883689eaa0ce75afb6f928a79 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 5721665dde..69db905a9b 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 1129721d9f..23cee1335a 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -009cbdbececc20c130125a7fa4449a8fa3d0234c \ No newline at end of file +4550de30fb7019ffa81380e3a945961b2d45d666 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 85fbbcae6f..f5f7c2de16 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.8.0.92\n" +"Project-Id-Version: mono 6.8.0.95\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2020-01-09 08:08+0000\n" +"POT-Creation-Date: 2020-01-11 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 7cd5ebbd8a..72c332ed34 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index d209a3964a..c5f1b91f5c 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -93cb7e04e0b6f36c690cd0a5fe086e69a5962d73 \ No newline at end of file +fd4299fcb626807842bb29a4e8b3f194ef954e18 \ No newline at end of file