Merge branch 'upstream'

Former-commit-id: 4c09210e50c234bfedb8515c6521a713d5679ef9
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-04-14 09:21:03 +00:00
commit 04b4ca71eb
35 changed files with 32 additions and 32 deletions

View File

@ -1 +1 @@
d805dea65c76dadcaeb5ce9ed065f20fc867972c
90dba7c7ee2e8ba3aef00486936d2a9722afa6b4

View File

@ -1 +1 @@
3c0157cb68c0196416c7eeed8250b5af75916e0a
75ad532cc19ed5a646add0d0aca9fc2b5b037e9c

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.1.45";
public const string MonoVersion = "5.10.1.47";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1443,7 +1443,7 @@ namespace MonoTests.System.Net.Http
HttpListener CreateListener (Action<HttpListenerContext> contextAssert, int port)
{
var l = new HttpListener ();
l.Prefixes.Add (string.Format ("http://+:{0}/", port));
l.Prefixes.Add (string.Format ("http://*:{0}/", port));
l.Start ();
AddListenerContext(l, contextAssert);

View File

@ -1 +1 @@
eb1aa43b2db8bdc6f06b36843442b9f87152a27f
443c454b06c3cbe97b681e3fee5dd54a2da877f9

View File

@ -1 +1 @@
15f85c493215c454ea19a0bb151089eacb9e64e7
757922b94ca5932285bc1bf22db6a44d8f0f1e40

View File

@ -1 +1 @@
55225a94085398051f1c6b4d43d8e80408f1d1d9
f22a9383da86e56792fedf7b82a6c7c32aa29b8b

View File

@ -1 +1 @@
45f35e56c8bc39c87432a9489c94f101b07f80c5
fd972d6d0bdc37c2d11794c84c9dcf95f2df6c35

View File

@ -1 +1 @@
2dca4cdcec0bb2a1c9ddbf3f46a65b2932981f97
a6ebb3035a0d784a417a77479c9d9ca867d17332

View File

@ -1 +1 @@
52fa999963ef008044f2a7eb6f458199e2442332
42cc1851704e78f0865676858ddff0865f3a1cd0

View File

@ -1 +1 @@
6087c6b887144d04408f0f1c5148a01c32668a47
c8f36fb4430db93058b7df262c1d4ce9ff9e67dc

View File

@ -1 +1 @@
eb1aa43b2db8bdc6f06b36843442b9f87152a27f
443c454b06c3cbe97b681e3fee5dd54a2da877f9

View File

@ -1 +1 @@
15f85c493215c454ea19a0bb151089eacb9e64e7
757922b94ca5932285bc1bf22db6a44d8f0f1e40

View File

@ -1 +1 @@
55225a94085398051f1c6b4d43d8e80408f1d1d9
f22a9383da86e56792fedf7b82a6c7c32aa29b8b

View File

@ -1 +1 @@
45f35e56c8bc39c87432a9489c94f101b07f80c5
fd972d6d0bdc37c2d11794c84c9dcf95f2df6c35

View File

@ -1 +1 @@
2dca4cdcec0bb2a1c9ddbf3f46a65b2932981f97
a6ebb3035a0d784a417a77479c9d9ca867d17332

View File

@ -1 +1 @@
52fa999963ef008044f2a7eb6f458199e2442332
42cc1851704e78f0865676858ddff0865f3a1cd0

View File

@ -1 +1 @@
6087c6b887144d04408f0f1c5148a01c32668a47
c8f36fb4430db93058b7df262c1d4ce9ff9e67dc

View File

@ -1 +1 @@
eb1aa43b2db8bdc6f06b36843442b9f87152a27f
443c454b06c3cbe97b681e3fee5dd54a2da877f9

View File

@ -1 +1 @@
15f85c493215c454ea19a0bb151089eacb9e64e7
757922b94ca5932285bc1bf22db6a44d8f0f1e40

Some files were not shown because too many files have changed in this diff Show More