mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: bcbfe7ff820a7fd012b585018b26495c75649545
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-28 09:14:33 +00:00
commit 766f202601
49 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acceptance-tests/SUBMODULES.json
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"

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
ab06dc009f387763965cd03d86acb5f1d549d1a9
d6866b4fe80b76dd0fa8631abac09a4f0549ee02

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
ccb1e8a538dfd6e97ee03e96a16fa6def0f82433
50d0ad797b45a24feb0dd058be601add40f35588

4
external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs vendored
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)
{

2
mcs/build/common/Consts.cs
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";

4
mcs/class/System.Net.Http/HttpRequestMessage.Mono.cs
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);
}
}

3
mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
View File

@ -374,8 +374,7 @@ namespace MonoTests.System.Net.Http
Assert.AreEqual (response, client.SendAsync (request).Result, "#1");
}
[Test]
[Category ("NotWorking")]
[Test]
public void Send_BaseAddress ()
{
var mh = new HttpMessageHandlerMock ();

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
edfdea03528d626dc090d70ac981441a1854222d
43d9590e4365814ccc62474eee87bc3c1878bb93

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
08b8eee766db7b49dcefb7d9d1662649d31654f4
0746ab14270c79f16e1394e71ab25048001370be

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
dfaa710d8cffa989eb11658766d4744ea5a6e602
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
edfdea03528d626dc090d70ac981441a1854222d
43d9590e4365814ccc62474eee87bc3c1878bb93

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
ca40e636a03390d303343a07feb3e07739b0482d
402b55a12e64b2ce4670d243f09114f9c52ef06c

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
f8133a815d0ff5cc0c72c10e5ba6d97278601794
dc9e0b9629e134ea423a418933f6c18238a213a7

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
57293eefbd5a400e20b81deae90100ea5244c985

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