Imported Upstream version 6.4.0.183

Former-commit-id: 85d93be5537556349ef364365576dccf5d99b797
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-28 08:43:56 +00:00
parent f94a1d9416
commit d213358eb3
49 changed files with 53 additions and 46 deletions

View File

@ -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"

View File

@ -1 +1 @@
ab06dc009f387763965cd03d86acb5f1d549d1a9
d6866b4fe80b76dd0fa8631abac09a4f0549ee02

View File

@ -1 +1 @@
ccb1e8a538dfd6e97ee03e96a16fa6def0f82433
50d0ad797b45a24feb0dd058be601add40f35588

View File

@ -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)
{

View File

@ -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";

View File

@ -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);
}
}

View File

@ -375,7 +375,6 @@ namespace MonoTests.System.Net.Http
}
[Test]
[Category ("NotWorking")]
public void Send_BaseAddress ()
{
var mh = new HttpMessageHandlerMock ();

View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

View File

@ -1 +1 @@
edfdea03528d626dc090d70ac981441a1854222d
43d9590e4365814ccc62474eee87bc3c1878bb93

View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

View File

@ -1 +1 @@
08b8eee766db7b49dcefb7d9d1662649d31654f4
0746ab14270c79f16e1394e71ab25048001370be

View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

View File

@ -1 +1 @@
edfdea03528d626dc090d70ac981441a1854222d
43d9590e4365814ccc62474eee87bc3c1878bb93

View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

View File

@ -1 +1 @@
70454f8b5a181f77a55c7e8be735ed2b06d930f2
7da81eeed2ece50e3fd34954f3fb044896f74fa8

View File

@ -1 +1 @@
08b8eee766db7b49dcefb7d9d1662649d31654f4
0746ab14270c79f16e1394e71ab25048001370be

View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

View File

@ -1 +1 @@
edfdea03528d626dc090d70ac981441a1854222d
43d9590e4365814ccc62474eee87bc3c1878bb93

View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

View File

@ -1 +1 @@
70454f8b5a181f77a55c7e8be735ed2b06d930f2
7da81eeed2ece50e3fd34954f3fb044896f74fa8

View File

@ -1 +1 @@
08b8eee766db7b49dcefb7d9d1662649d31654f4
0746ab14270c79f16e1394e71ab25048001370be

View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

View File

@ -1 +1 @@
0fbe23ab4e57bf05537345c1627fecb4583bebaa
aa4c2c8265d8d01011f0558dd14cb16a21777386

View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

View File

@ -1 +1 @@
70454f8b5a181f77a55c7e8be735ed2b06d930f2
7da81eeed2ece50e3fd34954f3fb044896f74fa8

View File

@ -1 +1 @@
af3f69ba6e43443e118264541f28b41d5e9fd70a
2c761638c86c118e9ccd78929305b445efad5c44

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/5ecff82"
#define FULL_VERSION "explicit/99c1602"

View File

@ -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 \

Binary file not shown.

View File

@ -1 +1 @@
88f0e769332f884a52c56b22626f4d632a0c5eb0
be6bcadeef714883f6a68fa5366f7f7d0086366a

Binary file not shown.

View File

@ -1 +1 @@
269c3fe708b9608aa227e9718e5b64f2aca6b50c
05c1c4419fa47d42db19fd0a25825d22816e6e76

Binary file not shown.

View File

@ -1 +1 @@
a893f94307c5e44b9455ea19a348b82b97606ea2
43f766c6317bc4f30549c711e913abac7faf18ce

View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
f4ccdfbaae15c5a0d969d63b009f851927437f24
487dc22721460a1be3b65fee9b880f2797a4febf