Merge branch 'upstream'

Former-commit-id: b88a8fdaee6d5f5111b39424b2e1cedf68fdb9af
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-10 19:26:16 +00:00
commit ebd6f89d42
43 changed files with 49 additions and 35 deletions

View File

@ -1 +1 @@
29934128e74365026cd0e20fc003e23148281b95
d14366b531b59bf249a7d028ed19c2a11ab16eef

View File

@ -1 +1 @@
8cf64e6d8b3715983f82419725e624b70b0ef99d
374b05f540bd7262e73749cf47856879fd8b1f59

View File

@ -1 +1 @@
8b04034feaab27d73164bdaa4db83c03b88c77b6
234bce4aa119ca31f0bfe7d703f5e629a69e3811

View File

@ -1 +1 @@
8b04034feaab27d73164bdaa4db83c03b88c77b6
234bce4aa119ca31f0bfe7d703f5e629a69e3811

View File

@ -1 +1 @@
abb67671d9d4ec35e02a5a80985f9f8f29fedd36
77d88765c83696d7661b6c4006c00ad031464996

View File

@ -729,7 +729,7 @@ namespace Microsoft.SqlServer.Server
}
}
public IDataReader GetData(int i)
IDataReader System.Data.IDataRecord.GetData (int ordinal)
{
throw ADP.NotSupported();
}

View File

@ -897,6 +897,7 @@ namespace System.Net.Tests
}
[Theory, MemberData(nameof(EchoServers))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "no exception thrown on mono")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "no exception thrown on netfx")]
public void BeginGetRequestStream_CreatePostRequestThenCallTwice_ThrowsInvalidOperationException(Uri remoteServer)
{
@ -1239,6 +1240,7 @@ namespace System.Net.Tests
}
[ActiveIssue(19083)]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "dotnet/corefx #19083")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19083")]
[Fact]
public async Task Abort_BeginGetRequestStreamThenAbort_EndGetRequestStreamThrowsWebException()
@ -1261,6 +1263,7 @@ namespace System.Net.Tests
});
}
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "ResponseCallback not called after Abort on mono")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "ResponseCallback not called after Abort on netfx")]
[Fact]
public async Task Abort_BeginGetResponseThenAbort_ResponseCallbackCalledBeforeAbortReturns()

View File

