Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -43,7 +43,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file
USE_XTEST_REMOTE_EXECUTOR = YES
XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation
XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Text.RegularExpressions
EXTRA_DISTFILES = \
$(wildcard Test/System.Data/*.xml) \

View File

@@ -14,6 +14,7 @@ using Microsoft.SqlServer.Server;
using System.Reflection;
using System.IO;
using System.Globalization;
using System.Security;
namespace System.Data.SqlClient
{
@@ -123,6 +124,12 @@ namespace System.Data.SqlClient
public override void ChangeDatabase(string database)
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
public static void ChangePassword(string connectionString, string newPassword)
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
public static void ChangePassword(string connectionString, SqlCredential credential, SecureString newSecurePassword)
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
public static void ClearAllPools()
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

View File

@@ -144,7 +144,7 @@ public class BinarySerializationTest
//Add Constraint
UniqueConstraint uniqueConstraint = new UniqueConstraint (tb1.Columns ["id"]);
tb1.Constraints.Add (uniqueConstraint);
tb1.RemotingFormat = SerializationFormat.Binary;
tb1.RemotingFormat = SerializationFormat.Xml;
tb1.AcceptChanges();
tb1.Rows[0][0] = 1;
@@ -284,7 +284,7 @@ public class BinarySerializationTest
tb1.Rows.Add (new object[] {null, null});
BinaryFormatter bf = new BinaryFormatter ();
tb1.RemotingFormat = SerializationFormat.Binary;
tb1.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb2.bin", FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int)fs.Length);
@@ -449,6 +449,7 @@ public class BinarySerializationTest
}
[Test]
[Category("NotWorking")] // Ordering issue
public void DataSetSerializationTest2 ()
{
DataSet ds = new DataSet ();
@@ -475,7 +476,7 @@ public class BinarySerializationTest
ds.Relations.Add (rel);
//SerializeDataSet
BinaryFormatter bf = new BinaryFormatter ();
ds.RemotingFormat = SerializationFormat.Binary;
ds.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb4.bin", FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int) fs.Length);
@@ -645,6 +646,7 @@ public class BinarySerializationTest
Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]);
}
[Test]
[Category("NotWorking")] // Ordering issue
public void Constraint_Relations_Test2 ()
{
//Serialize DataSet
@@ -708,7 +710,7 @@ public class BinarySerializationTest
//SerializeDataSet
BinaryFormatter bf = new BinaryFormatter ();
ds.RemotingFormat = SerializationFormat.Binary;
ds.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb5.bin", FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int)fs.Length);

View File

@@ -60,6 +60,23 @@ corefx/SqlDependencyUtils.cs
#../../../external/corefx/src/System.Data.Common/src/System/Data/Common/FieldNameLookup.cs
#../../../external/corefx/src/System.Data.SqlClient/src/System/Data/DataException.cs
../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs
../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.Drivers.cs
../../../external/corefx/src/Common/src/System/Data/Common/BasicFieldNameLookup.cs
../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionOptions.Common.cs
../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionPoolKey.cs
../../../external/corefx/src/Common/src/System/Data/Common/FieldNameLookup.cs
../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs
../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionClosed.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionFactory.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbConnectionInternal.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbReferenceCollection.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs
../../../external/corefx/src/Common/src/System/Data/ProviderBase/TimeoutTimer.cs
#
# System.Data.Common
#
@@ -197,7 +214,6 @@ corefx/SqlDependencyUtils.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/UInt64Storage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/AdapterSwitches.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/AdapterUtil.Common.cs
../../../external/corefx/src/Common/src/System/Data/Common/AdapterUtil.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/BigIntegerStorage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/BooleanStorage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ByteStorage.cs
@@ -215,7 +231,6 @@ corefx/SqlDependencyUtils.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbCommand.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnection.cs
../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionPoolKey.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilder.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilderDescriptor.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataAdapter.cs
@@ -242,9 +257,6 @@ corefx/SqlDependencyUtils.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int16Storage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int32Storage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int64Storage.cs
../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs
../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs
../../../external/corefx/src/Common/src/System/Data/Common/DbConnectionOptions.Common.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ObjectStorage.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatedEventArgs.cs
../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatingEventArgs.cs
@@ -342,22 +354,14 @@ corefx/SqlDependencyUtils.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/DbConnectionStringCommon.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/AdapterUtil.SqlClient.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/DbConnectionOptions.cs
../../../external/corefx/src/Common/src/System/Data/Common/FieldNameLookup.cs
../../../external/corefx/src/Common/src/System/Data/Common/BasicFieldNameLookup.cs
../../../external/corefx/src/Common/src/System/Data/Common/MultipartIdentifier.cs
../../../external/corefx/src/Common/src/System/Data/Common/NameValuePair.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionClosed.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionFactory.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionInternal.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPool.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroup.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolIdentity.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolOptions.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbMetaDataFactory.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlNorm.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlMetaData.cs
../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Sql/SqlNotificationRequest.cs

View File

@@ -786,13 +786,21 @@ partial class SR
public const string MDF_TooManyRestrictions = "More restrictions were provided than the requested schema ('{0}') supports.";
public const string MDF_DataTableDoesNotExist = "The collection '{0}' is missing from the metadata XML.";
public const string MDF_UndefinedCollection = "The requested collection ({0}) is not defined.";
public const string MDF_UnsupportedVersion = " requested collection ({0}) is not supported by this version of the provider.";
public const string MDF_UnsupportedVersion = "The requested collection ({0}) is not supported by this version of the provider.";
public const string MDF_MissingRestrictionColumn = "One or more of the required columns of the restrictions collection is missing.";
public const string MDF_MissingRestrictionRow = "A restriction exists for which there is no matching row in the restrictions collection.";
public const string MDF_IncorrectNumberOfDataSourceInformationRows = "The DataSourceInformation table must contain exactly one row.";
public const string MDF_MissingDataSourceInformationColumn = "One of the required DataSourceInformation tables columns is missing.";
public const string MDF_AmbigousCollectionName = "The collection name '{0}' matches at least two collections with the same name but with different case, but does not match any of them exactly.";
public const string MDF_UnableToBuildCollection = "Unable to build schema collection '{0}';";
public const string ADP_InvalidArgumentLength = "The length of argument '{0}' exceeds its limit of '{1}'.";
public const string ADP_MustBeReadOnly = "{0} must be marked as read only.";
public const string ADP_InvalidMixedUsageOfSecureAndClearCredential = "Cannot use Credential with UserID, UID, Password, or PWD connection string keywords.";
public const string ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity = "Cannot use Credential with Integrated Security connection string keyword.";
public const string SQL_ChangePasswordArgumentMissing = "The '{0}' argument must not be null or empty.";
public const string SQL_ChangePasswordConflictsWithSSPI = "ChangePassword can only be used with SQL authentication, not with integrated security.";
public const string SQL_ChangePasswordRequiresYukon = "ChangePassword requires SQL Server 9.0 or later.";
public const string SQL_ChangePasswordUseOfUnallowedKey = "The keyword '{0}' must not be specified in the connectionString argument to ChangePassword.";
public const string ADP_CollectionIsParent = "The {0} with is already contained by this {1}.";
public const string ADP_InvalidDataDirectory = "The DataDirectory substitute is not a string.";
public const string ADP_QuotePrefixNotSet = "{0} requires an open connection when the quote prefix has not been set.";

View File

@@ -18,9 +18,6 @@ namespace System.Data.SqlClient
set => throw new NotImplementedException();
}
[System.Security.Permissions.HostProtectionAttribute(ExternalThreading=true)]
public IAsyncResult BeginExecuteXmlReader() => BeginExecuteXmlReader(null, null);
[System.Security.Permissions.HostProtectionAttribute(ExternalThreading=true)]
public IAsyncResult BeginExecuteReader() =>
BeginExecuteReader(CommandBehavior.Default, null, null);

View File

@@ -11,18 +11,6 @@ namespace System.Data.SqlClient
{
partial class SqlConnection : IDbConnection, ICloneable, IDisposable
{
public SqlConnection(string connectionString, SqlCredential credential)
{
ConnectionString = connectionString;
Credentials = credential;
}
[MonoTODO] //https://github.com/dotnet/corefx/issues/11958
public static void ChangePassword (string connectionString, string newPassword)
{
throw new NotImplementedException();
}
[MonoTODO] //https://github.com/dotnet/corefx/issues/11542
public SqlCredential Credentials {
get => throw new NotImplementedException();

View File

@@ -30,7 +30,6 @@
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIInterface.cs
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs
../../../external/corefx/src/Common/src/System/Net/IntPtrHelper.cs
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs
../../../external/corefx/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs