diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs index 2defe1a735..b08b41aeb2 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Data; using System; using System.Runtime.InteropServices; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs index 80a32e6c5a..0f479a8c62 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Data; using System; using System.Diagnostics; using System.Runtime.InteropServices; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs index cfec6e4e44..cdb3819605 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs @@ -4,6 +4,7 @@ using System.Net.Security; using System.Runtime.InteropServices; +using Microsoft.Data; namespace System.Net { diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs index 1f0f472d40..4152a89a7d 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs @@ -4,6 +4,7 @@ using System.Net.Security; using System.Runtime.InteropServices; +using Microsoft.Data; namespace System.Net { @@ -129,7 +130,7 @@ public unsafe int QueryContextAttributes(SafeDeleteContext phContext, Interop.Ss } else { - throw new ArgumentException(System.StringsHelper.Format(Strings.SSPIInvalidHandleType, handleType.FullName), nameof(handleType)); + throw new ArgumentException(StringsHelper.Format(Strings.SSPIInvalidHandleType, handleType.FullName), nameof(handleType)); } } fixed (byte* bufferPtr = buffer) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs index ea8e713529..f8231f9069 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.Net.Security; using System.Runtime.InteropServices; +using Microsoft.Data; namespace System.Net { @@ -101,7 +102,7 @@ public static SafeFreeCredentials AcquireDefaultCredential(SSPIInterface secModu if (errorCode != 0) { if (NetEventSource.IsEnabled) - NetEventSource.Error(null, System.StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireDefaultCredential), $"0x{errorCode:X}")); + NetEventSource.Error(null, StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireDefaultCredential), $"0x{errorCode:X}")); throw new Win32Exception(errorCode); } return outCredential; @@ -118,7 +119,7 @@ public static SafeFreeCredentials AcquireCredentialsHandle(SSPIInterface secModu if (errorCode != 0) { if (NetEventSource.IsEnabled) - NetEventSource.Error(null, System.StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireCredentialsHandle), $"0x{errorCode:X}")); + NetEventSource.Error(null, StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireCredentialsHandle), $"0x{errorCode:X}")); throw new Win32Exception(errorCode); } @@ -143,7 +144,7 @@ public static SafeFreeCredentials AcquireCredentialsHandle(SSPIInterface secModu if (errorCode != 0) { if (NetEventSource.IsEnabled) - NetEventSource.Error(null, System.StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireCredentialsHandle), $"0x{errorCode:X}")); + NetEventSource.Error(null, StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(AcquireCredentialsHandle), $"0x{errorCode:X}")); throw new Win32Exception(errorCode); } @@ -359,11 +360,11 @@ private static unsafe int EncryptDecryptHelper(OP op, SSPIInterface secModule, S { if (errorCode == Interop.SspiCli.SEC_I_RENEGOTIATE) { - NetEventSource.Error(null, System.StringsHelper.Format(Strings.event_OperationReturnedSomething, op, "SEC_I_RENEGOTIATE")); + NetEventSource.Error(null, StringsHelper.Format(Strings.event_OperationReturnedSomething, op, "SEC_I_RENEGOTIATE")); } else { - NetEventSource.Error(null, System.StringsHelper.Format(Strings.net_log_operation_failed_with_error, op, $"0x{0:X}")); + NetEventSource.Error(null, StringsHelper.Format(Strings.net_log_operation_failed_with_error, op, $"0x{0:X}")); } } @@ -466,7 +467,7 @@ public static object QueryContextAttributes(SSPIInterface secModule, SafeDeleteC break; default: - throw new ArgumentException(System.StringsHelper.Format(Strings.net_invalid_enum, nameof(contextAttribute)), nameof(contextAttribute)); + throw new ArgumentException(StringsHelper.Format(Strings.net_invalid_enum, nameof(contextAttribute)), nameof(contextAttribute)); } SafeHandle sspiHandle = null; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/AdapterUtil.cs index 19a9d2447b..f318560914 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/AdapterUtil.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/AdapterUtil.cs @@ -200,7 +200,7 @@ internal static bool RemoveStringQuotes(string quotePrefix, string quoteSuffix, internal static ArgumentOutOfRangeException NotSupportedEnumerationValue(Type type, string value, string method) { - return ArgumentOutOfRange(System.StringsHelper.Format(Strings.ADP_NotSupportedEnumerationValue, type.Name, value, method), type.Name); + return ArgumentOutOfRange(StringsHelper.Format(Strings.ADP_NotSupportedEnumerationValue, type.Name, value, method), type.Name); } internal static InvalidOperationException DataAdapter(string error) @@ -215,21 +215,21 @@ private static InvalidOperationException Provider(string error) internal static ArgumentException InvalidMultipartName(string property, string value) { - ArgumentException e = new ArgumentException(System.StringsHelper.Format(Strings.ADP_InvalidMultipartName, property, value)); + ArgumentException e = new ArgumentException(StringsHelper.Format(Strings.ADP_InvalidMultipartName, property, value)); TraceExceptionAsReturnValue(e); return e; } internal static ArgumentException InvalidMultipartNameIncorrectUsageOfQuotes(string property, string value) { - ArgumentException e = new ArgumentException(System.StringsHelper.Format(Strings.ADP_InvalidMultipartNameQuoteUsage, property, value)); + ArgumentException e = new ArgumentException(StringsHelper.Format(Strings.ADP_InvalidMultipartNameQuoteUsage, property, value)); TraceExceptionAsReturnValue(e); return e; } internal static ArgumentException InvalidMultipartNameToManyParts(string property, string value, int limit) { - ArgumentException e = new ArgumentException(System.StringsHelper.Format(Strings.ADP_InvalidMultipartNameToManyParts, property, value, limit)); + ArgumentException e = new ArgumentException(StringsHelper.Format(Strings.ADP_InvalidMultipartNameToManyParts, property, value, limit)); TraceExceptionAsReturnValue(e); return e; } @@ -286,7 +286,7 @@ internal static bool IsCatchableOrSecurityExceptionType(Exception e) // Invalid Enumeration internal static ArgumentOutOfRangeException InvalidEnumerationValue(Type type, int value) { - return ArgumentOutOfRange(System.StringsHelper.Format(Strings.ADP_InvalidEnumerationValue, type.Name, value.ToString(CultureInfo.InvariantCulture)), type.Name); + return ArgumentOutOfRange(StringsHelper.Format(Strings.ADP_InvalidEnumerationValue, type.Name, value.ToString(CultureInfo.InvariantCulture)), type.Name); } // @@ -294,15 +294,15 @@ internal static ArgumentOutOfRangeException InvalidEnumerationValue(Type type, i // internal static ArgumentException ConnectionStringSyntax(int index) { - return Argument(System.StringsHelper.Format(Strings.ADP_ConnectionStringSyntax, index)); + return Argument(StringsHelper.Format(Strings.ADP_ConnectionStringSyntax, index)); } internal static ArgumentException KeywordNotSupported(string keyword) { - return Argument(System.StringsHelper.Format(Strings.ADP_KeywordNotSupported, keyword)); + return Argument(StringsHelper.Format(Strings.ADP_KeywordNotSupported, keyword)); } internal static ArgumentException ConvertFailed(Type fromType, Type toType, Exception innerException) { - return ADP.Argument(System.StringsHelper.Format(Strings.SqlConvert_ConvertFailed, fromType.FullName, toType.FullName), innerException); + return ADP.Argument(StringsHelper.Format(Strings.SqlConvert_ConvertFailed, fromType.FullName, toType.FullName), innerException); } // @@ -314,7 +314,7 @@ internal static Exception InvalidConnectionOptionValue(string key) } internal static Exception InvalidConnectionOptionValue(string key, Exception inner) { - return Argument(System.StringsHelper.Format(Strings.ADP_InvalidConnectionOptionValue, key), inner); + return Argument(StringsHelper.Format(Strings.ADP_InvalidConnectionOptionValue, key), inner); } static internal InvalidOperationException InvalidDataDirectory() { @@ -327,23 +327,23 @@ static internal InvalidOperationException InvalidDataDirectory() // internal static ArgumentException CollectionRemoveInvalidObject(Type itemType, ICollection collection) { - return Argument(System.StringsHelper.Format(Strings.ADP_CollectionRemoveInvalidObject, itemType.Name, collection.GetType().Name)); + return Argument(StringsHelper.Format(Strings.ADP_CollectionRemoveInvalidObject, itemType.Name, collection.GetType().Name)); } internal static ArgumentNullException CollectionNullValue(string parameter, Type collection, Type itemType) { - return ArgumentNull(parameter, System.StringsHelper.Format(Strings.ADP_CollectionNullValue, collection.Name, itemType.Name)); + return ArgumentNull(parameter, StringsHelper.Format(Strings.ADP_CollectionNullValue, collection.Name, itemType.Name)); } internal static IndexOutOfRangeException CollectionIndexInt32(int index, Type collection, int count) { - return IndexOutOfRange(System.StringsHelper.Format(Strings.ADP_CollectionIndexInt32, index.ToString(CultureInfo.InvariantCulture), collection.Name, count.ToString(CultureInfo.InvariantCulture))); + return IndexOutOfRange(StringsHelper.Format(Strings.ADP_CollectionIndexInt32, index.ToString(CultureInfo.InvariantCulture), collection.Name, count.ToString(CultureInfo.InvariantCulture))); } internal static IndexOutOfRangeException CollectionIndexString(Type itemType, string propertyName, string propertyValue, Type collection) { - return IndexOutOfRange(System.StringsHelper.Format(Strings.ADP_CollectionIndexString, itemType.Name, propertyName, propertyValue, collection.Name)); + return IndexOutOfRange(StringsHelper.Format(Strings.ADP_CollectionIndexString, itemType.Name, propertyName, propertyValue, collection.Name)); } internal static InvalidCastException CollectionInvalidType(Type collection, Type itemType, object invalidValue) { - return InvalidCast(System.StringsHelper.Format(Strings.ADP_CollectionInvalidType, collection.Name, itemType.Name, invalidValue.GetType().Name)); + return InvalidCast(StringsHelper.Format(Strings.ADP_CollectionInvalidType, collection.Name, itemType.Name, invalidValue.GetType().Name)); } // @@ -365,7 +365,7 @@ private static string ConnectionStateMsg(ConnectionState state) case (ConnectionState.Open | ConnectionState.Fetching): return Strings.ADP_ConnectionStateMsg_OpenFetching; default: - return System.StringsHelper.Format(Strings.ADP_ConnectionStateMsg, state.ToString()); + return StringsHelper.Format(Strings.ADP_ConnectionStateMsg, state.ToString()); } } @@ -374,7 +374,7 @@ private static string ConnectionStateMsg(ConnectionState state) // internal static Exception StreamClosed([CallerMemberName] string method = "") { - return InvalidOperation(System.StringsHelper.Format(Strings.ADP_StreamClosed, method)); + return InvalidOperation(StringsHelper.Format(Strings.ADP_StreamClosed, method)); } internal static string BuildQuotedString(string quotePrefix, string quoteSuffix, string unQuotedString) @@ -433,11 +433,11 @@ static internal string BuildMultiPartName(string[] strings) // internal static ArgumentException ParametersIsNotParent(Type parameterType, ICollection collection) { - return Argument(System.StringsHelper.Format(Strings.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name)); + return Argument(StringsHelper.Format(Strings.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name)); } internal static ArgumentException ParametersIsParent(Type parameterType, ICollection collection) { - return Argument(System.StringsHelper.Format(Strings.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name)); + return Argument(StringsHelper.Format(Strings.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name)); } @@ -483,7 +483,7 @@ internal enum InternalErrorCode internal static Exception InternalError(InternalErrorCode internalError) { - return InvalidOperation(System.StringsHelper.Format(Strings.ADP_InternalProviderError, (int)internalError)); + return InvalidOperation(StringsHelper.Format(Strings.ADP_InternalProviderError, (int)internalError)); } // @@ -491,23 +491,23 @@ internal static Exception InternalError(InternalErrorCode internalError) // internal static Exception DataReaderClosed([CallerMemberName] string method = "") { - return InvalidOperation(System.StringsHelper.Format(Strings.ADP_DataReaderClosed, method)); + return InvalidOperation(StringsHelper.Format(Strings.ADP_DataReaderClosed, method)); } internal static ArgumentOutOfRangeException InvalidSourceBufferIndex(int maxLen, long srcOffset, string parameterName) { - return ArgumentOutOfRange(System.StringsHelper.Format(Strings.ADP_InvalidSourceBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), srcOffset.ToString(CultureInfo.InvariantCulture)), parameterName); + return ArgumentOutOfRange(StringsHelper.Format(Strings.ADP_InvalidSourceBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), srcOffset.ToString(CultureInfo.InvariantCulture)), parameterName); } internal static ArgumentOutOfRangeException InvalidDestinationBufferIndex(int maxLen, int dstOffset, string parameterName) { - return ArgumentOutOfRange(System.StringsHelper.Format(Strings.ADP_InvalidDestinationBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), dstOffset.ToString(CultureInfo.InvariantCulture)), parameterName); + return ArgumentOutOfRange(StringsHelper.Format(Strings.ADP_InvalidDestinationBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), dstOffset.ToString(CultureInfo.InvariantCulture)), parameterName); } internal static IndexOutOfRangeException InvalidBufferSizeOrIndex(int numBytes, int bufferIndex) { - return IndexOutOfRange(System.StringsHelper.Format(Strings.SQL_InvalidBufferSizeOrIndex, numBytes.ToString(CultureInfo.InvariantCulture), bufferIndex.ToString(CultureInfo.InvariantCulture))); + return IndexOutOfRange(StringsHelper.Format(Strings.SQL_InvalidBufferSizeOrIndex, numBytes.ToString(CultureInfo.InvariantCulture), bufferIndex.ToString(CultureInfo.InvariantCulture))); } internal static Exception InvalidDataLength(long length) { - return IndexOutOfRange(System.StringsHelper.Format(Strings.SQL_InvalidDataLength, length.ToString(CultureInfo.InvariantCulture))); + return IndexOutOfRange(StringsHelper.Format(Strings.SQL_InvalidDataLength, length.ToString(CultureInfo.InvariantCulture))); } internal static bool CompareInsensitiveInvariant(string strvalue, string strconst) => diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs index 9d4a0818cb..acdc36caeb 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs @@ -50,22 +50,22 @@ internal static class SQLResource internal static string InvalidOpStreamClosed(string method) { - return System.StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamClosed, method); + return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamClosed, method); } internal static string InvalidOpStreamNonWritable(string method) { - return System.StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonWritable, method); + return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonWritable, method); } internal static string InvalidOpStreamNonReadable(string method) { - return System.StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonReadable, method); + return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonReadable, method); } internal static string InvalidOpStreamNonSeekable(string method) { - return System.StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonSeekable, method); + return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonSeekable, method); } } // SqlResource } // namespace System diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs index 18a0b14cfe..fe56d8ed91 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.ComponentModel; +using Microsoft.Data; namespace System.Net.Security { @@ -40,7 +41,7 @@ internal static unsafe SafeFreeCredentials AcquireCredentialsHandle(string packa if (result != Interop.SECURITY_STATUS.OK) { if (NetEventSource.IsEnabled) - NetEventSource.Error(null, System.StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(Interop.SspiCli.SspiEncodeStringsAsAuthIdentity), $"0x{(int)result:X}")); + NetEventSource.Error(null, StringsHelper.Format(Strings.net_log_operation_failed_with_error, nameof(Interop.SspiCli.SspiEncodeStringsAsAuthIdentity), $"0x{(int)result:X}")); throw new Win32Exception((int)result); } diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index d918134b15..e5095ea5fd 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -330,6 +330,9 @@ Resources\ResDescriptionAttribute.cs + + Resources\StringsHelper.cs + @@ -402,7 +405,9 @@ - + + Resources\StringsHelper.NetCore.cs + True True diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs index 279c310d10..d4b9c98678 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs @@ -74,7 +74,7 @@ internal static TypeLoadException TypeLoad(string error) } internal static PlatformNotSupportedException DbTypeNotSupported(string dbType) { - PlatformNotSupportedException e = new PlatformNotSupportedException(System.StringsHelper.GetString(Strings.SQL_DbTypeNotSupportedOnThisPlatform, dbType)); + PlatformNotSupportedException e = new PlatformNotSupportedException(StringsHelper.GetString(Strings.SQL_DbTypeNotSupportedOnThisPlatform, dbType)); return e; } internal static InvalidCastException InvalidCast() @@ -100,12 +100,12 @@ internal static ObjectDisposedException ObjectDisposed(object instance) internal static Exception DataTableDoesNotExist(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_DataTableDoesNotExist, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_DataTableDoesNotExist, collectionName)); } internal static InvalidOperationException MethodCalledTwice(string method) { - InvalidOperationException e = new InvalidOperationException(System.StringsHelper.GetString(Strings.ADP_CalledTwice, method)); + InvalidOperationException e = new InvalidOperationException(StringsHelper.GetString(Strings.ADP_CalledTwice, method)); return e; } @@ -166,7 +166,7 @@ internal static ArgumentOutOfRangeException InvalidParameterDirection(ParameterD internal static Exception TooManyRestrictions(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_TooManyRestrictions, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_TooManyRestrictions, collectionName)); } @@ -192,7 +192,7 @@ internal static ArgumentOutOfRangeException InvalidUpdateRowSource(UpdateRowSour // internal static ArgumentException InvalidMinMaxPoolSizeValues() { - return ADP.Argument(System.StringsHelper.GetString(Strings.ADP_InvalidMinMaxPoolSizeValues)); + return ADP.Argument(StringsHelper.GetString(Strings.ADP_InvalidMinMaxPoolSizeValues)); } @@ -201,7 +201,7 @@ internal static ArgumentException InvalidMinMaxPoolSizeValues() // internal static InvalidOperationException NoConnectionString() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_NoConnectionString)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_NoConnectionString)); } internal static Exception MethodNotImplemented([CallerMemberName] string methodName = "") @@ -211,7 +211,7 @@ internal static Exception MethodNotImplemented([CallerMemberName] string methodN internal static Exception QueryFailed(string collectionName, Exception e) { - return InvalidOperation(System.StringsHelper.GetString(Strings.MDF_QueryFailed, collectionName), e); + return InvalidOperation(StringsHelper.GetString(Strings.MDF_QueryFailed, collectionName), e); } @@ -220,11 +220,11 @@ internal static Exception QueryFailed(string collectionName, Exception e) // internal static Exception InvalidConnectionOptionValueLength(string key, int limit) { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidConnectionOptionValueLength, key, limit)); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidConnectionOptionValueLength, key, limit)); } internal static Exception MissingConnectionOptionValue(string key, string requiredAdditionalKey) { - return Argument(System.StringsHelper.GetString(Strings.ADP_MissingConnectionOptionValue, key, requiredAdditionalKey)); + return Argument(StringsHelper.GetString(Strings.ADP_MissingConnectionOptionValue, key, requiredAdditionalKey)); } @@ -233,12 +233,12 @@ internal static Exception MissingConnectionOptionValue(string key, string requir // internal static Exception PooledOpenTimeout() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.ADP_PooledOpenTimeout)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_PooledOpenTimeout)); } internal static Exception NonPooledOpenTimeout() { - return ADP.TimeoutException(System.StringsHelper.GetString(Strings.ADP_NonPooledOpenTimeout)); + return ADP.TimeoutException(StringsHelper.GetString(Strings.ADP_NonPooledOpenTimeout)); } // @@ -246,31 +246,31 @@ internal static Exception NonPooledOpenTimeout() // internal static InvalidOperationException TransactionConnectionMismatch() { - return Provider(System.StringsHelper.GetString(Strings.ADP_TransactionConnectionMismatch)); + return Provider(StringsHelper.GetString(Strings.ADP_TransactionConnectionMismatch)); } internal static InvalidOperationException TransactionRequired(string method) { - return Provider(System.StringsHelper.GetString(Strings.ADP_TransactionRequired, method)); + return Provider(StringsHelper.GetString(Strings.ADP_TransactionRequired, method)); } internal static Exception CommandTextRequired(string method) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_CommandTextRequired, method)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_CommandTextRequired, method)); } internal static Exception NoColumns() { - return Argument(System.StringsHelper.GetString(Strings.MDF_NoColumns)); + return Argument(StringsHelper.GetString(Strings.MDF_NoColumns)); } internal static InvalidOperationException ConnectionRequired(string method) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_ConnectionRequired, method)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_ConnectionRequired, method)); } internal static InvalidOperationException OpenConnectionRequired(string method, ConnectionState state) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_OpenConnectionRequired, method, ADP.ConnectionStateMsg(state))); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_OpenConnectionRequired, method, ADP.ConnectionStateMsg(state))); } internal static Exception OpenReaderExists(bool marsOn) @@ -280,7 +280,7 @@ internal static Exception OpenReaderExists(bool marsOn) internal static Exception OpenReaderExists(Exception e, bool marsOn) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_OpenReaderExists, marsOn ? ADP.Command : ADP.Connection), e); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_OpenReaderExists, marsOn ? ADP.Command : ADP.Connection), e); } @@ -289,22 +289,22 @@ internal static Exception OpenReaderExists(Exception e, bool marsOn) // internal static Exception NonSeqByteAccess(long badIndex, long currIndex, string method) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_NonSeqByteAccess, badIndex.ToString(CultureInfo.InvariantCulture), currIndex.ToString(CultureInfo.InvariantCulture), method)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_NonSeqByteAccess, badIndex.ToString(CultureInfo.InvariantCulture), currIndex.ToString(CultureInfo.InvariantCulture), method)); } internal static Exception InvalidXml() { - return Argument(System.StringsHelper.GetString(Strings.MDF_InvalidXml)); + return Argument(StringsHelper.GetString(Strings.MDF_InvalidXml)); } internal static Exception NegativeParameter(string parameterName) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_NegativeParameter, parameterName)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_NegativeParameter, parameterName)); } internal static Exception InvalidXmlMissingColumn(string collectionName, string columnName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_InvalidXmlMissingColumn, collectionName, columnName)); + return Argument(StringsHelper.GetString(Strings.MDF_InvalidXmlMissingColumn, collectionName, columnName)); } // @@ -312,22 +312,22 @@ internal static Exception InvalidXmlMissingColumn(string collectionName, string // internal static Exception InvalidMetaDataValue() { - return ADP.Argument(System.StringsHelper.GetString(Strings.ADP_InvalidMetaDataValue)); + return ADP.Argument(StringsHelper.GetString(Strings.ADP_InvalidMetaDataValue)); } internal static InvalidOperationException NonSequentialColumnAccess(int badCol, int currCol) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_NonSequentialColumnAccess, badCol.ToString(CultureInfo.InvariantCulture), currCol.ToString(CultureInfo.InvariantCulture))); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_NonSequentialColumnAccess, badCol.ToString(CultureInfo.InvariantCulture), currCol.ToString(CultureInfo.InvariantCulture))); } internal static Exception InvalidXmlInvalidValue(string collectionName, string columnName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_InvalidXmlInvalidValue, collectionName, columnName)); + return Argument(StringsHelper.GetString(Strings.MDF_InvalidXmlInvalidValue, collectionName, columnName)); } internal static Exception CollectionNameIsNotUnique(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_CollectionNameISNotUnique, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_CollectionNameISNotUnique, collectionName)); } @@ -336,60 +336,60 @@ internal static Exception CollectionNameIsNotUnique(string collectionName) // internal static Exception InvalidCommandTimeout(int value, [CallerMemberName] string property = "") { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidCommandTimeout, value.ToString(CultureInfo.InvariantCulture)), property); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidCommandTimeout, value.ToString(CultureInfo.InvariantCulture)), property); } internal static Exception UninitializedParameterSize(int index, Type dataType) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_UninitializedParameterSize, index.ToString(CultureInfo.InvariantCulture), dataType.Name)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_UninitializedParameterSize, index.ToString(CultureInfo.InvariantCulture), dataType.Name)); } internal static Exception UnableToBuildCollection(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_UnableToBuildCollection, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_UnableToBuildCollection, collectionName)); } internal static Exception PrepareParameterType(DbCommand cmd) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_PrepareParameterType, cmd.GetType().Name)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_PrepareParameterType, cmd.GetType().Name)); } internal static Exception UndefinedCollection(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_UndefinedCollection, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_UndefinedCollection, collectionName)); } internal static Exception UnsupportedVersion(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_UnsupportedVersion, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_UnsupportedVersion, collectionName)); } internal static Exception AmbiguousCollectionName(string collectionName) { - return Argument(System.StringsHelper.GetString(Strings.MDF_AmbiguousCollectionName, collectionName)); + return Argument(StringsHelper.GetString(Strings.MDF_AmbiguousCollectionName, collectionName)); } internal static Exception PrepareParameterSize(DbCommand cmd) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_PrepareParameterSize, cmd.GetType().Name)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_PrepareParameterSize, cmd.GetType().Name)); } internal static Exception PrepareParameterScale(DbCommand cmd, string type) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_PrepareParameterScale, cmd.GetType().Name, type)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_PrepareParameterScale, cmd.GetType().Name, type)); } internal static Exception MissingDataSourceInformationColumn() { - return Argument(System.StringsHelper.GetString(Strings.MDF_MissingDataSourceInformationColumn)); + return Argument(StringsHelper.GetString(Strings.MDF_MissingDataSourceInformationColumn)); } internal static Exception IncorrectNumberOfDataSourceInformationRows() { - return Argument(System.StringsHelper.GetString(Strings.MDF_IncorrectNumberOfDataSourceInformationRows)); + return Argument(StringsHelper.GetString(Strings.MDF_IncorrectNumberOfDataSourceInformationRows)); } internal static Exception MismatchedAsyncResult(string expectedMethod, string gotMethod) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_MismatchedAsyncResult, expectedMethod, gotMethod)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_MismatchedAsyncResult, expectedMethod, gotMethod)); } // @@ -397,27 +397,27 @@ internal static Exception MismatchedAsyncResult(string expectedMethod, string go // internal static Exception ClosedConnectionError() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_ClosedConnectionError)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_ClosedConnectionError)); } internal static Exception ConnectionAlreadyOpen(ConnectionState state) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_ConnectionAlreadyOpen, ADP.ConnectionStateMsg(state))); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_ConnectionAlreadyOpen, ADP.ConnectionStateMsg(state))); } internal static Exception TransactionPresent() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_TransactionPresent)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_TransactionPresent)); } internal static Exception LocalTransactionPresent() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_LocalTransactionPresent)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_LocalTransactionPresent)); } internal static Exception OpenConnectionPropertySet(string property, ConnectionState state) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_OpenConnectionPropertySet, property, ADP.ConnectionStateMsg(state))); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_OpenConnectionPropertySet, property, ADP.ConnectionStateMsg(state))); } internal static Exception EmptyDatabaseName() { - return Argument(System.StringsHelper.GetString(Strings.ADP_EmptyDatabaseName)); + return Argument(StringsHelper.GetString(Strings.ADP_EmptyDatabaseName)); } internal enum ConnectionError @@ -430,27 +430,27 @@ internal enum ConnectionError internal static Exception MissingRestrictionColumn() { - return Argument(System.StringsHelper.GetString(Strings.MDF_MissingRestrictionColumn)); + return Argument(StringsHelper.GetString(Strings.MDF_MissingRestrictionColumn)); } internal static Exception InternalConnectionError(ConnectionError internalError) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InternalConnectionError, (int)internalError)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_InternalConnectionError, (int)internalError)); } internal static Exception InvalidConnectRetryCountValue() { - return Argument(System.StringsHelper.GetString(Strings.SQLCR_InvalidConnectRetryCountValue)); + return Argument(StringsHelper.GetString(Strings.SQLCR_InvalidConnectRetryCountValue)); } internal static Exception MissingRestrictionRow() { - return Argument(System.StringsHelper.GetString(Strings.MDF_MissingRestrictionRow)); + return Argument(StringsHelper.GetString(Strings.MDF_MissingRestrictionRow)); } internal static Exception InvalidConnectRetryIntervalValue() { - return Argument(System.StringsHelper.GetString(Strings.SQLCR_InvalidConnectRetryIntervalValue)); + return Argument(StringsHelper.GetString(Strings.SQLCR_InvalidConnectRetryIntervalValue)); } // @@ -458,7 +458,7 @@ internal static Exception InvalidConnectRetryIntervalValue() // internal static InvalidOperationException AsyncOperationPending() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_PendingAsyncOperation)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_PendingAsyncOperation)); } // @@ -466,50 +466,50 @@ internal static InvalidOperationException AsyncOperationPending() // internal static IOException ErrorReadingFromStream(Exception internalException) { - return IO(System.StringsHelper.GetString(Strings.SqlMisc_StreamErrorMessage), internalException); + return IO(StringsHelper.GetString(Strings.SqlMisc_StreamErrorMessage), internalException); } internal static ArgumentException InvalidDataType(TypeCode typecode) { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidDataType, typecode.ToString())); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidDataType, typecode.ToString())); } internal static ArgumentException UnknownDataType(Type dataType) { - return Argument(System.StringsHelper.GetString(Strings.ADP_UnknownDataType, dataType.FullName)); + return Argument(StringsHelper.GetString(Strings.ADP_UnknownDataType, dataType.FullName)); } internal static ArgumentException DbTypeNotSupported(DbType type, Type enumtype) { - return Argument(System.StringsHelper.GetString(Strings.ADP_DbTypeNotSupported, type.ToString(), enumtype.Name)); + return Argument(StringsHelper.GetString(Strings.ADP_DbTypeNotSupported, type.ToString(), enumtype.Name)); } internal static ArgumentException UnknownDataTypeCode(Type dataType, TypeCode typeCode) { - return Argument(System.StringsHelper.GetString(Strings.ADP_UnknownDataTypeCode, ((int)typeCode).ToString(CultureInfo.InvariantCulture), dataType.FullName)); + return Argument(StringsHelper.GetString(Strings.ADP_UnknownDataTypeCode, ((int)typeCode).ToString(CultureInfo.InvariantCulture), dataType.FullName)); } internal static ArgumentException InvalidOffsetValue(int value) { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidOffsetValue, value.ToString(CultureInfo.InvariantCulture))); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidOffsetValue, value.ToString(CultureInfo.InvariantCulture))); } internal static ArgumentException InvalidSizeValue(int value) { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidSizeValue, value.ToString(CultureInfo.InvariantCulture))); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidSizeValue, value.ToString(CultureInfo.InvariantCulture))); } internal static ArgumentException ParameterValueOutOfRange(decimal value) { - return ADP.Argument(System.StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString((IFormatProvider)null))); + return ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString((IFormatProvider)null))); } internal static ArgumentException ParameterValueOutOfRange(SqlDecimal value) { - return ADP.Argument(System.StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString())); + return ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString())); } internal static ArgumentException ParameterValueOutOfRange(String value) { - return ADP.Argument(System.StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value)); + return ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value)); } internal static ArgumentException VersionDoesNotSupportDataType(string typeName) { - return Argument(System.StringsHelper.GetString(Strings.ADP_VersionDoesNotSupportDataType, typeName)); + return Argument(StringsHelper.GetString(Strings.ADP_VersionDoesNotSupportDataType, typeName)); } internal static Exception ParameterConversionFailed(object value, Type destType, Exception inner) { @@ -517,7 +517,7 @@ internal static Exception ParameterConversionFailed(object value, Type destType, Debug.Assert(null != inner, "null inner on conversion failure"); Exception e; - string message = System.StringsHelper.GetString(Strings.ADP_ParameterConversionFailed, value.GetType().Name, destType.Name); + string message = StringsHelper.GetString(Strings.ADP_ParameterConversionFailed, value.GetType().Name, destType.Name); if (inner is ArgumentException) { e = new ArgumentException(message, inner); @@ -572,11 +572,11 @@ internal static Exception InvalidParameterType(DbParameterCollection collection, // internal static Exception ParallelTransactionsNotSupported(DbConnection obj) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_ParallelTransactionsNotSupported, obj.GetType().Name)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_ParallelTransactionsNotSupported, obj.GetType().Name)); } internal static Exception TransactionZombied(DbTransaction obj) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_TransactionZombied, obj.GetType().Name)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_TransactionZombied, obj.GetType().Name)); } // global constant strings @@ -749,10 +749,10 @@ internal static Version GetAssemblyVersion() } - internal static readonly string[] AzureSqlServerEndpoints = {System.StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint), - System.StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint), - System.StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint), - System.StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint)}; + internal static readonly string[] AzureSqlServerEndpoints = {StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint), + StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint), + StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint), + StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint)}; // This method assumes dataSource parameter is in TCP connection string format. internal static bool IsAzureSqlServerEndpoint(string dataSource) @@ -812,21 +812,21 @@ internal static ArgumentOutOfRangeException InvalidDataRowVersion(DataRowVersion internal static ArgumentException SingleValuedProperty(string propertyName, string value) { - ArgumentException e = new ArgumentException(System.StringsHelper.GetString(Strings.ADP_SingleValuedProperty, propertyName, value)); + ArgumentException e = new ArgumentException(StringsHelper.GetString(Strings.ADP_SingleValuedProperty, propertyName, value)); TraceExceptionAsReturnValue(e); return e; } internal static ArgumentException DoubleValuedProperty(string propertyName, string value1, string value2) { - ArgumentException e = new ArgumentException(System.StringsHelper.GetString(Strings.ADP_DoubleValuedProperty, propertyName, value1, value2)); + ArgumentException e = new ArgumentException(StringsHelper.GetString(Strings.ADP_DoubleValuedProperty, propertyName, value1, value2)); TraceExceptionAsReturnValue(e); return e; } internal static ArgumentException InvalidPrefixSuffix() { - ArgumentException e = new ArgumentException(System.StringsHelper.GetString(Strings.ADP_InvalidPrefixSuffix)); + ArgumentException e = new ArgumentException(StringsHelper.GetString(Strings.ADP_InvalidPrefixSuffix)); TraceExceptionAsReturnValue(e); return e; } @@ -853,19 +853,19 @@ internal static ArgumentOutOfRangeException NotSupportedCommandBehavior(CommandB internal static ArgumentException BadParameterName(string parameterName) { - ArgumentException e = new ArgumentException(System.StringsHelper.GetString(Strings.ADP_BadParameterName, parameterName)); + ArgumentException e = new ArgumentException(StringsHelper.GetString(Strings.ADP_BadParameterName, parameterName)); TraceExceptionAsReturnValue(e); return e; } internal static Exception DeriveParametersNotSupported(IDbCommand value) { - return DataAdapter(System.StringsHelper.GetString(Strings.ADP_DeriveParametersNotSupported, value.GetType().Name, value.CommandType.ToString())); + return DataAdapter(StringsHelper.GetString(Strings.ADP_DeriveParametersNotSupported, value.GetType().Name, value.CommandType.ToString())); } internal static Exception NoStoredProcedureExists(string sproc) { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_NoStoredProcedureExists, sproc)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_NoStoredProcedureExists, sproc)); } // @@ -873,7 +873,7 @@ internal static Exception NoStoredProcedureExists(string sproc) // internal static InvalidOperationException TransactionCompletedButNotDisposed() { - return Provider(System.StringsHelper.GetString(Strings.ADP_TransactionCompletedButNotDisposed)); + return Provider(StringsHelper.GetString(Strings.ADP_TransactionCompletedButNotDisposed)); } internal static ArgumentOutOfRangeException InvalidUserDefinedTypeSerializationFormat(Microsoft.Data.SqlClient.Server.Format value) @@ -895,50 +895,50 @@ internal static ArgumentOutOfRangeException ArgumentOutOfRange(string message, s internal static ArgumentException InvalidArgumentLength(string argumentName, int limit) { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidArgumentLength, argumentName, limit)); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidArgumentLength, argumentName, limit)); } internal static ArgumentException MustBeReadOnly(string argumentName) { - return Argument(System.StringsHelper.GetString(Strings.ADP_MustBeReadOnly, argumentName)); + return Argument(StringsHelper.GetString(Strings.ADP_MustBeReadOnly, argumentName)); } internal static InvalidOperationException InvalidMixedUsageOfSecureAndClearCredential() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureAndClearCredential)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureAndClearCredential)); } internal static ArgumentException InvalidMixedArgumentOfSecureAndClearCredential() { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureAndClearCredential)); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureAndClearCredential)); } internal static InvalidOperationException InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity() { - return InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); + return InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); } internal static ArgumentException InvalidMixedArgumentOfSecureCredentialAndIntegratedSecurity() { - return Argument(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); + return Argument(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity)); } internal static InvalidOperationException InvalidMixedUsageOfAccessTokenAndIntegratedSecurity() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity)); } static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndUserIDPassword() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword)); } static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndAuthentication() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndAuthentication)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndAuthentication)); } static internal Exception InvalidMixedUsageOfCredentialAndAccessToken() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfCredentialAndAccessToken)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfCredentialAndAccessToken)); } } } diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs index a292fa5d56..522092b988 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs @@ -267,7 +267,7 @@ internal static class SQL // internal static Exception CannotGetDTCAddress() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_CannotGetDTCAddress)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CannotGetDTCAddress)); } internal static Exception InvalidInternalPacketSize(string str) @@ -276,135 +276,135 @@ internal static Exception InvalidInternalPacketSize(string str) } internal static Exception InvalidPacketSize() { - return ADP.ArgumentOutOfRange(System.StringsHelper.GetString(Strings.SQL_InvalidTDSPacketSize)); + return ADP.ArgumentOutOfRange(StringsHelper.GetString(Strings.SQL_InvalidTDSPacketSize)); } internal static Exception InvalidPacketSizeValue() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InvalidPacketSizeValue)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidPacketSizeValue)); } internal static Exception InvalidSSPIPacketSize() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InvalidSSPIPacketSize)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidSSPIPacketSize)); } internal static Exception AuthenticationAndIntegratedSecurity() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_AuthenticationAndIntegratedSecurity)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_AuthenticationAndIntegratedSecurity)); } internal static Exception IntegratedWithPassword() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_IntegratedWithPassword)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_IntegratedWithPassword)); } internal static Exception InteractiveWithPassword() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InteractiveWithPassword)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InteractiveWithPassword)); } internal static Exception DeviceFlowWithUsernamePassword() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_DeviceFlowWithUsernamePassword)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_DeviceFlowWithUsernamePassword)); } internal static Exception NonInteractiveWithPassword(string authenticationMode) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_NonInteractiveWithPassword, authenticationMode)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_NonInteractiveWithPassword, authenticationMode)); } static internal Exception SettingIntegratedWithCredential() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingIntegratedWithCredential)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingIntegratedWithCredential)); } static internal Exception SettingInteractiveWithCredential() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingInteractiveWithCredential)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingInteractiveWithCredential)); } static internal Exception SettingDeviceFlowWithCredential() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingDeviceFlowWithCredential)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingDeviceFlowWithCredential)); } static internal Exception SettingNonInteractiveWithCredential(string authenticationMode) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingNonInteractiveWithCredential, authenticationMode)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingNonInteractiveWithCredential, authenticationMode)); } static internal Exception SettingCredentialWithIntegratedArgument() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithIntegrated)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_SettingCredentialWithIntegrated)); } static internal Exception SettingCredentialWithInteractiveArgument() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithInteractive)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_SettingCredentialWithInteractive)); } static internal Exception SettingCredentialWithDeviceFlowArgument() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow)); } static internal Exception SettingCredentialWithNonInteractiveArgument(string authenticationMode) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithNonInteractive, authenticationMode)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_SettingCredentialWithNonInteractive, authenticationMode)); } static internal Exception SettingCredentialWithIntegratedInvalid() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithIntegrated)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingCredentialWithIntegrated)); } static internal Exception SettingCredentialWithInteractiveInvalid() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithInteractive)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingCredentialWithInteractive)); } static internal Exception SettingCredentialWithDeviceFlowInvalid() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow)); } static internal Exception SettingCredentialWithNonInteractiveInvalid(string authenticationMode) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithNonInteractive, authenticationMode)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SettingCredentialWithNonInteractive, authenticationMode)); } internal static Exception NullEmptyTransactionName() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_NullEmptyTransactionName)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_NullEmptyTransactionName)); } internal static Exception UserInstanceFailoverNotCompatible() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_UserInstanceFailoverNotCompatible)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_UserInstanceFailoverNotCompatible)); } internal static Exception CredentialsNotProvided(SqlAuthenticationMethod auth) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_CredentialsNotProvided, DbConnectionStringBuilderUtil.AuthenticationTypeToString(auth))); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CredentialsNotProvided, DbConnectionStringBuilderUtil.AuthenticationTypeToString(auth))); } internal static Exception ParsingErrorLibraryType(ParsingErrorState state, int libraryType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorAuthLibraryType, ((int)state).ToString(CultureInfo.InvariantCulture), libraryType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorAuthLibraryType, ((int)state).ToString(CultureInfo.InvariantCulture), libraryType)); } internal static Exception InvalidSQLServerVersionUnknown() { - return ADP.DataAdapter(System.StringsHelper.GetString(Strings.SQL_InvalidSQLServerVersionUnknown)); + return ADP.DataAdapter(StringsHelper.GetString(Strings.SQL_InvalidSQLServerVersionUnknown)); } internal static Exception SynchronousCallMayNotPend() { - return new Exception(System.StringsHelper.GetString(Strings.Sql_InternalError)); + return new Exception(StringsHelper.GetString(Strings.Sql_InternalError)); } internal static Exception ConnectionLockedForBcpEvent() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ConnectionLockedForBcpEvent)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ConnectionLockedForBcpEvent)); } internal static Exception InstanceFailure() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_InstanceFailure)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_InstanceFailure)); } internal static Exception ChangePasswordArgumentMissing(string argumentName) { - return ADP.ArgumentNull(System.StringsHelper.GetString(Strings.SQL_ChangePasswordArgumentMissing, argumentName)); + return ADP.ArgumentNull(StringsHelper.GetString(Strings.SQL_ChangePasswordArgumentMissing, argumentName)); } internal static Exception ChangePasswordConflictsWithSSPI() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_ChangePasswordConflictsWithSSPI)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_ChangePasswordConflictsWithSSPI)); } internal static Exception ChangePasswordRequiresYukon() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ChangePasswordRequiresYukon)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ChangePasswordRequiresYukon)); } internal static Exception ChangePasswordUseOfUnallowedKey(string key) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ChangePasswordUseOfUnallowedKey, key)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ChangePasswordUseOfUnallowedKey, key)); } internal static Exception GlobalizationInvariantModeNotSupported() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_GlobalizationInvariantModeNotSupported)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_GlobalizationInvariantModeNotSupported)); } // @@ -412,92 +412,92 @@ internal static Exception GlobalizationInvariantModeNotSupported() // internal static Exception GlobalTransactionsNotEnabled() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.GT_Disabled)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.GT_Disabled)); } internal static Exception UnknownSysTxIsolationLevel(System.Transactions.IsolationLevel isolationLevel) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_UnknownSysTxIsolationLevel, isolationLevel.ToString())); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_UnknownSysTxIsolationLevel, isolationLevel.ToString())); } internal static Exception InvalidPartnerConfiguration(string server, string database) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_InvalidPartnerConfiguration, server, database)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_InvalidPartnerConfiguration, server, database)); } internal static Exception BatchedUpdateColumnEncryptionSettingMismatch() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_BatchedUpdateColumnEncryptionSettingMismatch, "SqlCommandColumnEncryptionSetting", "SelectCommand", "InsertCommand", "UpdateCommand", "DeleteCommand")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_BatchedUpdateColumnEncryptionSettingMismatch, "SqlCommandColumnEncryptionSetting", "SelectCommand", "InsertCommand", "UpdateCommand", "DeleteCommand")); } internal static Exception MARSUnsupportedOnConnection() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_MarsUnsupportedOnConnection)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_MarsUnsupportedOnConnection)); } internal static Exception CannotModifyPropertyAsyncOperationInProgress([CallerMemberName] string property = "") { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_CannotModifyPropertyAsyncOperationInProgress, property)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CannotModifyPropertyAsyncOperationInProgress, property)); } internal static Exception NonLocalSSEInstance() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_NonLocalSSEInstance)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_NonLocalSSEInstance)); } // SQL.ActiveDirectoryAuth // internal static Exception UnsupportedAuthentication(string authentication) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_UnsupportedAuthentication, authentication)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedAuthentication, authentication)); } internal static Exception UnsupportedSqlAuthenticationMethod(SqlAuthenticationMethod authentication) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_UnsupportedSqlAuthenticationMethod, authentication)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedSqlAuthenticationMethod, authentication)); } internal static Exception UnsupportedAuthenticationSpecified(SqlAuthenticationMethod authentication) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_UnsupportedAuthenticationSpecified, authentication)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_UnsupportedAuthenticationSpecified, authentication)); } internal static Exception CannotCreateAuthProvider(string authentication, string type, Exception e) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_CannotCreateAuthProvider, authentication, type), e); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_CannotCreateAuthProvider, authentication, type), e); } internal static Exception CannotCreateSqlAuthInitializer(string type, Exception e) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_CannotCreateAuthInitializer, type), e); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_CannotCreateAuthInitializer, type), e); } internal static Exception CannotInitializeAuthProvider(string type, Exception e) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_CannotInitializeAuthProvider, type), e); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CannotInitializeAuthProvider, type), e); } internal static Exception UnsupportedAuthenticationByProvider(string authentication, string type) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_UnsupportedAuthenticationByProvider, type, authentication)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedAuthenticationByProvider, type, authentication)); } internal static Exception CannotFindAuthProvider(string authentication) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_CannotFindAuthProvider, authentication)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_CannotFindAuthProvider, authentication)); } internal static Exception CannotGetAuthProviderConfig(Exception e) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_CannotGetAuthProviderConfig), e); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CannotGetAuthProviderConfig), e); } internal static Exception ParameterCannotBeEmpty(string paramName) { - return ADP.ArgumentNull(System.StringsHelper.GetString(Strings.SQL_ParameterCannotBeEmpty, paramName)); + return ADP.ArgumentNull(StringsHelper.GetString(Strings.SQL_ParameterCannotBeEmpty, paramName)); } internal static Exception ParameterDirectionInvalidForOptimizedBinding(string paramName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParameterDirectionInvalidForOptimizedBinding, paramName)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParameterDirectionInvalidForOptimizedBinding, paramName)); } internal static Exception ActiveDirectoryInteractiveTimeout() @@ -517,7 +517,7 @@ internal static Exception ActiveDirectoryDeviceFlowTimeout() internal static ArgumentOutOfRangeException NotSupportedEnumerationValue(Type type, int value) { - return ADP.ArgumentOutOfRange(System.StringsHelper.GetString(Strings.SQL_NotSupportedEnumerationValue, type.Name, value.ToString(System.Globalization.CultureInfo.InvariantCulture)), type.Name); + return ADP.ArgumentOutOfRange(StringsHelper.GetString(Strings.SQL_NotSupportedEnumerationValue, type.Name, value.ToString(System.Globalization.CultureInfo.InvariantCulture)), type.Name); } internal static ArgumentOutOfRangeException NotSupportedCommandType(CommandType value) @@ -563,23 +563,23 @@ internal static ArgumentOutOfRangeException NotSupportedIsolationLevel(System.Da internal static Exception OperationCancelled() { - Exception exception = ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_OperationCancelled)); + Exception exception = ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_OperationCancelled)); return exception; } internal static Exception PendingBeginXXXExists() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_PendingBeginXXXExists)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_PendingBeginXXXExists)); } internal static ArgumentOutOfRangeException InvalidSqlDependencyTimeout(string param) { - return ADP.ArgumentOutOfRange(System.StringsHelper.GetString(Strings.SqlDependency_InvalidTimeout), param); + return ADP.ArgumentOutOfRange(StringsHelper.GetString(Strings.SqlDependency_InvalidTimeout), param); } internal static Exception NonXmlResult() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_NonXmlResult)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_NonXmlResult)); } // @@ -587,27 +587,27 @@ internal static Exception NonXmlResult() // internal static Exception InvalidUdt3PartNameFormat() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InvalidUdt3PartNameFormat)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidUdt3PartNameFormat)); } internal static Exception InvalidParameterTypeNameFormat() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InvalidParameterTypeNameFormat)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidParameterTypeNameFormat)); } internal static Exception InvalidParameterNameLength(string value) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_InvalidParameterNameLength, value)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidParameterNameLength, value)); } internal static Exception PrecisionValueOutOfRange(byte precision) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_PrecisionValueOutOfRange, precision.ToString(CultureInfo.InvariantCulture))); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_PrecisionValueOutOfRange, precision.ToString(CultureInfo.InvariantCulture))); } internal static Exception ScaleValueOutOfRange(byte scale) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_ScaleValueOutOfRange, scale.ToString(CultureInfo.InvariantCulture))); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_ScaleValueOutOfRange, scale.ToString(CultureInfo.InvariantCulture))); } internal static Exception TimeScaleValueOutOfRange(byte scale) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_TimeScaleValueOutOfRange, scale.ToString(CultureInfo.InvariantCulture))); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_TimeScaleValueOutOfRange, scale.ToString(CultureInfo.InvariantCulture))); } internal static Exception InvalidSqlDbType(SqlDbType value) { @@ -615,41 +615,41 @@ internal static Exception InvalidSqlDbType(SqlDbType value) } internal static Exception UnsupportedTVPOutputParameter(ParameterDirection direction, string paramName) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SqlParameter_UnsupportedTVPOutputParameter, + return ADP.NotSupported(StringsHelper.GetString(Strings.SqlParameter_UnsupportedTVPOutputParameter, direction.ToString(), paramName)); } internal static Exception DBNullNotSupportedForTVPValues(string paramName) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SqlParameter_DBNullNotSupportedForTVP, paramName)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SqlParameter_DBNullNotSupportedForTVP, paramName)); } internal static Exception UnexpectedTypeNameForNonStructParams(string paramName) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SqlParameter_UnexpectedTypeNameForNonStruct, paramName)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SqlParameter_UnexpectedTypeNameForNonStruct, paramName)); } internal static Exception ParameterInvalidVariant(string paramName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParameterInvalidVariant, paramName)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParameterInvalidVariant, paramName)); } internal static Exception MustSetTypeNameForParam(string paramType, string paramName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_ParameterTypeNameRequired, paramType, paramName)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_ParameterTypeNameRequired, paramType, paramName)); } internal static Exception NullSchemaTableDataTypeNotSupported(string columnName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.NullSchemaTableDataTypeNotSupported, columnName)); + return ADP.Argument(StringsHelper.GetString(Strings.NullSchemaTableDataTypeNotSupported, columnName)); } internal static Exception InvalidSchemaTableOrdinals() { - return ADP.Argument(System.StringsHelper.GetString(Strings.InvalidSchemaTableOrdinals)); + return ADP.Argument(StringsHelper.GetString(Strings.InvalidSchemaTableOrdinals)); } internal static Exception EnumeratedRecordMetaDataChanged(string fieldName, int recordNumber) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_EnumeratedRecordMetaDataChanged, fieldName, recordNumber)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_EnumeratedRecordMetaDataChanged, fieldName, recordNumber)); } internal static Exception EnumeratedRecordFieldCountChanged(int recordNumber) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_EnumeratedRecordFieldCountChanged, recordNumber)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_EnumeratedRecordFieldCountChanged, recordNumber)); } // @@ -661,59 +661,59 @@ internal static Exception EnumeratedRecordFieldCountChanged(int recordNumber) // internal static Exception InvalidTDSVersion() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_InvalidTDSVersion)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_InvalidTDSVersion)); } internal static Exception ParsingError() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingError)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingError)); } internal static Exception ParsingError(ParsingErrorState state) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorWithState, ((int)state).ToString(CultureInfo.InvariantCulture))); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorWithState, ((int)state).ToString(CultureInfo.InvariantCulture))); } internal static Exception ParsingError(ParsingErrorState state, Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorWithState, ((int)state).ToString(CultureInfo.InvariantCulture)), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorWithState, ((int)state).ToString(CultureInfo.InvariantCulture)), innerException); } internal static Exception ParsingErrorValue(ParsingErrorState state, int value) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorValue, ((int)state).ToString(CultureInfo.InvariantCulture), value)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorValue, ((int)state).ToString(CultureInfo.InvariantCulture), value)); } internal static Exception ParsingErrorFeatureId(ParsingErrorState state, int featureId) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorFeatureId, ((int)state).ToString(CultureInfo.InvariantCulture), featureId)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorFeatureId, ((int)state).ToString(CultureInfo.InvariantCulture), featureId)); } internal static Exception ParsingErrorToken(ParsingErrorState state, int token) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorToken, ((int)state).ToString(CultureInfo.InvariantCulture), token)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorToken, ((int)state).ToString(CultureInfo.InvariantCulture), token)); } internal static Exception ParsingErrorLength(ParsingErrorState state, int length) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorLength, ((int)state).ToString(CultureInfo.InvariantCulture), length)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorLength, ((int)state).ToString(CultureInfo.InvariantCulture), length)); } internal static Exception ParsingErrorStatus(ParsingErrorState state, int status) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorStatus, ((int)state).ToString(CultureInfo.InvariantCulture), status)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorStatus, ((int)state).ToString(CultureInfo.InvariantCulture), status)); } internal static Exception ParsingErrorOffset(ParsingErrorState state, int offset) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ParsingErrorOffset, ((int)state).ToString(CultureInfo.InvariantCulture), offset)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorOffset, ((int)state).ToString(CultureInfo.InvariantCulture), offset)); } internal static Exception MoneyOverflow(string moneyValue) { - return ADP.Overflow(System.StringsHelper.GetString(Strings.SQL_MoneyOverflow, moneyValue)); + return ADP.Overflow(StringsHelper.GetString(Strings.SQL_MoneyOverflow, moneyValue)); } internal static Exception SmallDateTimeOverflow(string datetime) { - return ADP.Overflow(System.StringsHelper.GetString(Strings.SQL_SmallDateTimeOverflow, datetime)); + return ADP.Overflow(StringsHelper.GetString(Strings.SQL_SmallDateTimeOverflow, datetime)); } internal static Exception SNIPacketAllocationFailure() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SNIPacketAllocationFailure)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_SNIPacketAllocationFailure)); } internal static Exception TimeOverflow(string time) { - return ADP.Overflow(System.StringsHelper.GetString(Strings.SQL_TimeOverflow, time)); + return ADP.Overflow(StringsHelper.GetString(Strings.SQL_TimeOverflow, time)); } // @@ -721,47 +721,47 @@ internal static Exception TimeOverflow(string time) // internal static Exception InvalidRead() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_InvalidRead)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_InvalidRead)); } internal static Exception NonBlobColumn(string columnName) { - return ADP.InvalidCast(System.StringsHelper.GetString(Strings.SQL_NonBlobColumn, columnName)); + return ADP.InvalidCast(StringsHelper.GetString(Strings.SQL_NonBlobColumn, columnName)); } internal static Exception NonCharColumn(string columnName) { - return ADP.InvalidCast(System.StringsHelper.GetString(Strings.SQL_NonCharColumn, columnName)); + return ADP.InvalidCast(StringsHelper.GetString(Strings.SQL_NonCharColumn, columnName)); } internal static Exception StreamNotSupportOnColumnType(string columnName) { - return ADP.InvalidCast(System.StringsHelper.GetString(Strings.SQL_StreamNotSupportOnColumnType, columnName)); + return ADP.InvalidCast(StringsHelper.GetString(Strings.SQL_StreamNotSupportOnColumnType, columnName)); } internal static Exception StreamNotSupportOnEncryptedColumn(string columnName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_StreamNotSupportOnEncryptedColumn, columnName, "Stream")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_StreamNotSupportOnEncryptedColumn, columnName, "Stream")); } internal static Exception SequentialAccessNotSupportedOnEncryptedColumn(string columnName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_SequentialAccessNotSupportedOnEncryptedColumn, columnName, "CommandBehavior=SequentialAccess")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_SequentialAccessNotSupportedOnEncryptedColumn, columnName, "CommandBehavior=SequentialAccess")); } internal static Exception TextReaderNotSupportOnColumnType(string columnName) { - return ADP.InvalidCast(System.StringsHelper.GetString(Strings.SQL_TextReaderNotSupportOnColumnType, columnName)); + return ADP.InvalidCast(StringsHelper.GetString(Strings.SQL_TextReaderNotSupportOnColumnType, columnName)); } internal static Exception XmlReaderNotSupportOnColumnType(string columnName) { - return ADP.InvalidCast(System.StringsHelper.GetString(Strings.SQL_XmlReaderNotSupportOnColumnType, columnName)); + return ADP.InvalidCast(StringsHelper.GetString(Strings.SQL_XmlReaderNotSupportOnColumnType, columnName)); } internal static Exception UDTUnexpectedResult(string exceptionText) { - return ADP.TypeLoad(System.StringsHelper.GetString(Strings.SQLUDT_Unexpected, exceptionText)); + return ADP.TypeLoad(StringsHelper.GetString(Strings.SQLUDT_Unexpected, exceptionText)); } internal static Exception DateTimeOverflow() @@ -774,42 +774,42 @@ internal static Exception DateTimeOverflow() // internal static Exception SqlCommandHasExistingSqlNotificationRequest() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQLNotify_AlreadyHasCommand)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQLNotify_AlreadyHasCommand)); } internal static Exception SqlDepDefaultOptionsButNoStart() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_DefaultOptionsButNoStart)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_DefaultOptionsButNoStart)); } internal static Exception SqlDependencyDatabaseBrokerDisabled() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_DatabaseBrokerDisabled)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_DatabaseBrokerDisabled)); } internal static Exception SqlDependencyEventNoDuplicate() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_EventNoDuplicate)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_EventNoDuplicate)); } internal static Exception SqlDependencyDuplicateStart() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_DuplicateStart)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_DuplicateStart)); } internal static Exception SqlDependencyIdMismatch() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_IdMismatch)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_IdMismatch)); } internal static Exception SqlDependencyNoMatchingServerStart() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_NoMatchingServerStart)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_NoMatchingServerStart)); } internal static Exception SqlDependencyNoMatchingServerDatabaseStart() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlDependency_NoMatchingServerDatabaseStart)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlDependency_NoMatchingServerDatabaseStart)); } // @@ -824,7 +824,7 @@ static internal Exception CannotCompleteDelegatedTransactionWithOpenResults(SqlI internal static TransactionPromotionException PromotionFailed(Exception inner) { - TransactionPromotionException e = new TransactionPromotionException(System.StringsHelper.GetString(Strings.SqlDelegatedTransaction_PromotionFailed), inner); + TransactionPromotionException e = new TransactionPromotionException(StringsHelper.GetString(Strings.SqlDelegatedTransaction_PromotionFailed), inner); ADP.TraceExceptionAsReturnValue(e); return e; } @@ -835,30 +835,30 @@ internal static TransactionPromotionException PromotionFailed(Exception inner) // internal static Exception UnexpectedUdtTypeNameForNonUdtParams() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQLUDT_UnexpectedUdtTypeName)); + return ADP.Argument(StringsHelper.GetString(Strings.SQLUDT_UnexpectedUdtTypeName)); } internal static Exception MustSetUdtTypeNameForUdtParams() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQLUDT_InvalidUdtTypeName)); + return ADP.Argument(StringsHelper.GetString(Strings.SQLUDT_InvalidUdtTypeName)); } internal static Exception UDTInvalidSqlType(string typeName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQLUDT_InvalidSqlType, typeName)); + return ADP.Argument(StringsHelper.GetString(Strings.SQLUDT_InvalidSqlType, typeName)); } internal static Exception UDTInvalidSize(int maxSize, int maxSupportedSize) { - throw ADP.ArgumentOutOfRange(System.StringsHelper.GetString(Strings.SQLUDT_InvalidSize, maxSize, maxSupportedSize)); + throw ADP.ArgumentOutOfRange(StringsHelper.GetString(Strings.SQLUDT_InvalidSize, maxSize, maxSupportedSize)); } internal static Exception InvalidSqlDbTypeForConstructor(SqlDbType type) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlMetaData_InvalidSqlDbTypeForConstructorFormat, type.ToString())); + return ADP.Argument(StringsHelper.GetString(Strings.SqlMetaData_InvalidSqlDbTypeForConstructorFormat, type.ToString())); } internal static Exception NameTooLong(string parameterName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlMetaData_NameTooLong), parameterName); + return ADP.Argument(StringsHelper.GetString(Strings.SqlMetaData_NameTooLong), parameterName); } internal static Exception InvalidSortOrder(SortOrder order) @@ -868,40 +868,40 @@ internal static Exception InvalidSortOrder(SortOrder order) internal static Exception MustSpecifyBothSortOrderAndOrdinal(SortOrder order, int ordinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlMetaData_SpecifyBothSortOrderAndOrdinal, order.ToString(), ordinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlMetaData_SpecifyBothSortOrderAndOrdinal, order.ToString(), ordinal)); } internal static Exception UnsupportedColumnTypeForSqlProvider(string columnName, string typeName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlProvider_InvalidDataColumnType, columnName, typeName)); + return ADP.Argument(StringsHelper.GetString(Strings.SqlProvider_InvalidDataColumnType, columnName, typeName)); } internal static Exception InvalidColumnMaxLength(string columnName, long maxLength) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlProvider_InvalidDataColumnMaxLength, columnName, maxLength)); + return ADP.Argument(StringsHelper.GetString(Strings.SqlProvider_InvalidDataColumnMaxLength, columnName, maxLength)); } internal static Exception InvalidColumnPrecScale() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlMisc_InvalidPrecScaleMessage)); + return ADP.Argument(StringsHelper.GetString(Strings.SqlMisc_InvalidPrecScaleMessage)); } internal static Exception NotEnoughColumnsInStructuredType() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SqlProvider_NotEnoughColumnsInStructuredType)); + return ADP.Argument(StringsHelper.GetString(Strings.SqlProvider_NotEnoughColumnsInStructuredType)); } internal static Exception DuplicateSortOrdinal(int sortOrdinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlProvider_DuplicateSortOrdinal, sortOrdinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlProvider_DuplicateSortOrdinal, sortOrdinal)); } internal static Exception MissingSortOrdinal(int sortOrdinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlProvider_MissingSortOrdinal, sortOrdinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlProvider_MissingSortOrdinal, sortOrdinal)); } internal static Exception SortOrdinalGreaterThanFieldCount(int columnOrdinal, int sortOrdinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlProvider_SortOrdinalGreaterThanFieldCount, sortOrdinal, columnOrdinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlProvider_SortOrdinalGreaterThanFieldCount, sortOrdinal, columnOrdinal)); } internal static Exception IEnumerableOfSqlDataRecordHasNoRows() { - return ADP.Argument(System.StringsHelper.GetString(Strings.IEnumerableOfSqlDataRecordHasNoRows)); + return ADP.Argument(StringsHelper.GetString(Strings.IEnumerableOfSqlDataRecordHasNoRows)); } @@ -912,11 +912,11 @@ internal static Exception IEnumerableOfSqlDataRecordHasNoRows() // internal static Exception BulkLoadMappingInaccessible() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadMappingInaccessible)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadMappingInaccessible)); } internal static Exception BulkLoadMappingsNamesOrOrdinalsOnly() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadMappingsNamesOrOrdinalsOnly)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadMappingsNamesOrOrdinalsOnly)); } internal static Exception BulkLoadCannotConvertValue(Type sourcetype, MetaType metatype, int ordinal, int rowNumber, bool isEncrypted, string columnName, string value, Exception e) { @@ -927,16 +927,16 @@ internal static Exception BulkLoadCannotConvertValue(Type sourcetype, MetaType m } if (rowNumber == -1) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadCannotConvertValueWithoutRowNo, quotedValue, sourcetype.Name, metatype.TypeName, ordinal, columnName), e); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadCannotConvertValueWithoutRowNo, quotedValue, sourcetype.Name, metatype.TypeName, ordinal, columnName), e); } else { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadCannotConvertValue, quotedValue, sourcetype.Name, metatype.TypeName, ordinal, columnName, rowNumber), e); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadCannotConvertValue, quotedValue, sourcetype.Name, metatype.TypeName, ordinal, columnName, rowNumber), e); } } internal static Exception BulkLoadNonMatchingColumnMapping() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadNonMatchingColumnMapping)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadNonMatchingColumnMapping)); } internal static Exception BulkLoadNonMatchingColumnName(string columnName) { @@ -944,79 +944,79 @@ internal static Exception BulkLoadNonMatchingColumnName(string columnName) } internal static Exception BulkLoadNonMatchingColumnName(string columnName, Exception e) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadNonMatchingColumnName, columnName), e); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadNonMatchingColumnName, columnName), e); } internal static Exception BulkLoadNullEmptyColumnName(string paramName) { - return ADP.Argument(string.Format(System.StringsHelper.GetString(Strings.SQL_ParameterCannotBeEmpty), paramName)); + return ADP.Argument(string.Format(StringsHelper.GetString(Strings.SQL_ParameterCannotBeEmpty), paramName)); } internal static Exception BulkLoadUnspecifiedSortOrder() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_BulkLoadUnspecifiedSortOrder)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadUnspecifiedSortOrder)); } internal static Exception BulkLoadInvalidOrderHint() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOrderHint)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOrderHint)); } internal static Exception BulkLoadOrderHintInvalidColumn(string columnName) { - return ADP.InvalidOperation(string.Format(System.StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInvalidColumn), columnName)); + return ADP.InvalidOperation(string.Format(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintInvalidColumn), columnName)); } internal static Exception BulkLoadOrderHintDuplicateColumn(string columnName) { - return ADP.InvalidOperation(string.Format(System.StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintDuplicateColumn), columnName)); + return ADP.InvalidOperation(string.Format(StringsHelper.GetString(Strings.SQL_BulkLoadOrderHintDuplicateColumn), columnName)); } internal static Exception BulkLoadStringTooLong(string tableName, string columnName, string truncatedValue) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadStringTooLong, tableName, columnName, truncatedValue)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadStringTooLong, tableName, columnName, truncatedValue)); } internal static Exception BulkLoadInvalidVariantValue() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadInvalidVariantValue)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidVariantValue)); } internal static Exception BulkLoadInvalidTimeout(int timeout) { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_BulkLoadInvalidTimeout, timeout.ToString(CultureInfo.InvariantCulture))); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidTimeout, timeout.ToString(CultureInfo.InvariantCulture))); } internal static Exception BulkLoadExistingTransaction() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadExistingTransaction)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadExistingTransaction)); } internal static Exception BulkLoadNoCollation() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadNoCollation)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadNoCollation)); } internal static Exception BulkLoadConflictingTransactionOption() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_BulkLoadConflictingTransactionOption)); + return ADP.Argument(StringsHelper.GetString(Strings.SQL_BulkLoadConflictingTransactionOption)); } internal static Exception BulkLoadLcidMismatch(int sourceLcid, string sourceColumnName, int destinationLcid, string destinationColumnName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.Sql_BulkLoadLcidMismatch, sourceLcid, sourceColumnName, destinationLcid, destinationColumnName)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.Sql_BulkLoadLcidMismatch, sourceLcid, sourceColumnName, destinationLcid, destinationColumnName)); } internal static Exception InvalidOperationInsideEvent() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOperationInsideEvent)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidOperationInsideEvent)); } internal static Exception BulkLoadMissingDestinationTable() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadMissingDestinationTable)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadMissingDestinationTable)); } internal static Exception BulkLoadInvalidDestinationTable(string tableName, Exception inner) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadInvalidDestinationTable, tableName), inner); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadInvalidDestinationTable, tableName), inner); } internal static Exception BulkLoadBulkLoadNotAllowDBNull(string columnName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadNotAllowDBNull, columnName)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadNotAllowDBNull, columnName)); } internal static Exception BulkLoadPendingOperation() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BulkLoadPendingOperation)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BulkLoadPendingOperation)); } internal static Exception InvalidTableDerivedPrecisionForTvp(string columnName, byte precision) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlParameter_InvalidTableDerivedPrecisionForTvp, precision, columnName, System.Data.SqlTypes.SqlDecimal.MaxPrecision)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlParameter_InvalidTableDerivedPrecisionForTvp, precision, columnName, System.Data.SqlTypes.SqlDecimal.MaxPrecision)); } // @@ -1024,17 +1024,17 @@ internal static Exception InvalidTableDerivedPrecisionForTvp(string columnName, // internal static Exception ConnectionDoomed() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_ConnectionDoomed)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ConnectionDoomed)); } internal static Exception OpenResultCountExceeded() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_OpenResultCountExceeded)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_OpenResultCountExceeded)); } internal static Exception UnsupportedSysTxForGlobalTransactions() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_UnsupportedSysTxVersion)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_UnsupportedSysTxVersion)); } internal static readonly byte[] AttentionHeader = new byte[] { @@ -1059,7 +1059,7 @@ internal static Exception UnsupportedSysTxForGlobalTransactions() /// internal static Exception MultiSubnetFailoverWithFailoverPartner(bool serverProvidedFailoverPartner, SqlInternalConnectionTds internalConnection) { - string msg = System.StringsHelper.GetString(Strings.SQLMSF_FailoverPartnerNotSupported); + string msg = StringsHelper.GetString(Strings.SQLMSF_FailoverPartnerNotSupported); if (serverProvidedFailoverPartner) { // Replacing InvalidOperation with SQL exception @@ -1099,13 +1099,13 @@ internal static Exception MultiSubnetFailoverWithNonTcpProtocol() internal static Exception ROR_FailoverNotSupportedConnString() { - return ADP.Argument(System.StringsHelper.GetString(Strings.SQLROR_FailoverNotSupported)); + return ADP.Argument(StringsHelper.GetString(Strings.SQLROR_FailoverNotSupported)); } internal static Exception ROR_FailoverNotSupportedServer(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (System.StringsHelper.GetString(Strings.SQLROR_FailoverNotSupported)), "", 0)); + errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (StringsHelper.GetString(Strings.SQLROR_FailoverNotSupported)), "", 0)); SqlException exc = SqlException.CreateException(errors, null, internalConnection); exc._doNotReconnect = true; return exc; @@ -1114,7 +1114,7 @@ internal static Exception ROR_FailoverNotSupportedServer(SqlInternalConnectionTd internal static Exception ROR_RecursiveRoutingNotSupported(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (System.StringsHelper.GetString(Strings.SQLROR_RecursiveRoutingNotSupported)), "", 0)); + errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (StringsHelper.GetString(Strings.SQLROR_RecursiveRoutingNotSupported)), "", 0)); SqlException exc = SqlException.CreateException(errors, null, internalConnection); exc._doNotReconnect = true; return exc; @@ -1123,7 +1123,7 @@ internal static Exception ROR_RecursiveRoutingNotSupported(SqlInternalConnection internal static Exception ROR_UnexpectedRoutingInfo(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (System.StringsHelper.GetString(Strings.SQLROR_UnexpectedRoutingInfo)), "", 0)); + errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (StringsHelper.GetString(Strings.SQLROR_UnexpectedRoutingInfo)), "", 0)); SqlException exc = SqlException.CreateException(errors, null, internalConnection); exc._doNotReconnect = true; return exc; @@ -1132,7 +1132,7 @@ internal static Exception ROR_UnexpectedRoutingInfo(SqlInternalConnectionTds int internal static Exception ROR_InvalidRoutingInfo(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (System.StringsHelper.GetString(Strings.SQLROR_InvalidRoutingInfo)), "", 0)); + errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (StringsHelper.GetString(Strings.SQLROR_InvalidRoutingInfo)), "", 0)); SqlException exc = SqlException.CreateException(errors, null, internalConnection); exc._doNotReconnect = true; return exc; @@ -1141,7 +1141,7 @@ internal static Exception ROR_InvalidRoutingInfo(SqlInternalConnectionTds intern internal static Exception ROR_TimeoutAfterRoutingInfo(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (System.StringsHelper.GetString(Strings.SQLROR_TimeoutAfterRoutingInfo)), "", 0)); + errors.Add(new SqlError(0, (byte)0x00, TdsEnums.FATAL_ERROR_CLASS, null, (StringsHelper.GetString(Strings.SQLROR_TimeoutAfterRoutingInfo)), "", 0)); SqlException exc = SqlException.CreateException(errors, null, internalConnection); exc._doNotReconnect = true; return exc; @@ -1169,7 +1169,7 @@ internal static SqlException CR_ReconnectionCancelled() internal static Exception CR_NextAttemptWillExceedQueryTimeout(SqlException innerException, Guid connectionId) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.MIN_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_NextAttemptWillExceedQueryTimeout), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.MIN_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_NextAttemptWillExceedQueryTimeout), "", 0)); SqlException exc = SqlException.CreateException(errors, "", connectionId, innerException); return exc; } @@ -1177,7 +1177,7 @@ internal static Exception CR_NextAttemptWillExceedQueryTimeout(SqlException inne internal static Exception CR_EncryptionChanged(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_EncryptionChanged), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_EncryptionChanged), "", 0)); SqlException exc = SqlException.CreateException(errors, "", internalConnection); return exc; } @@ -1185,7 +1185,7 @@ internal static Exception CR_EncryptionChanged(SqlInternalConnectionTds internal internal static SqlException CR_AllAttemptsFailed(SqlException innerException, Guid connectionId) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.MIN_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_AllAttemptsFailed), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.MIN_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_AllAttemptsFailed), "", 0)); SqlException exc = SqlException.CreateException(errors, "", connectionId, innerException); return exc; } @@ -1193,7 +1193,7 @@ internal static SqlException CR_AllAttemptsFailed(SqlException innerException, G internal static SqlException CR_NoCRAckAtReconnection(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_NoCRAckAtReconnection), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_NoCRAckAtReconnection), "", 0)); SqlException exc = SqlException.CreateException(errors, "", internalConnection); return exc; } @@ -1201,7 +1201,7 @@ internal static SqlException CR_NoCRAckAtReconnection(SqlInternalConnectionTds i internal static SqlException CR_TDSVersionNotPreserved(SqlInternalConnectionTds internalConnection) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_TDSVestionNotPreserved), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_TDSVestionNotPreserved), "", 0)); SqlException exc = SqlException.CreateException(errors, "", internalConnection); return exc; } @@ -1209,7 +1209,7 @@ internal static SqlException CR_TDSVersionNotPreserved(SqlInternalConnectionTds internal static SqlException CR_UnrecoverableServer(Guid connectionId) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_UnrecoverableServer), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_UnrecoverableServer), "", 0)); SqlException exc = SqlException.CreateException(errors, "", connectionId); return exc; } @@ -1217,22 +1217,22 @@ internal static SqlException CR_UnrecoverableServer(Guid connectionId) internal static SqlException CR_UnrecoverableClient(Guid connectionId) { SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQLCR_UnrecoverableClient), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQLCR_UnrecoverableClient), "", 0)); SqlException exc = SqlException.CreateException(errors, "", connectionId); return exc; } internal static Exception StreamWriteNotSupported() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_StreamWriteNotSupported)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_StreamWriteNotSupported)); } internal static Exception StreamReadNotSupported() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_StreamReadNotSupported)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_StreamReadNotSupported)); } internal static Exception StreamSeekNotSupported() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_StreamSeekNotSupported)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_StreamSeekNotSupported)); } internal static System.Data.SqlTypes.SqlNullValueException SqlNullValue() { @@ -1241,31 +1241,31 @@ internal static System.Data.SqlTypes.SqlNullValueException SqlNullValue() } internal static Exception SubclassMustOverride() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlMisc_SubclassMustOverride)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlMisc_SubclassMustOverride)); } // ProjectK\CoreCLR specific errors internal static Exception UnsupportedKeyword(string keyword) { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_UnsupportedKeyword, keyword)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedKeyword, keyword)); } internal static Exception NetworkLibraryKeywordNotSupported() { - return ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_NetworkLibraryNotSupported)); + return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_NetworkLibraryNotSupported)); } internal static Exception UnsupportedFeatureAndToken(SqlInternalConnectionTds internalConnection, string token) { - var innerException = ADP.NotSupported(System.StringsHelper.GetString(Strings.SQL_UnsupportedToken, token)); + var innerException = ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedToken, token)); SqlErrorCollection errors = new SqlErrorCollection(); - errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, System.StringsHelper.GetString(Strings.SQL_UnsupportedFeature), "", 0)); + errors.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString(Strings.SQL_UnsupportedFeature), "", 0)); SqlException exc = SqlException.CreateException(errors, "", internalConnection, innerException); return exc; } internal static Exception BatchedUpdatesNotAvailableOnContextConnection() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_BatchedUpdatesNotAvailableOnContextConnection)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_BatchedUpdatesNotAvailableOnContextConnection)); } internal static Exception Azure_ManagedIdentityException(string msg) { @@ -1284,39 +1284,39 @@ internal static Exception Azure_ManagedIdentityException(string msg) internal static Exception InvalidKeyEncryptionAlgorithm(string encryptionAlgorithm, string validEncryptionAlgorithm, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidKeyEncryptionAlgorithmSysErr : Strings.TCE_InvalidKeyEncryptionAlgorithm; - return ADP.Argument(System.StringsHelper.GetString(message, encryptionAlgorithm, validEncryptionAlgorithm), TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM); + return ADP.Argument(StringsHelper.GetString(message, encryptionAlgorithm, validEncryptionAlgorithm), TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM); } internal static Exception NullKeyEncryptionAlgorithm(bool isSystemOp) { string message = isSystemOp ? Strings.TCE_NullKeyEncryptionAlgorithmSysErr : Strings.TCE_NullKeyEncryptionAlgorithm; - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM, System.StringsHelper.GetString(message)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM, StringsHelper.GetString(message)); } internal static Exception EmptyColumnEncryptionKey() { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_EmptyColumnEncryptionKey), TdsEnums.TCE_PARAM_COLUMNENCRYPTION_KEY); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_EmptyColumnEncryptionKey), TdsEnums.TCE_PARAM_COLUMNENCRYPTION_KEY); } internal static Exception NullColumnEncryptionKey() { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_COLUMNENCRYPTION_KEY, System.StringsHelper.GetString(Strings.TCE_NullColumnEncryptionKey)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_COLUMNENCRYPTION_KEY, StringsHelper.GetString(Strings.TCE_NullColumnEncryptionKey)); } internal static Exception EmptyEncryptedColumnEncryptionKey() { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_EmptyEncryptedColumnEncryptionKey), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_EmptyEncryptedColumnEncryptionKey), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception NullEncryptedColumnEncryptionKey() { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTED_CEK, System.StringsHelper.GetString(Strings.TCE_NullEncryptedColumnEncryptionKey)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTED_CEK, StringsHelper.GetString(Strings.TCE_NullEncryptedColumnEncryptionKey)); } internal static Exception LargeCertificatePathLength(int actualLength, int maxLength, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_LargeCertificatePathLengthSysErr : Strings.TCE_LargeCertificatePathLength; - return ADP.Argument(System.StringsHelper.GetString(message, actualLength, maxLength), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, actualLength, maxLength), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } @@ -1324,250 +1324,250 @@ internal static Exception NullCertificatePath(string[] validLocations, bool isSy { Debug.Assert(2 == validLocations.Length); string message = isSystemOp ? Strings.TCE_NullCertificatePathSysErr : Strings.TCE_NullCertificatePath; - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, System.StringsHelper.GetString(message, validLocations[0], validLocations[1], @"/")); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, StringsHelper.GetString(message, validLocations[0], validLocations[1], @"/")); } internal static Exception NullCspKeyPath(bool isSystemOp) { string message = isSystemOp ? Strings.TCE_NullCspPathSysErr : Strings.TCE_NullCspPath; - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, System.StringsHelper.GetString(message, @"/")); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, StringsHelper.GetString(message, @"/")); } internal static Exception NullCngKeyPath(bool isSystemOp) { string message = isSystemOp ? Strings.TCE_NullCngPathSysErr : Strings.TCE_NullCngPath; - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, System.StringsHelper.GetString(message, @"/")); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, StringsHelper.GetString(message, @"/")); } internal static Exception InvalidCertificatePath(string actualCertificatePath, string[] validLocations, bool isSystemOp) { Debug.Assert(2 == validLocations.Length); string message = isSystemOp ? Strings.TCE_InvalidCertificatePathSysErr : Strings.TCE_InvalidCertificatePath; - return ADP.Argument(System.StringsHelper.GetString(message, actualCertificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, actualCertificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCspPath(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCspPathSysErr : Strings.TCE_InvalidCspPath; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCngPath(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCngPathSysErr : Strings.TCE_InvalidCngPath; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception EmptyCspName(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_EmptyCspNameSysErr : Strings.TCE_EmptyCspName; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception EmptyCngName(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_EmptyCngNameSysErr : Strings.TCE_EmptyCngName; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception EmptyCspKeyId(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_EmptyCspKeyIdSysErr : Strings.TCE_EmptyCspKeyId; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception EmptyCngKeyId(string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_EmptyCngKeyIdSysErr : Strings.TCE_EmptyCngKeyId; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCspName(string cspName, string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCspNameSysErr : Strings.TCE_InvalidCspName; - return ADP.Argument(System.StringsHelper.GetString(message, cspName, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, cspName, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCspKeyIdentifier(string keyIdentifier, string masterKeyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCspKeyIdSysErr : Strings.TCE_InvalidCspKeyId; - return ADP.Argument(System.StringsHelper.GetString(message, keyIdentifier, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, keyIdentifier, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCngKey(string masterKeyPath, string cngProviderName, string keyIdentifier, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCngKeySysErr : Strings.TCE_InvalidCngKey; - return ADP.Argument(System.StringsHelper.GetString(message, masterKeyPath, cngProviderName, keyIdentifier), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, masterKeyPath, cngProviderName, keyIdentifier), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCertificateLocation(string certificateLocation, string certificatePath, string[] validLocations, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCertificateLocationSysErr : Strings.TCE_InvalidCertificateLocation; - return ADP.Argument(System.StringsHelper.GetString(message, certificateLocation, certificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, certificateLocation, certificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidCertificateStore(string certificateStore, string certificatePath, string validCertificateStore, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_InvalidCertificateStoreSysErr : Strings.TCE_InvalidCertificateStore; - return ADP.Argument(System.StringsHelper.GetString(message, certificateStore, certificatePath, validCertificateStore), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, certificateStore, certificatePath, validCertificateStore), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception EmptyCertificateThumbprint(string certificatePath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_EmptyCertificateThumbprintSysErr : Strings.TCE_EmptyCertificateThumbprint; - return ADP.Argument(System.StringsHelper.GetString(message, certificatePath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, certificatePath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception CertificateNotFound(string thumbprint, string certificateLocation, string certificateStore, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_CertificateNotFoundSysErr : Strings.TCE_CertificateNotFound; - return ADP.Argument(System.StringsHelper.GetString(message, thumbprint, certificateLocation, certificateStore), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, thumbprint, certificateLocation, certificateStore), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } internal static Exception InvalidAlgorithmVersionInEncryptedCEK(byte actual, byte expected) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidAlgorithmVersionInEncryptedCEK, actual.ToString(@"X2"), expected.ToString(@"X2")), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidAlgorithmVersionInEncryptedCEK, actual.ToString(@"X2"), expected.ToString(@"X2")), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidCiphertextLengthInEncryptedCEK(int actual, int expected, string certificateName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEK, actual, expected, certificateName), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEK, actual, expected, certificateName), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidCiphertextLengthInEncryptedCEKCsp(int actual, int expected, string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidCiphertextLengthInEncryptedCEKCng(int actual, int expected, string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCiphertextLengthInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidSignatureInEncryptedCEK(int actual, int expected, string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEK, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEK, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidSignatureInEncryptedCEKCsp(int actual, int expected, string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidSignatureInEncryptedCEKCng(int actual, int expected, string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidSignatureInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidCertificateSignature(string certificatePath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCertificateSignature, certificatePath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCertificateSignature, certificatePath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception InvalidSignature(string masterKeyPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidSignature, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidSignature, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } internal static Exception CertificateWithNoPrivateKey(string keyPath, bool isSystemOp) { string message = isSystemOp ? Strings.TCE_CertificateWithNoPrivateKeySysErr : Strings.TCE_CertificateWithNoPrivateKey; - return ADP.Argument(System.StringsHelper.GetString(message, keyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + return ADP.Argument(StringsHelper.GetString(message, keyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } #endregion Always Encrypted - Certificate Store Provider Errors #region Always Encrypted - Cryptographic Algorithms Error messages internal static Exception NullPlainText() { - return ADP.ArgumentNull(System.StringsHelper.GetString(Strings.TCE_NullPlainText)); + return ADP.ArgumentNull(StringsHelper.GetString(Strings.TCE_NullPlainText)); } internal static Exception NullCipherText() { - return ADP.ArgumentNull(System.StringsHelper.GetString(Strings.TCE_NullCipherText)); + return ADP.ArgumentNull(StringsHelper.GetString(Strings.TCE_NullCipherText)); } internal static Exception NullColumnEncryptionAlgorithm(string supportedAlgorithms) { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM, System.StringsHelper.GetString(Strings.TCE_NullColumnEncryptionAlgorithm, supportedAlgorithms)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTION_ALGORITHM, StringsHelper.GetString(Strings.TCE_NullColumnEncryptionAlgorithm, supportedAlgorithms)); } internal static Exception NullColumnEncryptionKeySysErr() { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTIONKEY, System.StringsHelper.GetString(Strings.TCE_NullColumnEncryptionKeySysErr)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_ENCRYPTIONKEY, StringsHelper.GetString(Strings.TCE_NullColumnEncryptionKeySysErr)); } internal static Exception InvalidKeySize(string algorithmName, int actualKeylength, int expectedLength) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidKeySize, algorithmName, actualKeylength, expectedLength), TdsEnums.TCE_PARAM_ENCRYPTIONKEY); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidKeySize, algorithmName, actualKeylength, expectedLength), TdsEnums.TCE_PARAM_ENCRYPTIONKEY); } internal static Exception InvalidEncryptionType(string algorithmName, SqlClientEncryptionType encryptionType, params SqlClientEncryptionType[] validEncryptionTypes) { const string valueSeparator = @", "; - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidEncryptionType, algorithmName, encryptionType.ToString(), string.Join(valueSeparator, validEncryptionTypes.Select((validEncryptionType => @"'" + validEncryptionType + @"'")))), TdsEnums.TCE_PARAM_ENCRYPTIONTYPE); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidEncryptionType, algorithmName, encryptionType.ToString(), string.Join(valueSeparator, validEncryptionTypes.Select((validEncryptionType => @"'" + validEncryptionType + @"'")))), TdsEnums.TCE_PARAM_ENCRYPTIONTYPE); } internal static Exception InvalidCipherTextSize(int actualSize, int minimumSize) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCipherTextSize, actualSize, minimumSize), TdsEnums.TCE_PARAM_CIPHERTEXT); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCipherTextSize, actualSize, minimumSize), TdsEnums.TCE_PARAM_CIPHERTEXT); } internal static Exception InvalidAlgorithmVersion(byte actual, byte expected) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidAlgorithmVersion, actual.ToString(@"X2"), expected.ToString(@"X2")), TdsEnums.TCE_PARAM_CIPHERTEXT); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidAlgorithmVersion, actual.ToString(@"X2"), expected.ToString(@"X2")), TdsEnums.TCE_PARAM_CIPHERTEXT); } internal static Exception InvalidAuthenticationTag() { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidAuthenticationTag), TdsEnums.TCE_PARAM_CIPHERTEXT); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidAuthenticationTag), TdsEnums.TCE_PARAM_CIPHERTEXT); } #endregion Always Encrypted - Cryptographic Algorithms Error messages #region Always Encrypted - Errors from sp_describe_parameter_encryption internal static Exception UnexpectedDescribeParamFormatParameterMetadata() { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnexpectedDescribeParamFormatParameterMetadata, "sp_describe_parameter_encryption")); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnexpectedDescribeParamFormatParameterMetadata, "sp_describe_parameter_encryption")); } internal static Exception UnexpectedDescribeParamFormatAttestationInfo(string enclaveType) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnexpectedDescribeParamFormatAttestationInfo, "sp_describe_parameter_encryption", enclaveType)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnexpectedDescribeParamFormatAttestationInfo, "sp_describe_parameter_encryption", enclaveType)); } internal static Exception InvalidEncryptionKeyOrdinalEnclaveMetadata(int ordinal, int maxOrdinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata, ordinal, maxOrdinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata, ordinal, maxOrdinal)); } internal static Exception InvalidEncryptionKeyOrdinalParameterMetadata(int ordinal, int maxOrdinal) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_InvalidEncryptionKeyOrdinalParameterMetadata, ordinal, maxOrdinal)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_InvalidEncryptionKeyOrdinalParameterMetadata, ordinal, maxOrdinal)); } public static Exception MultipleRowsReturnedForAttestationInfo() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_MultipleRowsReturnedForAttestationInfo, "sp_describe_parameter_encryption")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_MultipleRowsReturnedForAttestationInfo, "sp_describe_parameter_encryption")); } internal static Exception ParamEncryptionMetadataMissing(string paramName, string procedureName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_ParamEncryptionMetaDataMissing, "sp_describe_parameter_encryption", paramName, procedureName)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_ParamEncryptionMetaDataMissing, "sp_describe_parameter_encryption", paramName, procedureName)); } internal static Exception ProcEncryptionMetadataMissing(string procedureName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_ProcEncryptionMetaDataMissing, "sp_describe_parameter_encryption", procedureName)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_ProcEncryptionMetaDataMissing, "sp_describe_parameter_encryption", procedureName)); } internal static Exception UnableToVerifyColumnMasterKeySignature(Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_UnableToVerifyColumnMasterKeySignature, innerException.Message), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_UnableToVerifyColumnMasterKeySignature, innerException.Message), innerException); } internal static Exception ColumnMasterKeySignatureVerificationFailed(string cmkPath) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_ColumnMasterKeySignatureVerificationFailed, cmkPath)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_ColumnMasterKeySignatureVerificationFailed, cmkPath)); } internal static Exception InvalidKeyStoreProviderName(string providerName, List systemProviders, List customProviders) @@ -1575,22 +1575,22 @@ internal static Exception InvalidKeyStoreProviderName(string providerName, List< const string valueSeparator = @", "; string systemProviderStr = string.Join(valueSeparator, systemProviders.Select(provider => $"'{provider}'")); string customProviderStr = string.Join(valueSeparator, customProviders.Select(provider => $"'{provider}'")); - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidKeyStoreProviderName, providerName, systemProviderStr, customProviderStr)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidKeyStoreProviderName, providerName, systemProviderStr, customProviderStr)); } internal static Exception ParamInvalidForceColumnEncryptionSetting(string paramName, string procedureName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_ParamInvalidForceColumnEncryptionSetting, TdsEnums.TCE_PARAM_FORCE_COLUMN_ENCRYPTION, paramName, procedureName, "SqlParameter")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_ParamInvalidForceColumnEncryptionSetting, TdsEnums.TCE_PARAM_FORCE_COLUMN_ENCRYPTION, paramName, procedureName, "SqlParameter")); } internal static Exception ParamUnExpectedEncryptionMetadata(string paramName, string procedureName) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_ParamUnExpectedEncryptionMetadata, paramName, procedureName, TdsEnums.TCE_PARAM_FORCE_COLUMN_ENCRYPTION, "SqlParameter")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_ParamUnExpectedEncryptionMetadata, paramName, procedureName, TdsEnums.TCE_PARAM_FORCE_COLUMN_ENCRYPTION, "SqlParameter")); } internal static Exception ColumnMasterKeySignatureNotFound(string cmkPath) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_ColumnMasterKeySignatureNotFound, cmkPath)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_ColumnMasterKeySignatureNotFound, cmkPath)); } #endregion Always Encrypted - Errors from sp_describe_parameter_encryption @@ -1598,42 +1598,42 @@ internal static Exception ColumnMasterKeySignatureNotFound(string cmkPath) internal static Exception ExceptionWhenGeneratingEnclavePackage(Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_ExceptionWhenGeneratingEnclavePackage, innerException.Message), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_ExceptionWhenGeneratingEnclavePackage, innerException.Message), innerException); } internal static Exception FailedToEncryptRegisterRulesBytePackage(Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_FailedToEncryptRegisterRulesBytePackage, innerException.Message), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_FailedToEncryptRegisterRulesBytePackage, innerException.Message), innerException); } internal static Exception InvalidKeyIdUnableToCastToUnsignedShort(int keyId, Exception innerException) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidKeyIdUnableToCastToUnsignedShort, keyId, innerException.Message), innerException); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidKeyIdUnableToCastToUnsignedShort, keyId, innerException.Message), innerException); } internal static Exception InvalidDatabaseIdUnableToCastToUnsignedInt(int databaseId, Exception innerException) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidDatabaseIdUnableToCastToUnsignedInt, databaseId, innerException.Message), innerException); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidDatabaseIdUnableToCastToUnsignedInt, databaseId, innerException.Message), innerException); } internal static Exception InvalidAttestationParameterUnableToConvertToUnsignedInt(string variableName, int intValue, string enclaveType, Exception innerException) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt, enclaveType, intValue, variableName, innerException.Message), innerException); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt, enclaveType, intValue, variableName, innerException.Message), innerException); } internal static Exception OffsetOutOfBounds(string argument, string type, string method) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_OffsetOutOfBounds, type, method)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_OffsetOutOfBounds, type, method)); } internal static Exception InsufficientBuffer(string argument, string type, string method) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InsufficientBuffer, argument, type, method)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InsufficientBuffer, argument, type, method)); } internal static Exception ColumnEncryptionKeysNotFound() { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_ColumnEncryptionKeysNotFound)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_ColumnEncryptionKeysNotFound)); } #endregion Always Encrypted - Errors from secure channel Communication @@ -1641,29 +1641,29 @@ internal static Exception ColumnEncryptionKeysNotFound() #region Always Encrypted - Errors when performing attestation internal static Exception AttestationInfoNotReturnedFromSqlServer(string enclaveType, string enclaveAttestationUrl) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_AttestationInfoNotReturnedFromSQLServer, enclaveType, enclaveAttestationUrl)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_AttestationInfoNotReturnedFromSQLServer, enclaveType, enclaveAttestationUrl)); } #endregion Always Encrypted - Errors when performing attestation #region Always Encrypted - Errors when establishing secure channel internal static Exception NullArgumentInConstructorInternal(string argumentName, string objectUnderConstruction) { - return ADP.ArgumentNull(argumentName, System.StringsHelper.GetString(Strings.TCE_NullArgumentInConstructorInternal, argumentName, objectUnderConstruction)); + return ADP.ArgumentNull(argumentName, StringsHelper.GetString(Strings.TCE_NullArgumentInConstructorInternal, argumentName, objectUnderConstruction)); } internal static Exception EmptyArgumentInConstructorInternal(string argumentName, string objectUnderConstruction) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_EmptyArgumentInConstructorInternal, argumentName, objectUnderConstruction)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_EmptyArgumentInConstructorInternal, argumentName, objectUnderConstruction)); } internal static Exception NullArgumentInternal(string argumentName, string type, string method) { - return ADP.ArgumentNull(argumentName, System.StringsHelper.GetString(Strings.TCE_NullArgumentInternal, argumentName, type, method)); + return ADP.ArgumentNull(argumentName, StringsHelper.GetString(Strings.TCE_NullArgumentInternal, argumentName, type, method)); } internal static Exception EmptyArgumentInternal(string argumentName, string type, string method) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_EmptyArgumentInternal, argumentName, type, method)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_EmptyArgumentInternal, argumentName, type, method)); } #endregion Always Encrypted - Errors when establishing secure channel @@ -1671,47 +1671,47 @@ internal static Exception EmptyArgumentInternal(string argumentName, string type internal static Exception CannotGetSqlColumnEncryptionEnclaveProviderConfig(Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig, innerException.Message), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig, innerException.Message), innerException); } internal static Exception CannotCreateSqlColumnEncryptionEnclaveProvider(string providerName, string type, Exception innerException) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_CannotCreateSqlColumnEncryptionEnclaveProvider, providerName, type, innerException.Message), innerException); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_CannotCreateSqlColumnEncryptionEnclaveProvider, providerName, type, innerException.Message), innerException); } internal static Exception SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty)); } internal static Exception NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe(string enclaveType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe, "sp_describe_parameter_encryption", enclaveType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe, "sp_describe_parameter_encryption", enclaveType)); } internal static Exception NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage(string enclaveType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage, enclaveType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage, enclaveType)); } internal static Exception EnclaveTypeNullForEnclaveBasedQuery() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveTypeNullForEnclaveBasedQuery)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveTypeNullForEnclaveBasedQuery)); } internal static Exception EnclaveProvidersNotConfiguredForEnclaveBasedQuery() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery)); } internal static Exception EnclaveProviderNotFound(string enclaveType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveProviderNotFound, enclaveType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveProviderNotFound, enclaveType)); } internal static Exception NullEnclaveSessionReturnedFromProvider(string enclaveType, string attestationUrl) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_NullEnclaveSessionReturnedFromProvider, enclaveType, attestationUrl)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_NullEnclaveSessionReturnedFromProvider, enclaveType, attestationUrl)); } #endregion Always Encrypted - Enclave provider/configuration errors @@ -1744,17 +1744,17 @@ internal static Exception GetExceptionArray(string serverName, string errorMessa internal static Exception ColumnDecryptionFailed(string columnName, string serverName, Exception e) { - return GetExceptionArray(serverName, System.StringsHelper.GetString(Strings.TCE_ColumnDecryptionFailed, columnName), e); + return GetExceptionArray(serverName, StringsHelper.GetString(Strings.TCE_ColumnDecryptionFailed, columnName), e); } internal static Exception ParamEncryptionFailed(string paramName, string serverName, Exception e) { - return GetExceptionArray(serverName, System.StringsHelper.GetString(Strings.TCE_ParamEncryptionFailed, paramName), e); + return GetExceptionArray(serverName, StringsHelper.GetString(Strings.TCE_ParamEncryptionFailed, paramName), e); } internal static Exception ParamDecryptionFailed(string paramName, string serverName, Exception e) { - return GetExceptionArray(serverName, System.StringsHelper.GetString(Strings.TCE_ParamDecryptionFailed, paramName), e); + return GetExceptionArray(serverName, StringsHelper.GetString(Strings.TCE_ParamDecryptionFailed, paramName), e); } #endregion Always Encrypted - Generic toplevel failures @@ -1762,17 +1762,17 @@ internal static Exception ParamDecryptionFailed(string paramName, string serverN internal static Exception UnknownColumnEncryptionAlgorithm(string algorithmName, string supportedAlgorithms) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnknownColumnEncryptionAlgorithm, algorithmName, supportedAlgorithms)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnknownColumnEncryptionAlgorithm, algorithmName, supportedAlgorithms)); } internal static Exception UnknownColumnEncryptionAlgorithmId(int algoId, string supportAlgorithmIds) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnknownColumnEncryptionAlgorithmId, algoId, supportAlgorithmIds), TdsEnums.TCE_PARAM_CIPHER_ALGORITHM_ID); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnknownColumnEncryptionAlgorithmId, algoId, supportAlgorithmIds), TdsEnums.TCE_PARAM_CIPHER_ALGORITHM_ID); } internal static Exception UnsupportedNormalizationVersion(byte version) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnsupportedNormalizationVersion, version, "'1'", "SQL Server")); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnsupportedNormalizationVersion, version, "'1'", "SQL Server")); } internal static Exception UnrecognizedKeyStoreProviderName(string providerName, List systemProviders, List customProviders) @@ -1780,12 +1780,12 @@ internal static Exception UnrecognizedKeyStoreProviderName(string providerName, const string valueSeparator = @", "; string systemProviderStr = string.Join(valueSeparator, systemProviders.Select(provider => @"'" + provider + @"'")); string customProviderStr = string.Join(valueSeparator, customProviders.Select(provider => @"'" + provider + @"'")); - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnrecognizedKeyStoreProviderName, providerName, systemProviderStr, customProviderStr)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnrecognizedKeyStoreProviderName, providerName, systemProviderStr, customProviderStr)); } internal static Exception InvalidDataTypeForEncryptedParameter(string parameterName, int actualDataType, int expectedDataType) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_NullProviderValue, parameterName, actualDataType, expectedDataType)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_NullProviderValue, parameterName, actualDataType, expectedDataType)); } internal static Exception KeyDecryptionFailed(string providerName, string keyHex, Exception e) @@ -1793,57 +1793,57 @@ internal static Exception KeyDecryptionFailed(string providerName, string keyHex if (providerName.Equals(SqlColumnEncryptionCertificateStoreProvider.ProviderName)) { - return GetExceptionArray(null, System.StringsHelper.GetString(Strings.TCE_KeyDecryptionFailedCertStore, providerName, keyHex), e); + return GetExceptionArray(null, StringsHelper.GetString(Strings.TCE_KeyDecryptionFailedCertStore, providerName, keyHex), e); } else { - return GetExceptionArray(null, System.StringsHelper.GetString(Strings.TCE_KeyDecryptionFailed, providerName, keyHex), e); + return GetExceptionArray(null, StringsHelper.GetString(Strings.TCE_KeyDecryptionFailed, providerName, keyHex), e); } } internal static Exception UntrustedKeyPath(string keyPath, string serverName) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UntrustedKeyPath, keyPath, serverName)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UntrustedKeyPath, keyPath, serverName)); } internal static Exception UnsupportedDatatypeEncryption(string dataType) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_UnsupportedDatatype, dataType)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_UnsupportedDatatype, dataType)); } internal static Exception ThrowDecryptionFailed(string keyStr, string valStr, Exception e) { - return GetExceptionArray(null, System.StringsHelper.GetString(Strings.TCE_DecryptionFailed, keyStr, valStr), e); + return GetExceptionArray(null, StringsHelper.GetString(Strings.TCE_DecryptionFailed, keyStr, valStr), e); } internal static Exception NullEnclaveSessionDuringQueryExecution(string enclaveType, string enclaveAttestationUrl) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_NullEnclaveSessionDuringQueryExecution, enclaveType, enclaveAttestationUrl)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_NullEnclaveSessionDuringQueryExecution, enclaveType, enclaveAttestationUrl)); } internal static Exception NullEnclavePackageForEnclaveBasedQuery(string enclaveType, string enclaveAttestationUrl) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_NullEnclavePackageForEnclaveBasedQuery, enclaveType, enclaveAttestationUrl)); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_NullEnclavePackageForEnclaveBasedQuery, enclaveType, enclaveAttestationUrl)); } internal static Exception EnclaveProviderNotFound(string enclaveType, string attestationProtocol) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveProviderNotFound, enclaveType, attestationProtocol)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveProviderNotFound, enclaveType, attestationProtocol)); } internal static Exception EnclaveTypeNotSupported(string enclaveType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveTypeNotSupported, enclaveType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveTypeNotSupported, enclaveType)); } internal static Exception AttestationProtocolNotSupportEnclaveType(string attestationProtocolStr, string enclaveType) { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSupportEnclaveType, attestationProtocolStr, enclaveType)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSupportEnclaveType, attestationProtocolStr, enclaveType)); } internal static Exception AttestationProtocolNotSpecifiedForGeneratingEnclavePackage() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage)); } #endregion Always Encrypted - Client side query processing errors @@ -1852,27 +1852,27 @@ internal static Exception AttestationProtocolNotSpecifiedForGeneratingEnclavePac internal static Exception TceNotSupported() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_NotSupportedByServer, "SQL Server")); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_NotSupportedByServer, "SQL Server")); } internal static Exception EnclaveComputationsNotSupported() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveComputationsNotSupported)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveComputationsNotSupported)); } internal static Exception AttestationURLNotSupported() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_AttestationURLNotSupported)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_AttestationURLNotSupported)); } internal static Exception AttestationProtocolNotSupported() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSupported)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_AttestationProtocolNotSupported)); } internal static Exception EnclaveTypeNotReturned() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_EnclaveTypeNotReturned)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_EnclaveTypeNotReturned)); } #endregion Always Encrypted - SQL connection related error messages @@ -1880,27 +1880,27 @@ internal static Exception EnclaveTypeNotReturned() internal static Exception CanOnlyCallOnce() { - return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.TCE_CanOnlyCallOnce)); + return ADP.InvalidOperation(StringsHelper.GetString(Strings.TCE_CanOnlyCallOnce)); } internal static Exception NullCustomKeyStoreProviderDictionary() { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, System.StringsHelper.GetString(Strings.TCE_NullCustomKeyStoreProviderDictionary)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, StringsHelper.GetString(Strings.TCE_NullCustomKeyStoreProviderDictionary)); } internal static Exception InvalidCustomKeyStoreProviderName(string providerName, string prefix) { - return ADP.Argument(System.StringsHelper.GetString(Strings.TCE_InvalidCustomKeyStoreProviderName, providerName, prefix), TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS); + return ADP.Argument(StringsHelper.GetString(Strings.TCE_InvalidCustomKeyStoreProviderName, providerName, prefix), TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS); } internal static Exception NullProviderValue(string providerName) { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, System.StringsHelper.GetString(Strings.TCE_NullProviderValue, providerName)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, StringsHelper.GetString(Strings.TCE_NullProviderValue, providerName)); } internal static Exception EmptyProviderName() { - return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, System.StringsHelper.GetString(Strings.TCE_EmptyProviderName)); + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_CLIENT_KEYSTORE_PROVIDERS, StringsHelper.GetString(Strings.TCE_EmptyProviderName)); } #endregion Always Encrypted - Extensibility related error messages @@ -1914,7 +1914,7 @@ internal static string GetSNIErrorMessage(int sniError) Debug.Assert(sniError > 0 && sniError <= (int)SNINativeMethodWrapper.SniSpecialErrors.MaxErrorValue, "SNI error is out of range"); string errorMessageId = string.Format("SNI_ERROR_{0}", sniError); - return System.StringsHelper.GetResourceString(errorMessageId); + return StringsHelper.GetResourceString(errorMessageId); } // Default values for SqlDependency and SqlNotificationRequest @@ -1939,123 +1939,123 @@ private SQLMessage() { /* prevent utility class from being instantiated*/ } internal static string CultureIdError() { - return System.StringsHelper.GetString(Strings.SQL_CultureIdError); + return StringsHelper.GetString(Strings.SQL_CultureIdError); } internal static string EncryptionNotSupportedByClient() { - return System.StringsHelper.GetString(Strings.SQL_EncryptionNotSupportedByClient); + return StringsHelper.GetString(Strings.SQL_EncryptionNotSupportedByClient); } internal static string EncryptionNotSupportedByServer() { - return System.StringsHelper.GetString(Strings.SQL_EncryptionNotSupportedByServer); + return StringsHelper.GetString(Strings.SQL_EncryptionNotSupportedByServer); } internal static string OperationCancelled() { - return System.StringsHelper.GetString(Strings.SQL_OperationCancelled); + return StringsHelper.GetString(Strings.SQL_OperationCancelled); } internal static string SevereError() { - return System.StringsHelper.GetString(Strings.SQL_SevereError); + return StringsHelper.GetString(Strings.SQL_SevereError); } internal static string SSPIInitializeError() { - return System.StringsHelper.GetString(Strings.SQL_SSPIInitializeError); + return StringsHelper.GetString(Strings.SQL_SSPIInitializeError); } internal static string SSPIGenerateError() { - return System.StringsHelper.GetString(Strings.SQL_SSPIGenerateError); + return StringsHelper.GetString(Strings.SQL_SSPIGenerateError); } internal static string SqlServerBrowserNotAccessible() { - return System.StringsHelper.GetString(Strings.SQL_SqlServerBrowserNotAccessible); + return StringsHelper.GetString(Strings.SQL_SqlServerBrowserNotAccessible); } internal static string KerberosTicketMissingError() { - return System.StringsHelper.GetString(Strings.SQL_KerberosTicketMissingError); + return StringsHelper.GetString(Strings.SQL_KerberosTicketMissingError); } internal static string Timeout() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_Execution); + return StringsHelper.GetString(Strings.SQL_Timeout_Execution); } internal static string Timeout_PreLogin_Begin() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_Begin); + return StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_Begin); } internal static string Timeout_PreLogin_InitializeConnection() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_InitializeConnection); + return StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_InitializeConnection); } internal static string Timeout_PreLogin_SendHandshake() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_SendHandshake); + return StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_SendHandshake); } internal static string Timeout_PreLogin_ConsumeHandshake() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_ConsumeHandshake); + return StringsHelper.GetString(Strings.SQL_Timeout_PreLogin_ConsumeHandshake); } internal static string Timeout_Login_Begin() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_Login_Begin); + return StringsHelper.GetString(Strings.SQL_Timeout_Login_Begin); } internal static string Timeout_Login_ProcessConnectionAuth() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_Login_ProcessConnectionAuth); + return StringsHelper.GetString(Strings.SQL_Timeout_Login_ProcessConnectionAuth); } internal static string Timeout_PostLogin() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_PostLogin); + return StringsHelper.GetString(Strings.SQL_Timeout_PostLogin); } internal static string Timeout_FailoverInfo() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_FailoverInfo); + return StringsHelper.GetString(Strings.SQL_Timeout_FailoverInfo); } internal static string Timeout_RoutingDestination() { - return System.StringsHelper.GetString(Strings.SQL_Timeout_RoutingDestinationInfo); + return StringsHelper.GetString(Strings.SQL_Timeout_RoutingDestinationInfo); } internal static string Duration_PreLogin_Begin(long PreLoginBeginDuration) { - return System.StringsHelper.GetString(Strings.SQL_Duration_PreLogin_Begin, PreLoginBeginDuration); + return StringsHelper.GetString(Strings.SQL_Duration_PreLogin_Begin, PreLoginBeginDuration); } internal static string Duration_PreLoginHandshake(long PreLoginBeginDuration, long PreLoginHandshakeDuration) { - return System.StringsHelper.GetString(Strings.SQL_Duration_PreLoginHandshake, PreLoginBeginDuration, PreLoginHandshakeDuration); + return StringsHelper.GetString(Strings.SQL_Duration_PreLoginHandshake, PreLoginBeginDuration, PreLoginHandshakeDuration); } internal static string Duration_Login_Begin(long PreLoginBeginDuration, long PreLoginHandshakeDuration, long LoginBeginDuration) { - return System.StringsHelper.GetString(Strings.SQL_Duration_Login_Begin, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration); + return StringsHelper.GetString(Strings.SQL_Duration_Login_Begin, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration); } internal static string Duration_Login_ProcessConnectionAuth(long PreLoginBeginDuration, long PreLoginHandshakeDuration, long LoginBeginDuration, long LoginAuthDuration) { - return System.StringsHelper.GetString(Strings.SQL_Duration_Login_ProcessConnectionAuth, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration, LoginAuthDuration); + return StringsHelper.GetString(Strings.SQL_Duration_Login_ProcessConnectionAuth, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration, LoginAuthDuration); } internal static string Duration_PostLogin(long PreLoginBeginDuration, long PreLoginHandshakeDuration, long LoginBeginDuration, long LoginAuthDuration, long PostLoginDuration) { - return System.StringsHelper.GetString(Strings.SQL_Duration_PostLogin, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration, LoginAuthDuration, PostLoginDuration); + return StringsHelper.GetString(Strings.SQL_Duration_PostLogin, PreLoginBeginDuration, PreLoginHandshakeDuration, LoginBeginDuration, LoginAuthDuration, PostLoginDuration); } internal static string UserInstanceFailure() { - return System.StringsHelper.GetString(Strings.SQL_UserInstanceFailure); + return StringsHelper.GetString(Strings.SQL_UserInstanceFailure); } internal static string PreloginError() { - return System.StringsHelper.GetString(Strings.Snix_PreLogin); + return StringsHelper.GetString(Strings.Snix_PreLogin); } internal static string ExClientConnectionId() { - return System.StringsHelper.GetString(Strings.SQL_ExClientConnectionId); + return StringsHelper.GetString(Strings.SQL_ExClientConnectionId); } internal static string ExErrorNumberStateClass() { - return System.StringsHelper.GetString(Strings.SQL_ExErrorNumberStateClass); + return StringsHelper.GetString(Strings.SQL_ExErrorNumberStateClass); } internal static string ExOriginalClientConnectionId() { - return System.StringsHelper.GetString(Strings.SQL_ExOriginalClientConnectionId); + return StringsHelper.GetString(Strings.SQL_ExOriginalClientConnectionId); } internal static string ExRoutingDestination() { - return System.StringsHelper.GetString(Strings.SQL_ExRoutingDestination); + return StringsHelper.GetString(Strings.SQL_ExRoutingDestination); } } diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs index 017320168b..f1f29b4697 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs @@ -445,13 +445,13 @@ static private string GetFullPathInternal(string path) path = path.Trim(); if (path.Length == 0) { - throw ADP.Argument(System.StringsHelper.GetString(Strings.SqlFileStream_InvalidPath), "path"); + throw ADP.Argument(StringsHelper.GetString(Strings.SqlFileStream_InvalidPath), "path"); } // make sure path is not DOS device path if (!path.StartsWith(@"\\") && !System.IO.PathInternal.IsDevice(path.AsSpan())) { - throw ADP.Argument(System.StringsHelper.GetString(Strings.SqlFileStream_InvalidPath), "path"); + throw ADP.Argument(StringsHelper.GetString(Strings.SqlFileStream_InvalidPath), "path"); } // normalize the path @@ -460,7 +460,7 @@ static private string GetFullPathInternal(string path) // make sure path is a UNC path if (System.IO.PathInternal.IsDeviceUNC(path.AsSpan())) { - throw ADP.Argument(System.StringsHelper.GetString(Strings.SqlFileStream_PathNotValidDiskResource), "path"); + throw ADP.Argument(StringsHelper.GetString(Strings.SqlFileStream_PathNotValidDiskResource), "path"); } return path; @@ -612,10 +612,10 @@ long allocationSize break; case Interop.Errors.ERROR_SHARING_VIOLATION: - throw ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SqlFileStream_FileAlreadyInTransaction)); + throw ADP.InvalidOperation(StringsHelper.GetString(Strings.SqlFileStream_FileAlreadyInTransaction)); case Interop.Errors.ERROR_INVALID_PARAMETER: - throw ADP.Argument(System.StringsHelper.GetString(Strings.SqlFileStream_InvalidParameter)); + throw ADP.Argument(StringsHelper.GetString(Strings.SqlFileStream_InvalidParameter)); case Interop.Errors.ERROR_FILE_NOT_FOUND: { @@ -648,7 +648,7 @@ long allocationSize if (Interop.Kernel32.GetFileType(hFile) != Interop.Kernel32.FileTypes.FILE_TYPE_DISK) { hFile.Dispose(); - throw ADP.Argument(System.StringsHelper.GetString(Strings.SqlFileStream_PathNotValidDiskResource)); + throw ADP.Argument(StringsHelper.GetString(Strings.SqlFileStream_PathNotValidDiskResource)); } // if the user is opening the SQL FileStream in read/write mode, we assume that they want to scan diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs index 05f6a26dba..f33751fb08 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs @@ -2787,15 +2787,6 @@ internal static string SQL_KerberosTicketMissingError { } } - /// - /// Looks up a localized string similar to Cannot use 'Authentication={0}' with 'Password' or 'PWD' connection string keywords.. - /// - internal static string SQL_NonInteractiveWithPassword { - get { - return ResourceManager.GetString("SQL_NonInteractiveWithPassword", resourceCulture); - } - } - /// /// Looks up a localized string similar to The connection does not support MultipleActiveResultSets.. /// @@ -2824,7 +2815,7 @@ internal static string SQL_MSALFailure { } /// - /// Looks up a localized string similar to Error code 0x{0}.. + /// Looks up a localized string similar to Error code 0x{0}. /// internal static string SQL_MSALInnerException { get { @@ -2859,6 +2850,15 @@ internal static string SQL_NonCharColumn { } } + /// + /// Looks up a localized string similar to Cannot use 'Authentication={0}' with 'Password' or 'PWD' connection string keywords.. + /// + internal static string SQL_NonInteractiveWithPassword { + get { + return ResourceManager.GetString("SQL_NonInteractiveWithPassword", resourceCulture); + } + } + /// /// Looks up a localized string similar to SSE Instance re-direction is not supported for non-local user instances.. /// @@ -4442,12 +4442,15 @@ internal static string TCE_DbConnectionString_AttestationProtocol { return ResourceManager.GetString("TCE_DbConnectionString_AttestationProtocol", resourceCulture); } } - + /// - /// Looks up a localized string similar to Specifies an IP address preference when connecting to SQL instances. + /// Looks up a localized string similar to Specifies an IP address preference when connecting to SQL instances.. /// - internal static string TCE_DbConnectionString_IPAddressPreference - => ResourceManager.GetString("TCE_DbConnectionString_IPAddressPreference", resourceCulture); + internal static string TCE_DbConnectionString_IPAddressPreference { + get { + return ResourceManager.GetString("TCE_DbConnectionString_IPAddressPreference", resourceCulture); + } + } /// /// Looks up a localized string similar to Decryption failed. The last 10 bytes of the encrypted column encryption key are: '{0}'. The first 10 bytes of ciphertext are: '{1}'.. diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/StringsHelper.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/StringsHelper.cs index 118765923e..339f9a9d93 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/StringsHelper.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/StringsHelper.cs @@ -2,33 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Globalization; -using System.Resources; +using System; using System.Runtime.CompilerServices; -using System.Threading; -namespace System +namespace Microsoft.Data { internal partial class StringsHelper : Strings { - private static StringsHelper s_loader = null; - private readonly ResourceManager _resources; - - internal StringsHelper() - { - _resources = new ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", GetType().Assembly); - } - - private static StringsHelper GetLoader() - { - if (s_loader == null) - { - StringsHelper sr = new(); - Interlocked.CompareExchange(ref s_loader, sr, null); - } - return s_loader; - } - // This method is used to decide if we need to append the exception message parameters to the message when calling Strings.Format. // by default it returns false. // Native code generators can replace the value this returns based on user input at the time of native code generation. @@ -41,42 +21,6 @@ private static bool UsingResourceKeys() return false; } - public static string GetResourceString(string res) - { - StringsHelper sys = GetLoader(); - if (sys == null) - return null; - - // If "res" is a resource id, temp will not be null, "res" will contain the retrieved resource string. - // If "res" is not a resource id, temp will be null. - string temp = sys._resources.GetString(res, Culture); - if (temp != null) - res = temp; - - return res; - } - - public static string GetString(string res, params object[] args) - { - res = GetResourceString(res); - if (args != null && args.Length > 0) - { - for (int i = 0; i < args.Length; i++) - { - string value = args[i] as string; - if (value != null && value.Length > 1024) - { - args[i] = value.Substring(0, 1024 - 3) + "..."; - } - } - return string.Format(CultureInfo.CurrentCulture, res, args); - } - else - { - return res; - } - } - public static string Format(string resourceFormat, params object[] args) { if (args != null) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index f54e7630c6..c46d4475b8 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -558,8 +558,11 @@ True $(ResxFileName).resx - + + Resources\StringsHelper.cs + + Microsoft.Data.SqlClient.Resources.Strings.resources System ResXFileCodeGenerator $(ResxFileName).Designer.cs diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs index 72f7fa5243..1a35932194 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs @@ -39,7 +39,7 @@ internal Strings() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SqlClient.Resources.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/StringsHelper.cs b/src/Microsoft.Data.SqlClient/src/Resources/StringsHelper.cs similarity index 83% rename from src/Microsoft.Data.SqlClient/netfx/src/Resources/StringsHelper.cs rename to src/Microsoft.Data.SqlClient/src/Resources/StringsHelper.cs index 50492a22b1..23d563942c 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/StringsHelper.cs +++ b/src/Microsoft.Data.SqlClient/src/Resources/StringsHelper.cs @@ -16,12 +16,12 @@ internal partial class StringsHelper : Strings internal StringsHelper() { - _resources = new ResourceManager("SqlClient.Resources.Strings", GetType().Assembly); + _resources = new ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", GetType().Assembly); } private static StringsHelper GetLoader() { - if (s_loader == null) + if (s_loader is null) { StringsHelper sr = new(); Interlocked.CompareExchange(ref s_loader, sr, null); @@ -32,27 +32,24 @@ private static StringsHelper GetLoader() public static string GetResourceString(string res) { StringsHelper sys = GetLoader(); - if (sys == null) + if (sys is null) return null; // If "res" is a resource id, temp will not be null, "res" will contain the retrieved resource string. // If "res" is not a resource id, temp will be null. string temp = sys._resources.GetString(res, StringsHelper.Culture); - if (temp != null) - res = temp; - - return res; + return temp ?? res; } public static string GetString(string res, params object[] args) { res = GetResourceString(res); - if (args != null && args.Length > 0) + if (args?.Length > 0) { for (int i = 0; i < args.Length; i++) { string value = args[i] as string; - if (value != null && value.Length > 1024) + if (value?.Length > 1024) { args[i] = value.Substring(0, 1024 - 3) + "..."; }