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

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