@ -11,6 +11,7 @@ namespace System.Net.Tests
{
[Fact]
[ActiveIssue(20470, TargetFrameworkMonikers.UapAot)]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core.")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetEventSource is only part of .NET Core.")]
public void EventSource_ExistsWithCorrectId()
{

View File

@ -11,6 +11,7 @@ namespace System.Net.Tests
{
[ActiveIssue(20470, TargetFrameworkMonikers.UapAot)]
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "NetEventSource is only part of .NET Core")]
public void EventSource_ExistsWithCorrectId()
{

View File

@ -543,6 +543,7 @@ namespace System.Net.Tests
private const string CookieInvalid = "helloWorld";
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Does not work in Mono")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Requires fix shipping in .NET 4.7.2")]
public void GetValues_MultipleSetCookieHeadersWithExpiresAttribute_Success()
{
@ -561,6 +562,7 @@ namespace System.Net.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Does not work in Mono")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Requires fix shipping in .NET 4.7.2")]
public void GetValues_SingleSetCookieHeaderWithMultipleCookiesWithExpiresAttribute_Success()
{
@ -609,6 +611,7 @@ namespace System.Net.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Does not work in Mono")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Requires fix shipping in .NET 4.7.2")]
public void GetValues_InvalidSetCookieHeader_Success()
{

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.0.101";
public const string MonoVersion = "5.10.0.103";
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

@ -20,6 +20,12 @@ namespace System.Data.SqlClient
"keyword and always reset the connection")]
public bool ConnectionReset { get; set; }
[MonoTODO("Not implemented in corefx: dotnet/corefx/issues/22474")]
public SqlAuthenticationMethod Authentication {
get => throw new NotImplementedException();
set => throw new NotImplementedException();
}
[MonoTODO("Not implemented in corefx: https://github.com/dotnet/corefx/issues/22474")]
public bool ContextConnection {
get => throw new NotImplementedException();

View File

@ -1 +1 @@
d5fe529e72a19edabb8d0d737134f42d61076a2e
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59

View File

@ -1 +1 @@
d6603fb55c99e4e6a2ab0f992aa575a430a23daf
254d9408bc8a59955b3acbd045dab6ff7b365c37

View File

@ -1 +1 @@
ca7879c6464de633c5d55777e99f90f6c32b0346
29b49effce90b7f2fe0c79a6de7b247df79e829a

View File

@ -1 +1 @@
05a25e094cf7053d826c561b6bae1934b651c4cd
8eba7aa42674b1f25626dfbf370c22074eea751e

View File

@ -1 +1 @@
4dda84573eb2e64b6ce95ccc37cb297d0d96ac26
9f6e1f37b3af679ed3d2549d5d41977edc9134df

View File

@ -1 +1 @@
2d54b1ef285e46cc986e00ef7bcd7775e3412a56
33afdd892811cf9251820346c334158d1c465bca

View File

@ -1 +1 @@
ffe45e62e511ea47af2a066b17eb0637418d7347
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910

View File

@ -1 +1 @@
d5fe529e72a19edabb8d0d737134f42d61076a2e
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59

View File

@ -1 +1 @@
d6603fb55c99e4e6a2ab0f992aa575a430a23daf
254d9408bc8a59955b3acbd045dab6ff7b365c37

View File

@ -1 +1 @@
ca7879c6464de633c5d55777e99f90f6c32b0346
29b49effce90b7f2fe0c79a6de7b247df79e829a

View File

@ -1 +1 @@
05a25e094cf7053d826c561b6bae1934b651c4cd
8eba7aa42674b1f25626dfbf370c22074eea751e

View File

@ -1 +1 @@
4dda84573eb2e64b6ce95ccc37cb297d0d96ac26
9f6e1f37b3af679ed3d2549d5d41977edc9134df

View File

@ -1 +1 @@
2d54b1ef285e46cc986e00ef7bcd7775e3412a56
33afdd892811cf9251820346c334158d1c465bca

View File

@ -1 +1 @@
ffe45e62e511ea47af2a066b17eb0637418d7347
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910

View File

@ -1 +1 @@
d5fe529e72a19edabb8d0d737134f42d61076a2e
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59

View File

@ -1 +1 @@
d6603fb55c99e4e6a2ab0f992aa575a430a23daf
254d9408bc8a59955b3acbd045dab6ff7b365c37

View File

@ -1 +1 @@
ca7879c6464de633c5d55777e99f90f6c32b0346
29b49effce90b7f2fe0c79a6de7b247df79e829a

View File

@ -1 +1 @@
05a25e094cf7053d826c561b6bae1934b651c4cd
8eba7aa42674b1f25626dfbf370c22074eea751e

View File

@ -1 +1 @@
4dda84573eb2e64b6ce95ccc37cb297d0d96ac26
9f6e1f37b3af679ed3d2549d5d41977edc9134df

View File

@ -1 +1 @@
2d54b1ef285e46cc986e00ef7bcd7775e3412a56
33afdd892811cf9251820346c334158d1c465bca

View File

@ -1 +1 @@
ffe45e62e511ea47af2a066b17eb0637418d7347
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/b66bc53"
#define FULL_VERSION "explicit/38c4fa9"

Binary file not shown.

View File

@ -1 +1 @@
bd80b37ca3851a629369e3a68ca2434d0f1e993c
1e380e8dae219f581df3a141350c335d93230b4a

Binary file not shown.

View File

@ -1 +1 @@
30f9a068a58a1a7f137f29bfffe003b519b9c28c
5e63cf17be60fe31d3024175347f2fb6ba156dcc

Binary file not shown.

View File

@ -1 +1 @@
5bb2aea616b503b910b63fd1ca78da99d1030b19
8994d013c0a79eb03ddae022aa20abb4f4fc691c

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.101\n"
"Project-Id-Version: mono 5.10.0.103\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-09 18:50+0000\n"
"POT-Creation-Date: 2018-02-10 18:49+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 @@
c20632dfffb56de6e750c6607472862e453d1095
a4d139ee6e877a6ec9dce5dab635fa73f8f35d18