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 ff1db9b5e6..797d433b2f 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -222,6 +222,27 @@
Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs
+
+ Microsoft\Data\OperationAbortedException.cs
+
+
+ Microsoft\Data\DataException.cs
+
+
+ Microsoft\Data\SqlClient\Server\InvalidUdtException.cs
+
+
+ Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveProviderBase.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveSessionCache.cs
+
+
+ Microsoft\Data\SqlClient\SignatureVerificationCache.cs
+
@@ -242,10 +263,7 @@
-
-
-
@@ -272,8 +290,6 @@
-
-
Microsoft\Data\Common\AdapterUtil.cs
@@ -329,7 +345,6 @@
-
@@ -420,7 +435,6 @@
-
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 a63ed87bce..39a7e2b45c 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -274,24 +274,41 @@
Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs
+
+ Microsoft\Data\OperationAbortedException.cs
+
+
+ Microsoft\Data\DataException.cs
+
+
+ Microsoft\Data\SqlClient\Server\InvalidUdtException.cs
+
+
+ Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveProviderBase.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveSessionCache.cs
+
+
+ Microsoft\Data\SqlClient\SignatureVerificationCache.cs
+
-
-
-
-
@@ -302,7 +319,6 @@
-
@@ -375,7 +391,6 @@
-
@@ -435,7 +450,6 @@
-
@@ -503,4 +517,4 @@
-
\ No newline at end of file
+
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/DataException.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/DataException.cs
deleted file mode 100644
index 7f02867eed..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/DataException.cs
+++ /dev/null
@@ -1,1533 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Globalization;
-using Microsoft.Data.SqlClient;
-
-namespace Microsoft.Data
-{
- internal static class ExceptionBuilder
- {
- // The class defines the exceptions that are specific to the DataSet.
- // The class contains functions that take the proper informational variables and then construct
- // the appropriate exception with an error string obtained from the resource Data.txt.
- // The exception is then returned to the caller, so that the caller may then throw from its
- // location so that the catcher of the exception will have the appropriate call stack.
- // This class is used so that there will be compile time checking of error messages.
- // The resource Data.txt will ensure proper string text based on the appropriate
- // locale.
-
- static private void TraceException(
- string trace, Exception e)
- {
- Debug.Assert(null != e, "TraceException: null Exception");
- if (null != e)
- {
- SqlClientEventSource.Log.TryAdvancedTraceEvent(trace, e.Message);
- try
- {
- SqlClientEventSource.Log.TryAdvancedTraceEvent(" Environment StackTrace = '{0}'", Environment.StackTrace);
- }
- catch (System.Security.SecurityException)
- {
- // if you don't have permission - you don't get the stack trace
- }
- }
- }
-
- static internal void TraceExceptionAsReturnValue(Exception e)
- {
- TraceException(" Message='{0}'", e);
- }
- static internal void TraceExceptionForCapture(Exception e)
- {
- TraceException(" Message = {0}", e);
- }
- static internal void TraceExceptionWithoutRethrow(Exception e)
- {
- TraceException(" Message = '{0}'", e);
- }
-
- //
- // COM+ exceptions
- //
- static internal ArgumentException _Argument(string error)
- {
- ArgumentException e = new ArgumentException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static internal ArgumentException _Argument(string paramName, string error)
- {
- ArgumentException e = new ArgumentException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static internal ArgumentException _Argument(string error, Exception innerException)
- {
- ArgumentException e = new ArgumentException(error, innerException);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private ArgumentNullException _ArgumentNull(string paramName, string msg)
- {
- ArgumentNullException e = new ArgumentNullException(paramName, msg);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static internal ArgumentOutOfRangeException _ArgumentOutOfRange(string paramName, string msg)
- {
- ArgumentOutOfRangeException e = new ArgumentOutOfRangeException(paramName, msg);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private IndexOutOfRangeException _IndexOutOfRange(string error)
- {
- IndexOutOfRangeException e = new IndexOutOfRangeException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private InvalidOperationException _InvalidOperation(string error)
- {
- InvalidOperationException e = new InvalidOperationException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
-
- static private InvalidEnumArgumentException _InvalidEnumArgumentException(string error)
- {
- InvalidEnumArgumentException e = new InvalidEnumArgumentException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
-
- static private InvalidEnumArgumentException _InvalidEnumArgumentException(T value)
- {
- string msg = StringsHelper.GetString(Strings.ADP_InvalidEnumerationValue, typeof(T).Name, value.ToString());
- return _InvalidEnumArgumentException(msg);
- }
-
- //
- // System.Data exceptions
- //
- static private DataException _Data(string error)
- {
- DataException e = new DataException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- /// trace and throw a DataException
- /// exception Message
- /// exception InnerException
- /// always thrown
- static private void ThrowDataException(string error, Exception innerException)
- {
- DataException e = new DataException(error, innerException);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- throw e;
- }
- static private ConstraintException _Constraint(string error)
- {
- ConstraintException e = new ConstraintException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private InvalidConstraintException _InvalidConstraint(string error)
- {
- InvalidConstraintException e = new InvalidConstraintException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private DeletedRowInaccessibleException _DeletedRowInaccessible(string error)
- {
- DeletedRowInaccessibleException e = new DeletedRowInaccessibleException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private DuplicateNameException _DuplicateName(string error)
- {
- DuplicateNameException e = new DuplicateNameException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private InRowChangingEventException _InRowChangingEvent(string error)
- {
- InRowChangingEventException e = new InRowChangingEventException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private MissingPrimaryKeyException _MissingPrimaryKey(string error)
- {
- MissingPrimaryKeyException e = new MissingPrimaryKeyException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private NoNullAllowedException _NoNullAllowed(string error)
- {
- NoNullAllowedException e = new NoNullAllowedException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private ReadOnlyException _ReadOnly(string error)
- {
- ReadOnlyException e = new ReadOnlyException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private RowNotInTableException _RowNotInTable(string error)
- {
- RowNotInTableException e = new RowNotInTableException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
- static private VersionNotFoundException _VersionNotFound(string error)
- {
- VersionNotFoundException e = new VersionNotFoundException(error);
- ExceptionBuilder.TraceExceptionAsReturnValue(e);
- return e;
- }
-
-
- // Consider: whether we need to keep our own texts from Data_ArgumentNull and Data_ArgumentOutOfRange?
- // Unfortunately ours and the system ones are not consistent between each other. Try to raise this issue in "URT user community"
- static public Exception ArgumentNull(string paramName)
- {
- return _ArgumentNull(paramName, StringsHelper.GetString(Strings.Data_ArgumentNull, paramName));
- }
- static public Exception ArgumentOutOfRange(string paramName)
- {
- return _ArgumentOutOfRange(paramName, StringsHelper.GetString(Strings.Data_ArgumentOutOfRange, paramName));
- }
- static public Exception BadObjectPropertyAccess(string error)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataConstraint_BadObjectPropertyAccess, error));
- }
- static public Exception ArgumentContainsNull(string paramName)
- {
- return _Argument(paramName, StringsHelper.GetString(Strings.Data_ArgumentContainsNull, paramName));
- }
-
- //
- // Collections
- //
-
- static public Exception CannotModifyCollection()
- {
- return _Argument(StringsHelper.GetString(Strings.Data_CannotModifyCollection));
- }
- static public Exception CaseInsensitiveNameConflict(string name)
- {
- return _Argument(StringsHelper.GetString(Strings.Data_CaseInsensitiveNameConflict, name));
- }
- static public Exception NamespaceNameConflict(string name)
- {
- return _Argument(StringsHelper.GetString(Strings.Data_NamespaceNameConflict, name));
- }
- static public Exception InvalidOffsetLength()
- {
- return _Argument(StringsHelper.GetString(Strings.Data_InvalidOffsetLength));
- }
-
- //
- // DataColumnCollection
- //
-
- static public Exception ColumnNotInTheTable(string column, string table)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_NotInTheTable, column, table));
- }
-
- static public Exception ColumnNotInAnyTable()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_NotInAnyTable));
- }
-
- static public Exception ColumnOutOfRange(int index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataColumns_OutOfRange, (index).ToString(CultureInfo.InvariantCulture)));
- }
- static public Exception ColumnOutOfRange(string column)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataColumns_OutOfRange, column));
- }
-
- static public Exception CannotAddColumn1(string column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_Add1, column));
- }
-
- static public Exception CannotAddColumn2(string column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_Add2, column));
- }
-
- static public Exception CannotAddColumn3()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_Add3));
- }
-
- static public Exception CannotAddColumn4(string column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_Add4, column));
- }
-
- static public Exception CannotAddDuplicate(string column)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataColumns_AddDuplicate, column));
- }
-
- static public Exception CannotAddDuplicate2(string table)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataColumns_AddDuplicate2, table));
- }
-
- static public Exception CannotAddDuplicate3(string table)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataColumns_AddDuplicate3, table));
- }
-
- static public Exception CannotRemoveColumn()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_Remove));
- }
-
- static public Exception CannotRemovePrimaryKey()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_RemovePrimaryKey));
- }
-
- static public Exception CannotRemoveChildKey(string relation)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_RemoveChildKey, relation));
- }
-
- static public Exception CannotRemoveConstraint(string constraint, string table)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_RemoveConstraint, constraint, table));
- }
-
- static public Exception CannotRemoveExpression(string column, string expression)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_RemoveExpression, column, expression));
- }
-
- static public Exception ColumnNotInTheUnderlyingTable(string column, string table)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_NotInTheUnderlyingTable, column, table));
- }
-
- static public Exception InvalidOrdinal(string name, int ordinal)
- {
- return _ArgumentOutOfRange(name, StringsHelper.GetString(Strings.DataColumn_OrdinalExceedMaximun, (ordinal).ToString(CultureInfo.InvariantCulture)));
- }
-
- //
- // _Constraint and ConstrainsCollection
- //
-
- static public Exception AddPrimaryKeyConstraint()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_AddPrimaryKeyConstraint));
- }
-
- static public Exception NoConstraintName()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_NoName));
- }
-
- static public Exception ConstraintViolation(string constraint)
- {
- return _Constraint(StringsHelper.GetString(Strings.DataConstraint_Violation, constraint));
- }
-
- static public Exception ConstraintNotInTheTable(string constraint)
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_NotInTheTable, constraint));
- }
-
- static public string KeysToString(object[] keys)
- {
- string values = String.Empty;
- for (int i = 0; i < keys.Length; i++)
- {
- values += Convert.ToString(keys[i], null) + (i < keys.Length - 1 ? ", " : String.Empty);
- }
- return values;
- }
- static public string UniqueConstraintViolationText(DataColumn[] columns, object[] values)
- {
- if (columns.Length > 1)
- {
- string columnNames = String.Empty;
- for (int i = 0; i < columns.Length; i++)
- {
- columnNames += columns[i].ColumnName + (i < columns.Length - 1 ? ", " : "");
- }
- return StringsHelper.GetString(Strings.DataConstraint_ViolationValue, columnNames, KeysToString(values));
- }
- else
- {
- return StringsHelper.GetString(Strings.DataConstraint_ViolationValue, columns[0].ColumnName, Convert.ToString(values[0], null));
- }
- }
- static public Exception ConstraintViolation(DataColumn[] columns, object[] values)
- {
- return _Constraint(UniqueConstraintViolationText(columns, values));
- }
-
- static public Exception ConstraintOutOfRange(int index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataConstraint_OutOfRange, (index).ToString(CultureInfo.InvariantCulture)));
- }
-
- static public Exception DuplicateConstraint(string constraint)
- {
- return _Data(StringsHelper.GetString(Strings.DataConstraint_Duplicate, constraint));
- }
-
- static public Exception DuplicateConstraintName(string constraint)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataConstraint_DuplicateName, constraint));
- }
-
- static public Exception NeededForForeignKeyConstraint(UniqueConstraint key, ForeignKeyConstraint fk)
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_NeededForForeignKeyConstraint, key.ConstraintName, fk.ConstraintName));
- }
-
- static public Exception UniqueConstraintViolation()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_UniqueViolation));
- }
-
- static public Exception ConstraintForeignTable()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_ForeignTable));
- }
-
- static public Exception ConstraintParentValues()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_ParentValues));
- }
-
- static public Exception ConstraintAddFailed(DataTable table)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_AddFailed, table.TableName));
- }
-
- static public Exception ConstraintRemoveFailed()
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_RemoveFailed));
- }
-
- static public Exception FailedCascadeDelete(string constraint)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_CascadeDelete, constraint));
- }
-
- static public Exception FailedCascadeUpdate(string constraint)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_CascadeUpdate, constraint));
- }
-
- static public Exception FailedClearParentTable(string table, string constraint, string childTable)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_ClearParentTable, table, constraint, childTable));
- }
-
- static public Exception ForeignKeyViolation(string constraint, object[] keys)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_ForeignKeyViolation, constraint, KeysToString(keys)));
- }
-
- static public Exception RemoveParentRow(ForeignKeyConstraint constraint)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataConstraint_RemoveParentRow, constraint.ConstraintName));
- }
-
- static public string MaxLengthViolationText(string columnName)
- {
- return StringsHelper.GetString(Strings.DataColumn_ExceedMaxLength, columnName);
- }
- static public string NotAllowDBNullViolationText(string columnName)
- {
- return StringsHelper.GetString(Strings.DataColumn_NotAllowDBNull, columnName);
- }
-
- static public Exception CantAddConstraintToMultipleNestedTable(string tableName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataConstraint_CantAddConstraintToMultipleNestedTable, tableName));
- }
-
- //
- // DataColumn Set Properties conflicts
- //
-
- static public Exception AutoIncrementAndExpression()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_AutoIncrementAndExpression));
- }
- static public Exception AutoIncrementAndDefaultValue()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_AutoIncrementAndDefaultValue));
- }
- static public Exception AutoIncrementSeed()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_AutoIncrementSeed));
- }
- static public Exception CantChangeDataType()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ChangeDataType));
- }
- static public Exception NullDataType()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_NullDataType));
- }
- static public Exception ColumnNameRequired()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_NameRequired));
- }
- static public Exception DefaultValueAndAutoIncrement()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_DefaultValueAndAutoIncrement));
- }
- static public Exception DefaultValueDataType(string column, Type defaultType, Type columnType, Exception inner)
- {
- if (column.Length == 0)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_DefaultValueDataType1, defaultType.FullName, columnType.FullName), inner);
- }
- else
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_DefaultValueDataType, column, defaultType.FullName, columnType.FullName), inner);
- }
- }
- static public Exception DefaultValueColumnDataType(string column, Type defaultType, Type columnType, Exception inner)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_DefaultValueColumnDataType, column, defaultType.FullName, columnType.FullName), inner);
- }
-
- static public Exception ExpressionAndUnique()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ExpressionAndUnique));
- }
- static public Exception ExpressionAndReadOnly()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ExpressionAndReadOnly));
- }
-
- static public Exception ExpressionAndConstraint(DataColumn column, Constraint constraint)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ExpressionAndConstraint, column.ColumnName, constraint.ConstraintName));
- }
-
- static public Exception ExpressionInConstraint(DataColumn column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ExpressionInConstraint, column.ColumnName));
- }
-
- static public Exception ExpressionCircular()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_ExpressionCircular));
- }
-
- static public Exception NonUniqueValues(string column)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataColumn_NonUniqueValues, column));
- }
-
- static public Exception NullKeyValues(string column)
- {
- return _Data(StringsHelper.GetString(Strings.DataColumn_NullKeyValues, column));
- }
- static public Exception NullValues(string column)
- {
- return _NoNullAllowed(StringsHelper.GetString(Strings.DataColumn_NullValues, column));
- }
-
- static public Exception ReadOnlyAndExpression()
- {
- return _ReadOnly(StringsHelper.GetString(Strings.DataColumn_ReadOnlyAndExpression));
- }
-
- static public Exception ReadOnly(string column)
- {
- return _ReadOnly(StringsHelper.GetString(Strings.DataColumn_ReadOnly, column));
- }
-
- static public Exception UniqueAndExpression()
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_UniqueAndExpression));
- }
-
- static public Exception SetFailed(object value, DataColumn column, Type type, Exception innerException)
- {
- return _Argument(innerException.Message + StringsHelper.GetString(Strings.DataColumn_SetFailed, value.ToString(), column.ColumnName, type.Name), innerException);
- }
-
- static public Exception CannotSetToNull(DataColumn column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotSetToNull, column.ColumnName));
- }
-
- static public Exception LongerThanMaxLength(DataColumn column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_LongerThanMaxLength, column.ColumnName));
- }
-
- static public Exception CannotSetMaxLength(DataColumn column, int value)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotSetMaxLength, column.ColumnName, value.ToString(CultureInfo.InvariantCulture)));
- }
-
- static public Exception CannotSetMaxLength2(DataColumn column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotSetMaxLength2, column.ColumnName));
- }
-
- static public Exception CannotSetSimpleContentType(String columnName, Type type)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotSimpleContentType, columnName, type));
- }
-
- static public Exception CannotSetSimpleContent(String columnName, Type type)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotSimpleContent, columnName, type));
- }
-
- static public Exception CannotChangeNamespace(String columnName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_CannotChangeNamespace, columnName));
- }
-
- static public Exception HasToBeStringType(DataColumn column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_HasToBeStringType, column.ColumnName));
- }
-
- static public Exception AutoIncrementCannotSetIfHasData(string typeName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_AutoIncrementCannotSetIfHasData, typeName));
- }
-
- static public Exception INullableUDTwithoutStaticNull(string typeName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_INullableUDTwithoutStaticNull, typeName));
- }
-
- static public Exception IComparableNotImplemented(string typeName)
- {
- return _Data(StringsHelper.GetString(Strings.DataStorage_IComparableNotDefined, typeName));
- }
-
- static public Exception UDTImplementsIChangeTrackingButNotIRevertible(string typeName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataColumn_UDTImplementsIChangeTrackingButnotIRevertible, typeName));
- }
-
- static public Exception SetAddedAndModifiedCalledOnNonUnchanged()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataColumn_SetAddedAndModifiedCalledOnNonUnchanged));
- }
-
- static public Exception InvalidDataColumnMapping(Type type)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumn_InvalidDataColumnMapping, type.AssemblyQualifiedName));
- }
-
- static public Exception CannotSetDateTimeModeForNonDateTimeColumns()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataColumn_CannotSetDateTimeModeForNonDateTimeColumns));
- }
-
- static public Exception InvalidDateTimeMode(DataSetDateTime mode)
- {
- return _InvalidEnumArgumentException(mode);
- }
-
- static public Exception CantChangeDateTimeMode(DataSetDateTime oldValue, DataSetDateTime newValue)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataColumn_DateTimeMode, oldValue.ToString(), newValue.ToString()));
- }
-
- static public Exception ColumnTypeNotSupported()
- {
- return Microsoft.Data.Common.ADP.NotSupported(StringsHelper.GetString(Strings.DataColumn_NullableTypesNotSupported));
- }
-
- //
- // DataView
- //
-
- static public Exception SetFailed(string name)
- {
- return _Data(StringsHelper.GetString(Strings.DataView_SetFailed, name));
- }
-
- static public Exception SetDataSetFailed()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_SetDataSetFailed));
- }
-
- static public Exception SetRowStateFilter()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_SetRowStateFilter));
- }
-
- static public Exception CanNotSetDataSet()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotSetDataSet));
- }
-
- static public Exception CanNotUseDataViewManager()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotUseDataViewManager));
- }
-
- static public Exception CanNotSetTable()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotSetTable));
- }
-
- static public Exception CanNotUse()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotUse));
- }
-
- static public Exception CanNotBindTable()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotBindTable));
- }
-
- static public Exception SetTable()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_SetTable));
- }
-
- static public Exception SetIListObject()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_SetIListObject));
- }
-
- static public Exception AddNewNotAllowNull()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_AddNewNotAllowNull));
- }
-
- static public Exception NotOpen()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_NotOpen));
- }
-
- static public Exception CreateChildView()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_CreateChildView));
- }
-
- static public Exception CanNotDelete()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotDelete));
- }
-
- static public Exception CanNotEdit()
- {
- return _Data(StringsHelper.GetString(Strings.DataView_CanNotEdit));
- }
-
- static public Exception GetElementIndex(Int32 index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataView_GetElementIndex, (index).ToString(CultureInfo.InvariantCulture)));
- }
-
- static public Exception AddExternalObject()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_AddExternalObject));
- }
-
- static public Exception CanNotClear()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_CanNotClear));
- }
-
- static public Exception InsertExternalObject()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_InsertExternalObject));
- }
-
- static public Exception RemoveExternalObject()
- {
- return _Argument(StringsHelper.GetString(Strings.DataView_RemoveExternalObject));
- }
-
- static public Exception PropertyNotFound(string property, string table)
- {
- return _Argument(StringsHelper.GetString(Strings.DataROWView_PropertyNotFound, property, table));
- }
-
- static public Exception ColumnToSortIsOutOfRange(string column)
- {
- return _Argument(StringsHelper.GetString(Strings.DataColumns_OutOfRange, column));
- }
-
- //
- // Keys
- //
-
- static public Exception KeyTableMismatch()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataKey_TableMismatch));
- }
-
- static public Exception KeyNoColumns()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataKey_NoColumns));
- }
-
- static public Exception KeyTooManyColumns(int cols)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataKey_TooManyColumns, (cols).ToString(CultureInfo.InvariantCulture)));
- }
-
- static public Exception KeyDuplicateColumns(string columnName)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataKey_DuplicateColumns, columnName));
- }
-
- //
- // Relations, constraints
- //
-
- static public Exception RelationDataSetMismatch()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_DataSetMismatch));
- }
-
- static public Exception NoRelationName()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_NoName));
- }
-
- static public Exception ColumnsTypeMismatch()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_ColumnsTypeMismatch));
- }
-
- static public Exception KeyLengthMismatch()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_KeyLengthMismatch));
- }
-
- static public Exception KeyLengthZero()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_KeyZeroLength));
- }
-
- static public Exception ForeignRelation()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_ForeignDataSet));
- }
-
- static public Exception KeyColumnsIdentical()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_KeyColumnsIdentical));
- }
-
- static public Exception RelationForeignTable(string t1, string t2)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_ForeignTable, t1, t2));
- }
-
- static public Exception GetParentRowTableMismatch(string t1, string t2)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_GetParentRowTableMismatch, t1, t2));
- }
-
- static public Exception SetParentRowTableMismatch(string t1, string t2)
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_SetParentRowTableMismatch, t1, t2));
- }
-
- static public Exception RelationForeignRow()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_ForeignRow));
- }
-
- static public Exception RelationNestedReadOnly()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_RelationNestedReadOnly));
- }
-
- static public Exception TableCantBeNestedInTwoTables(string tableName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_TableCantBeNestedInTwoTables, tableName));
- }
-
- static public Exception LoopInNestedRelations(string tableName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_LoopInNestedRelations, tableName));
- }
-
- static public Exception RelationDoesNotExist()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_DoesNotExist));
- }
-
- static public Exception ParentRowNotInTheDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_ParentRowNotInTheDataSet));
- }
-
- static public Exception ParentOrChildColumnsDoNotHaveDataSet()
- {
- return _InvalidConstraint(StringsHelper.GetString(Strings.DataRelation_ParentOrChildColumnsDoNotHaveDataSet));
- }
-
- static public Exception InValidNestedRelation(string childTableName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataRelation_InValidNestedRelation, childTableName));
- }
-
- static public Exception InvalidParentNamespaceinNestedRelation(string childTableName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataRelation_InValidNamespaceInNestedRelation, childTableName));
- }
-
- //
- // Rows
- //
-
- static public Exception RowNotInTheDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_NotInTheDataSet));
- }
-
- static public Exception RowNotInTheTable()
- {
- return _RowNotInTable(StringsHelper.GetString(Strings.DataRow_NotInTheTable));
- }
- static public Exception EditInRowChanging()
- {
- return _InRowChangingEvent(StringsHelper.GetString(Strings.DataRow_EditInRowChanging));
- }
-
- static public Exception EndEditInRowChanging()
- {
- return _InRowChangingEvent(StringsHelper.GetString(Strings.DataRow_EndEditInRowChanging));
- }
-
- static public Exception BeginEditInRowChanging()
- {
- return _InRowChangingEvent(StringsHelper.GetString(Strings.DataRow_BeginEditInRowChanging));
- }
-
- static public Exception CancelEditInRowChanging()
- {
- return _InRowChangingEvent(StringsHelper.GetString(Strings.DataRow_CancelEditInRowChanging));
- }
-
- static public Exception DeleteInRowDeleting()
- {
- return _InRowChangingEvent(StringsHelper.GetString(Strings.DataRow_DeleteInRowDeleting));
- }
-
- static public Exception ValueArrayLength()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_ValuesArrayLength));
- }
-
- static public Exception NoCurrentData()
- {
- return _VersionNotFound(StringsHelper.GetString(Strings.DataRow_NoCurrentData));
- }
-
- static public Exception NoOriginalData()
- {
- return _VersionNotFound(StringsHelper.GetString(Strings.DataRow_NoOriginalData));
- }
-
- static public Exception NoProposedData()
- {
- return _VersionNotFound(StringsHelper.GetString(Strings.DataRow_NoProposedData));
- }
-
- static public Exception RowRemovedFromTheTable()
- {
- return _RowNotInTable(StringsHelper.GetString(Strings.DataRow_RemovedFromTheTable));
- }
-
- static public Exception DeletedRowInaccessible()
- {
- return _DeletedRowInaccessible(StringsHelper.GetString(Strings.DataRow_DeletedRowInaccessible));
- }
-
- static public Exception RowAlreadyDeleted()
- {
- return _DeletedRowInaccessible(StringsHelper.GetString(Strings.DataRow_AlreadyDeleted));
- }
-
- static public Exception RowEmpty()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_Empty));
- }
-
- static public Exception InvalidRowVersion()
- {
- return _Data(StringsHelper.GetString(Strings.DataRow_InvalidVersion));
- }
-
- static public Exception RowOutOfRange()
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRow_RowOutOfRange));
- }
- static public Exception RowOutOfRange(int index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRow_OutOfRange, (index).ToString(CultureInfo.InvariantCulture)));
- }
- static public Exception RowInsertOutOfRange(int index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRow_RowInsertOutOfRange, (index).ToString(CultureInfo.InvariantCulture)));
- }
-
- static public Exception RowInsertTwice(int index, string tableName)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRow_RowInsertTwice, (index).ToString(CultureInfo.InvariantCulture), tableName));
- }
-
- static public Exception RowInsertMissing(string tableName)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRow_RowInsertMissing, tableName));
- }
-
- static public Exception RowAlreadyRemoved()
- {
- return _Data(StringsHelper.GetString(Strings.DataRow_AlreadyRemoved));
- }
-
- static public Exception MultipleParents()
- {
- return _Data(StringsHelper.GetString(Strings.DataRow_MultipleParents));
- }
-
- static public Exception InvalidRowState(DataRowState state)
- {
- return _InvalidEnumArgumentException(state);
- }
-
- static public Exception InvalidRowBitPattern()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_InvalidRowBitPattern));
- }
-
- //
- // DataSet
- //
-
- static internal Exception SetDataSetNameToEmpty()
- {
- return _Argument(StringsHelper.GetString(Strings.DataSet_SetNameToEmpty));
- }
- static internal Exception SetDataSetNameConflicting(string name)
- {
- return _Argument(StringsHelper.GetString(Strings.DataSet_SetDataSetNameConflicting, name));
- }
- static public Exception DataSetUnsupportedSchema(string ns)
- {
- return _Argument(StringsHelper.GetString(Strings.DataSet_UnsupportedSchema, ns));
- }
- static public Exception MergeMissingDefinition(string obj)
- {
- return _Argument(StringsHelper.GetString(Strings.DataMerge_MissingDefinition, obj));
- }
- static public Exception TablesInDifferentSets()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_TablesInDifferentSets));
- }
- static public Exception RelationAlreadyExists()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_AlreadyExists));
- }
- static public Exception RowAlreadyInOtherCollection()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_AlreadyInOtherCollection));
- }
- static public Exception RowAlreadyInTheCollection()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRow_AlreadyInTheCollection));
- }
- static public Exception TableMissingPrimaryKey()
- {
- return _MissingPrimaryKey(StringsHelper.GetString(Strings.DataTable_MissingPrimaryKey));
- }
- static public Exception RecordStateRange()
- {
- return _Argument(StringsHelper.GetString(Strings.DataIndex_RecordStateRange));
- }
- static public Exception IndexKeyLength(int length, int keyLength)
- {
- if (length == 0)
- {
- return _Argument(StringsHelper.GetString(Strings.DataIndex_FindWithoutSortOrder));
- }
- else
- {
- return _Argument(StringsHelper.GetString(Strings.DataIndex_KeyLength, (length).ToString(CultureInfo.InvariantCulture), (keyLength).ToString(CultureInfo.InvariantCulture)));
- }
- }
-
- static public Exception RemovePrimaryKey(DataTable table)
- {
- if (table.TableName.Length == 0)
- {
- return _Argument(StringsHelper.GetString(Strings.DataKey_RemovePrimaryKey));
- }
- else
- {
- return _Argument(StringsHelper.GetString(Strings.DataKey_RemovePrimaryKey1, table.TableName));
- }
- }
- static public Exception RelationAlreadyInOtherDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_AlreadyInOtherDataSet));
- }
- static public Exception RelationAlreadyInTheDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_AlreadyInTheDataSet));
- }
- static public Exception RelationNotInTheDataSet(string relation)
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_NotInTheDataSet, relation));
- }
- static public Exception RelationOutOfRange(object index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataRelation_OutOfRange, Convert.ToString(index, null)));
- }
- static public Exception DuplicateRelation(string relation)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataRelation_DuplicateName, relation));
- }
- static public Exception RelationTableNull()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_TableNull));
- }
- static public Exception RelationDataSetNull()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_TableNull));
- }
- static public Exception RelationTableWasRemoved()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_TableWasRemoved));
- }
- static public Exception ParentTableMismatch()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_ParentTableMismatch));
- }
- static public Exception ChildTableMismatch()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_ChildTableMismatch));
- }
- static public Exception EnforceConstraint()
- {
- return _Constraint(StringsHelper.GetString(Strings.Data_EnforceConstraints));
- }
- static public Exception CaseLocaleMismatch()
- {
- return _Argument(StringsHelper.GetString(Strings.DataRelation_CaseLocaleMismatch));
- }
- static public Exception CannotChangeCaseLocale()
- {
- return CannotChangeCaseLocale(null);
- }
- static public Exception CannotChangeCaseLocale(Exception innerException)
- {
- return _Argument(StringsHelper.GetString(Strings.DataSet_CannotChangeCaseLocale), innerException);
- }
-
- static public Exception CannotChangeSchemaSerializationMode()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataSet_CannotChangeSchemaSerializationMode));
- }
-
- static public Exception InvalidSchemaSerializationMode(Type enumType, string mode)
- {
- return _InvalidEnumArgumentException(StringsHelper.GetString(Strings.ADP_InvalidEnumerationValue, enumType.Name, mode));
- }
-
- static public Exception InvalidRemotingFormat(SerializationFormat mode)
- {
-#if DEBUG
- switch (mode)
- {
- case SerializationFormat.Xml:
- case SerializationFormat.Binary:
- Debug.Assert(false, "valid SerializationFormat " + mode.ToString());
- break;
- }
-#endif
- return _InvalidEnumArgumentException(mode);
- }
-
- //
- // DataTable and DataTableCollection
- //
- static public Exception TableForeignPrimaryKey()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_ForeignPrimaryKey));
- }
- static public Exception TableCannotAddToSimpleContent()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_CannotAddToSimpleContent));
- }
- static public Exception NoTableName()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_NoName));
- }
- static public Exception MultipleTextOnlyColumns()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_MultipleSimpleContentColumns));
- }
- static public Exception InvalidSortString(string sort)
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_InvalidSortString, sort));
- }
- static public Exception DuplicateTableName(string table)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataTable_DuplicateName, table));
- }
- static public Exception DuplicateTableName2(string table, string ns)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataTable_DuplicateName2, table, ns));
- }
- static public Exception SelfnestedDatasetConflictingName(string table)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataTable_SelfnestedDatasetConflictingName, table));
- }
- static public Exception DatasetConflictingName(string table)
- {
- return _DuplicateName(StringsHelper.GetString(Strings.DataTable_DatasetConflictingName, table));
- }
- static public Exception TableAlreadyInOtherDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_AlreadyInOtherDataSet));
- }
- static public Exception TableAlreadyInTheDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_AlreadyInTheDataSet));
- }
- static public Exception TableOutOfRange(int index)
- {
- return _IndexOutOfRange(StringsHelper.GetString(Strings.DataTable_OutOfRange, (index).ToString(CultureInfo.InvariantCulture)));
- }
- static public Exception TableNotInTheDataSet(string table)
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_NotInTheDataSet, table));
- }
- static public Exception TableInRelation()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_InRelation));
- }
- static public Exception TableInConstraint(DataTable table, Constraint constraint)
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_InConstraint, table.TableName, constraint.ConstraintName));
- }
-
- static public Exception CanNotSerializeDataTableHierarchy()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataTable_CanNotSerializeDataTableHierarchy));
- }
-
- static public Exception CanNotRemoteDataTable()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataTable_CanNotRemoteDataTable));
- }
-
- static public Exception CanNotSetRemotingFormat()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_CanNotSetRemotingFormat));
- }
-
- static public Exception CanNotSerializeDataTableWithEmptyName()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataTable_CanNotSerializeDataTableWithEmptyName));
- }
-
- static public Exception TableNotFound(string tableName)
- {
- return _Argument(StringsHelper.GetString(Strings.DataTable_TableNotFound, tableName));
- }
-
-
- static public Exception InvalidStorageType(TypeCode typecode)
- {
- return _Data(StringsHelper.GetString(Strings.DataStorage_InvalidStorageType, ((Enum)typecode).ToString()));
- }
-
- static public Exception RangeArgument(Int32 min, Int32 max)
- {
- return _Argument(StringsHelper.GetString(Strings.Range_Argument, (min).ToString(CultureInfo.InvariantCulture), (max).ToString(CultureInfo.InvariantCulture)));
- }
- static public Exception NullRange()
- {
- return _Data(StringsHelper.GetString(Strings.Range_NullRange));
- }
- static public Exception NegativeMinimumCapacity()
- {
- return _Argument(StringsHelper.GetString(Strings.RecordManager_MinimumCapacity));
- }
- static public Exception ProblematicChars(char charValue)
- {
- string xchar = "0x" + ((UInt16)charValue).ToString("X", CultureInfo.InvariantCulture);
- return _Argument(StringsHelper.GetString(Strings.DataStorage_ProblematicChars, xchar));
- }
-
- static public Exception StorageSetFailed()
- {
- return _Argument(StringsHelper.GetString(Strings.DataStorage_SetInvalidDataType));
- }
-
- //
- // XML schema
- //
- static public Exception SimpleTypeNotSupported()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_SimpleTypeNotSupported));
- }
-
- static public Exception MissingAttribute(string attribute)
- {
- return MissingAttribute(String.Empty, attribute);
- }
-
- static public Exception MissingAttribute(string element, string attribute)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MissingAttribute, element, attribute));
- }
-
- static public Exception InvalidAttributeValue(string name, string value)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_ValueOutOfRange, name, value));
- }
-
- static public Exception AttributeValues(string name, string value1, string value2)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_AttributeValues, name, value1, value2));
- }
-
- static public Exception ElementTypeNotFound(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_ElementTypeNotFound, name));
- }
-
- static public Exception RelationParentNameMissing(string rel)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_RelationParentNameMissing, rel));
- }
-
- static public Exception RelationChildNameMissing(string rel)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_RelationChildNameMissing, rel));
- }
-
- static public Exception RelationTableKeyMissing(string rel)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_RelationTableKeyMissing, rel));
- }
-
- static public Exception RelationChildKeyMissing(string rel)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_RelationChildKeyMissing, rel));
- }
-
- static public Exception UndefinedDatatype(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_UndefinedDatatype, name));
- }
-
- static public Exception DatatypeNotDefined()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_DatatypeNotDefined));
- }
-
- static public Exception MismatchKeyLength()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MismatchKeyLength));
- }
-
- static public Exception InvalidField(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_InvalidField, name));
- }
-
- static public Exception InvalidSelector(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_InvalidSelector, name));
- }
-
- static public Exception CircularComplexType(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_CircularComplexType, name));
- }
-
- static public Exception CannotInstantiateAbstract(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_CannotInstantiateAbstract, name));
- }
-
- static public Exception InvalidKey(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_InvalidKey, name));
- }
-
- static public Exception DiffgramMissingTable(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MissingTable, name));
- }
-
- static public Exception DiffgramMissingSQL()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MissingSQL));
- }
-
- static public Exception DuplicateConstraintRead(string str)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_DuplicateConstraint, str));
- }
-
- static public Exception ColumnTypeConflict(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_ColumnConflict, name));
- }
-
- static public Exception CannotConvert(string name, string type)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_CannotConvert, name, type));
- }
-
- static public Exception InvalidPrefix(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_InvalidPrefix, name));
- }
-
- static public Exception CanNotDeserializeObjectType()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.Xml_CanNotDeserializeObjectType));
- }
-
- static public Exception IsDataSetAttributeMissingInSchema()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_IsDataSetAttributeMissingInSchema));
- }
- static public Exception TooManyIsDataSetAttributeInSchema()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_TooManyIsDataSetAtributeInSchema));
- }
-
- // XML save
- static public Exception NestedCircular(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_NestedCircular, name));
- }
-
- static public Exception MultipleParentRows(string tableQName)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MultipleParentRows, tableQName));
- }
-
- static public Exception PolymorphismNotSupported(string typeName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.Xml_PolymorphismNotSupported, typeName));
- }
-
- static public Exception DataTableInferenceNotSupported()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.Xml_DataTableInferenceNotSupported));
- }
-
- /// throw DataException for multitarget failure
- /// exception from multitarget converter
- /// always thrown
- static internal void ThrowMultipleTargetConverter(Exception innerException)
- {
- string res = (null != innerException) ? Strings.Xml_MultipleTargetConverterError : Strings.Xml_MultipleTargetConverterEmpty;
- ThrowDataException(StringsHelper.GetString(res), innerException);
- }
-
- //
- // Merge
- //
- static public Exception DuplicateDeclaration(string name)
- {
- return _Data(StringsHelper.GetString(Strings.Xml_MergeDuplicateDeclaration, name));
- }
-
-
- //Read Xml data
- static public Exception FoundEntity()
- {
- return _Data(StringsHelper.GetString(Strings.Xml_FoundEntity));
- }
-
- // ATTENTION: name has to be localized string here:
- static public Exception MergeFailed(string name)
- {
- return _Data(name);
- }
-
- // SqlConvert
- static public DataException ConvertFailed(Type type1, Type type2)
- {
- return _Data(StringsHelper.GetString(Strings.SqlConvert_ConvertFailed, type1.FullName, type2.FullName));
- }
-
- // DataTableReader
- static public Exception InvalidDataTableReader(string tableName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataTableReader_InvalidDataTableReader, tableName));
- }
-
- static public Exception DataTableReaderSchemaIsInvalid(string tableName)
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.DataTableReader_SchemaInvalidDataTableReader, tableName));
- }
-
- static public Exception CannotCreateDataReaderOnEmptyDataSet()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTableReader_CannotCreateDataReaderOnEmptyDataSet));
- }
-
- static public Exception DataTableReaderArgumentIsEmpty()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTableReader_DataTableReaderArgumentIsEmpty));
- }
-
- static public Exception ArgumentContainsNullValue()
- {
- return _Argument(StringsHelper.GetString(Strings.DataTableReader_ArgumentContainsNullValue));
- }
-
- static public Exception InvalidCurrentRowInDataTableReader()
- {
- return _DeletedRowInaccessible(StringsHelper.GetString(Strings.DataTableReader_InvalidRowInDataTableReader));
- }
-
- static public Exception EmptyDataTableReader(string tableName)
- {
- return _DeletedRowInaccessible(StringsHelper.GetString(Strings.DataTableReader_DataTableCleared, tableName));
- }
-
- //
- static internal Exception InvalidDuplicateNamedSimpleTypeDeclaration(string stName, string errorStr)
- {
- return _Argument(StringsHelper.GetString(Strings.NamedSimpleType_InvalidDuplicateNamedSimpleTypeDelaration, stName, errorStr));
- }
-
- static public Exception EnumeratorModified()
- {
- return _InvalidOperation(StringsHelper.GetString(Strings.RbTree_EnumerationBroken));
- }
- }// ExceptionBuilder
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/OperationAbortedException.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/OperationAbortedException.cs
deleted file mode 100644
index d6da2aa880..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/OperationAbortedException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Data
-{
- using System;
- using System.Runtime.Serialization;
- using Microsoft.Data.Common;
-
- ///
- [Serializable]
- public sealed class OperationAbortedException : SystemException
- {
- private OperationAbortedException(string message, Exception innerException) : base(message, innerException)
- {
- HResult = HResults.OperationAborted;
- }
-
- private OperationAbortedException(SerializationInfo si, StreamingContext sc) : base(si, sc)
- {
- }
-
- static internal OperationAbortedException Aborted(Exception inner)
- {
- OperationAbortedException e;
- if (inner == null)
- {
- e = new OperationAbortedException(StringsHelper.GetString(Strings.ADP_OperationAborted), null);
- }
- else
- {
- e = new OperationAbortedException(StringsHelper.GetString(Strings.ADP_OperationAbortedExceptionMessage), inner);
- }
- ADP.TraceExceptionAsReturnValue(e);
- return e;
- }
- }
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs
deleted file mode 100644
index cc652a2e1a..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-
-namespace Microsoft.Data.SqlClient
-{
- internal class AlwaysEncryptedAttestationException : Exception
- {
- public AlwaysEncryptedAttestationException(string message, Exception innerException) : base(message, innerException) { }
-
- public AlwaysEncryptedAttestationException(string message) : base(message) { }
-
- public AlwaysEncryptedAttestationException() : base() { }
- }
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
deleted file mode 100644
index 77937a470f..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Runtime.Caching;
-using System.Security.Cryptography;
-using System.Threading;
-
-// Enclave session locking model
-// 1. For doing the enclave attestation, driver makes either 1, 2 or 3 API calls(in order)
-// - GetEnclaveSession
-// - GetAttestationParameters
-// - CreateEnclaveSession
-
-// First API call when an enclave session is cached.
-// First 2 API calls when we are running a non-enclave query with no session cached.
-// All 3 API calls in order when you run an enclave query with no session cached.
-
-// In case if the enclave session is cached and validate(not expired), GetEnclaveSession API returns the SqlEnclaveSession.
-// In case if the enclave session is not cached then driver end up calling GetAttestationParameters and CreateEnclaveSession.
-// Note: When we have non-enclave query, then in those cases we never call CreateEnclaveSession. This is one of main pivot point for designing the below locking model.
-// After the change to the API design, driver passes attestation url and servername during GetEnclaveSession and GetAttestationParameters. The extra correlation ID, such as nonce,
-// will be generated during GetEnclaveSession on demand and be passed back to driver as customData and customDataLength. Later, GetAttestationParameters and CreateEnclaveSession
-// use the customData and customDataLength to do the attestation.
-
-// 2. In case during application start, if app spins of multiple threads at the same time (during stress test or benchmarking) where DB connection is Always encrypted enabled,
-// then with the existing design we end up creating multiple enclave session. Each enclave session adds an extra memory overhead to the system and also it generates multiple calls to attestation
-// service, which customer may be paying for.
-// Current design try to collapse multiple GetEnclaveSession calls into a single call to CreateEnclaveSession.We achieve this goal by introducing a lock in GetEnclaveSession
-// such that when we have some outstanding call doing the attestation, then all the other call to GetEnclaveSession wait for the ongoing attestation loop to complete.
-// To avoid infinite thread starvation, we also added a lock timeout.
-// If the ongoing attestation request completes successfully, then it creates the enclave session and release the lock so that all the subsequent request reads uses the cached value.
-// In cases if the network is extremely slow and the lock timeout expires before the current ongoing attestation complete, in those cases we end up triggering the enclave attestation
-// on the current thread.
-
-// Scenario (1)
-// we have 2 threads, where the both threads require enclave computation.
-// When thread one invokes GetEnclaveSession then it successfully sets the event (as its the first request in the system).
-// Later when the 2nd thread comes along then it gets blocked on sessionLockEvent.WaitOne till attestation on thread 1 completes or event timeout.
-
-// case 1: Attestation on thread 1 completes before event timeout happens
-// In this case thread 1 signal the event after completing the attestation and save the enclave session value.
-// Thread 2 gets the event signaled and read the cache enclave session value and return.
-
-// case 2: Attestation on thread 1 does not complete before lock time happens
-// In this case thread 1 is unable to signal on time. Hence thread 2 starts its own attestation process and reduces the timeout to 0 so that any
-// further request doesn't get block on timeout.
-// If the attestation request on either thread completes it will signal the event and reset the time out to default value.
-// In this case if we have multiple threads (say n threads) waiting for the attestation request to complete and it never completes on the first thread then we end up making n attestation requests.
-
-// Scenario (2)
-// We have 2 threads, where first query on thread 1 does not require enclave computation but subsequent query on thread 1 does, whereas on thread 2 all query needs enclave computation.
-// When thread one invokes GetEnclaveSession then it successfully sets the event (as it the first request in the system).
-// Later when the 2nd thread comes along then it gets blocked on sessionLockEvent.WaitOne till attestation on thread 1 completes or event timeout.
-
-// Running first query on thread 1 while thread 2 waiting (no timeout)
-// In this case thread 1 never signal the event (while running 1st query) as it does not require enclave computation.
-// So thread 2 keeps waiting either for timeout to happen or thread 1 again comes in setup the enclave session to signal it.
-
-// Running second query on thread 1 while thread 2 waiting (no timeout)
-// In this case thread 1 don't have to wait for event as it’s already did it while running 1st query.
-// Now thread 2 keeps waiting either for timeout to happen or thread 1 finish up setting the session.
-
-namespace Microsoft.Data.SqlClient
-{
- internal abstract class EnclaveProviderBase : SqlColumnEncryptionEnclaveProvider
- {
- #region Constants
- private const int NonceSize = 256;
- private const int ThreadRetryCacheTimeoutInMinutes = 10;
- private const int LockTimeoutMaxInMilliseconds = 15 * 1000; // 15 seconds
- #endregion
-
- #region Members
- private static readonly EnclaveSessionCache SessionCache = new EnclaveSessionCache();
-
- private static AutoResetEvent sessionLockEvent = new AutoResetEvent(true);
-
- private static int lockTimeoutInMilliseconds = LockTimeoutMaxInMilliseconds;
-
- private static bool isSessionLockAcquired = false;
-
- private static readonly Object lockUpdateSessionLock = new Object();
-
- // It is used to save the attestation url and nonce value across API calls
- protected static readonly MemoryCache ThreadRetryCache = new MemoryCache("ThreadRetryCache");
- #endregion
-
- #region Public methods
- // Helper method to get the enclave session from the cache if present
- protected void GetEnclaveSessionHelper(EnclaveSessionParameters enclaveSessionParameters, bool shouldGenerateNonce, out SqlEnclaveSession sqlEnclaveSession, out long counter, out byte[] customData, out int customDataLength)
- {
- customData = null;
- customDataLength = 0;
- sqlEnclaveSession = SessionCache.GetEnclaveSession(enclaveSessionParameters, out counter);
-
- if (sqlEnclaveSession == null)
- {
- bool sessionCacheLockTaken = false;
- bool sameThreadRetry = false;
-
- // In case if on some thread we are running SQL workload which don't require attestation, then in those cases we don't want same thread to wait for event to be signaled.
- // hence skipping it
- string retryThreadID = ThreadRetryCache[Thread.CurrentThread.ManagedThreadId.ToString()] as string;
- if (!string.IsNullOrEmpty(retryThreadID))
- {
- sameThreadRetry = true;
- }
- else
- {
- // We are explicitly not signalling the event here, as we want to hold the event till driver calls CreateEnclaveSession
- // If we signal the event now, then multiple thread end up calling GetAttestationParameters which triggers the attestation workflow.
- sessionCacheLockTaken = sessionLockEvent.WaitOne(lockTimeoutInMilliseconds);
-
- if (sessionCacheLockTaken)
- {
- lock (lockUpdateSessionLock)
- {
- isSessionLockAcquired = true;
- }
- }
- }
-
- // In case of multi-threaded application, first thread will set the event and all the subsequent threads will wait here either until the enclave
- // session is created or timeout happens.
- if (sessionCacheLockTaken || sameThreadRetry)
- {
- // While the current thread is waiting for event to be signaled and in the meanwhile we already completed the attestation on different thread
- // then we need to signal the event here
- sqlEnclaveSession = SessionCache.GetEnclaveSession(enclaveSessionParameters, out counter);
- if (sqlEnclaveSession != null && !sameThreadRetry)
- {
- lock (lockUpdateSessionLock)
- {
- isSessionLockAcquired = false;
- sessionLockEvent.Set();
- }
- }
- }
- else
- {
- // In case if we are unable to signal the event, then it represents either
- // 1. On other thread we have an ongoing attestation request which is taking more time may due to slow network or
- // 2. Current workload doesn't require enclave computation due to which driver is not invoking the CreateEnclaveSession, hence sqlEnclaveSession is never set.
- // In both cases we need to reduce the timeout to 0 so that subsequent request should not wait.
- Interlocked.Exchange(ref lockTimeoutInMilliseconds, 0);
- }
-
- if (sqlEnclaveSession == null)
- {
- if (shouldGenerateNonce)
- {
- using (RandomNumberGenerator rng = new RNGCryptoServiceProvider())
- {
- // Client decides to initiate the process of attesting the enclave and to establish a secure session with the enclave.
- // To ensure that server send new attestation request instead of replaying / re-sending the old token, we will create a nonce for current attestation request.
- byte[] nonce = new byte[NonceSize];
- rng.GetBytes(nonce);
- customData = nonce;
- customDataLength = nonce.Length;
- }
- }
-
- if (!sameThreadRetry)
- {
- retryThreadID = Thread.CurrentThread.ManagedThreadId.ToString();
- }
-
- ThreadRetryCache.Set(Thread.CurrentThread.ManagedThreadId.ToString(), retryThreadID, DateTime.UtcNow.AddMinutes(ThreadRetryCacheTimeoutInMinutes));
- }
- }
- }
-
- // Reset the session lock status
- protected void UpdateEnclaveSessionLockStatus(SqlEnclaveSession sqlEnclaveSession)
- {
- // As per current design, we want to minimize the number of create session calls. To acheive this we block all the GetEnclaveSession calls until the first call to
- // GetEnclaveSession -> GetAttestationParameters -> CreateEnclaveSession completes or the event timeout happens.
- // Case 1: When the first request successfully creates the session, then all outstanding GetEnclaveSession will use the current session.
- // Case 2: When the first request unable to create the encalve session (may be due to some error or the first request doesn't require enclave computation) then in those case we set the event timeout to 0.
- if (sqlEnclaveSession != null && isSessionLockAcquired)
- {
- lock (lockUpdateSessionLock)
- {
- if (isSessionLockAcquired)
- {
- isSessionLockAcquired = false;
- Interlocked.Exchange(ref lockTimeoutInMilliseconds, LockTimeoutMaxInMilliseconds);
- sessionLockEvent.Set();
- }
- }
- }
- }
-
- // Helper method to remove the enclave session from the cache
- protected void InvalidateEnclaveSessionHelper(EnclaveSessionParameters enclaveSessionParameters, SqlEnclaveSession enclaveSessionToInvalidate)
- {
- SessionCache.InvalidateSession(enclaveSessionParameters, enclaveSessionToInvalidate);
- }
-
- // Helper method for getting the enclave session from the session cache
- protected SqlEnclaveSession GetEnclaveSessionFromCache(EnclaveSessionParameters enclaveSessionParameters, out long counter)
- {
- return SessionCache.GetEnclaveSession(enclaveSessionParameters, out counter);
- }
-
- // Helper method for adding the enclave session to the session cache
- protected SqlEnclaveSession AddEnclaveSessionToCache(EnclaveSessionParameters enclaveSessionParameters, byte[] sharedSecret, long sessionId, out long counter)
- {
- return SessionCache.CreateSession(enclaveSessionParameters, sharedSecret, sessionId, out counter);
- }
- }
- #endregion
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs
deleted file mode 100644
index 98aacdc635..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Runtime.Caching;
-using System.Threading;
-
-namespace Microsoft.Data.SqlClient
-{
- // Maintains a cache of SqlEnclaveSession instances
- internal class EnclaveSessionCache
- {
- private readonly MemoryCache enclaveMemoryCache = new MemoryCache("EnclaveMemoryCache");
- private readonly Object enclaveCacheLock = new Object();
-
- // Nonce for each message sent by the client to the server to prevent replay attacks by the server,
- // given that for Always Encrypted scenarios, the server is considered an "untrusted" man-in-the-middle.
- private long _counter;
-
- // Cache timeout of 8 hours to be consistent with jwt validity.
- private static int enclaveCacheTimeOutInHours = 8;
-
- // Retrieves a SqlEnclaveSession from the cache
- internal SqlEnclaveSession GetEnclaveSession(EnclaveSessionParameters enclaveSessionParameters, out long counter)
- {
- string cacheKey = GenerateCacheKey(enclaveSessionParameters);
- SqlEnclaveSession enclaveSession = enclaveMemoryCache[cacheKey] as SqlEnclaveSession;
- counter = Interlocked.Increment(ref _counter);
- return enclaveSession;
- }
-
- // Invalidates a SqlEnclaveSession entry in the cache
- internal void InvalidateSession(EnclaveSessionParameters enclaveSessionParameters, SqlEnclaveSession enclaveSessionToInvalidate)
- {
- string cacheKey = GenerateCacheKey(enclaveSessionParameters);
-
- lock (enclaveCacheLock)
- {
- long counter;
- SqlEnclaveSession enclaveSession = GetEnclaveSession(enclaveSessionParameters, out counter);
-
- if (enclaveSession != null && enclaveSession.SessionId == enclaveSessionToInvalidate.SessionId)
- {
- SqlEnclaveSession enclaveSessionRemoved = enclaveMemoryCache.Remove(cacheKey) as SqlEnclaveSession;
- if (enclaveSessionRemoved == null)
- {
- throw new InvalidOperationException(Strings.EnclaveSessionInvalidationFailed);
- }
- }
- }
- }
-
- // Creates a new SqlEnclaveSession and adds it to the cache
- internal SqlEnclaveSession CreateSession(EnclaveSessionParameters enclaveSessionParameters, byte[] sharedSecret, long sessionId, out long counter)
- {
- string cacheKey = GenerateCacheKey(enclaveSessionParameters);
- SqlEnclaveSession enclaveSession = null;
- lock (enclaveCacheLock)
- {
- enclaveSession = new SqlEnclaveSession(sharedSecret, sessionId);
- enclaveMemoryCache.Add(cacheKey, enclaveSession, DateTime.UtcNow.AddHours(enclaveCacheTimeOutInHours));
- counter = Interlocked.Increment(ref _counter);
- }
-
- return enclaveSession;
- }
-
- // Generates the cache key for the enclave session cache
- private string GenerateCacheKey(EnclaveSessionParameters enclaveSessionParameters)
- {
- return (enclaveSessionParameters.ServerName + '+' + enclaveSessionParameters.Database + enclaveSessionParameters.AttestationUrl).ToLowerInvariant();
- }
- }
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
deleted file mode 100644
index 0739fdfa7e..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Runtime.Serialization;
-using Microsoft.Data.Common;
-
-namespace Microsoft.Data.SqlClient.Server
-{
- ///
- [Serializable]
- public sealed class InvalidUdtException : SystemException
- {
-
- internal InvalidUdtException() : base()
- {
- HResult = HResults.InvalidUdt;
- }
-
- internal InvalidUdtException(String message) : base(message)
- {
- HResult = HResults.InvalidUdt;
- }
-
- internal InvalidUdtException(String message, Exception innerException) : base(message, innerException)
- {
- HResult = HResults.InvalidUdt;
- }
-
- private InvalidUdtException(SerializationInfo si, StreamingContext sc) : base(si, sc)
- {
- }
-
- ///
- [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
- public override void GetObjectData(SerializationInfo si, StreamingContext context)
- {
- base.GetObjectData(si, context);
- }
-
- internal static InvalidUdtException Create(Type udtType, string resourceReason)
- {
- string reason = StringsHelper.GetString(resourceReason);
- string message = StringsHelper.GetString(Strings.SqlUdt_InvalidUdtMessage, udtType.FullName, reason);
- InvalidUdtException e = new InvalidUdtException(message);
- ADP.TraceExceptionAsReturnValue(e);
- return e;
- }
- }
-}
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
deleted file mode 100644
index 1604da7740..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Runtime.Caching;
-using System.Text;
-using System.Threading;
-
-namespace Microsoft.Data.SqlClient
-{
- ///
- /// Cache for storing result of signature verification of CMK Metadata
- ///
- internal class ColumnMasterKeyMetadataSignatureVerificationCache
- {
- private const int _cacheSize = 2000; // Cache size in number of entries.
- private const int _cacheTrimThreshold = 300; // Threshold above the cache size when we start trimming.
-
- private const string _className = "ColumnMasterKeyMetadataSignatureVerificationCache";
- private const string _getSignatureVerificationResultMethodName = "GetSignatureVerificationResult";
- private const string _addSignatureVerificationResultMethodName = "AddSignatureVerificationResult";
- private const string _masterkeypathArgumentName = "masterKeyPath";
- private const string _keyStoreNameArgumentName = "keyStoreName";
- private const string _signatureName = "signature";
- private const string _cacheLookupKeySeparator = ":";
-
- private static readonly ColumnMasterKeyMetadataSignatureVerificationCache _signatureVerificationCache = new ColumnMasterKeyMetadataSignatureVerificationCache();
-
- //singleton instance
- internal static ColumnMasterKeyMetadataSignatureVerificationCache Instance { get { return _signatureVerificationCache; } }
-
- private readonly MemoryCache _cache;
- private int _inTrim = 0;
-
- private ColumnMasterKeyMetadataSignatureVerificationCache()
- {
- _cache = new MemoryCache(_className);
- _inTrim = 0;
- }
-
- ///
- /// Get signature verification result for given CMK metadata (KeystoreName, MasterKeyPath, allowEnclaveComputations) and a given signature
- ///
- /// Key Store name for CMK
- /// Key Path for CMK
- /// boolean indicating whether the key can be sent to enclave
- /// Signature for the CMK metadata
- /// null if the data is not found in cache otherwise returns true/false indicating signature verification success/failure
- internal bool? GetSignatureVerificationResult(string keyStoreName, string masterKeyPath, bool allowEnclaveComputations, byte[] signature)
- {
-
- ValidateStringArgumentNotNullOrEmpty(masterKeyPath, _masterkeypathArgumentName, _getSignatureVerificationResultMethodName);
- ValidateStringArgumentNotNullOrEmpty(keyStoreName, _keyStoreNameArgumentName, _getSignatureVerificationResultMethodName);
- ValidateSignatureNotNullOrEmpty(signature, _getSignatureVerificationResultMethodName);
-
- string cacheLookupKey = GetCacheLookupKey(masterKeyPath, allowEnclaveComputations, signature, keyStoreName);
-
- return _cache.Get(cacheLookupKey) as bool?;
- }
-
- ///
- /// Add signature verification result for given CMK metadata (KeystoreName, MasterKeyPath, allowEnclaveComputations) and a given signature in the cache
- ///
- /// Key Store name for CMK
- /// Key Path for CMK
- /// boolean indicating whether the key can be sent to enclave
- /// Signature for the CMK metadata
- /// result indicating signature verification success/failure
- internal void AddSignatureVerificationResult(string keyStoreName, string masterKeyPath, bool allowEnclaveComputations, byte[] signature, bool result)
- {
-
- ValidateStringArgumentNotNullOrEmpty(masterKeyPath, _masterkeypathArgumentName, _addSignatureVerificationResultMethodName);
- ValidateStringArgumentNotNullOrEmpty(keyStoreName, _keyStoreNameArgumentName, _addSignatureVerificationResultMethodName);
- ValidateSignatureNotNullOrEmpty(signature, _addSignatureVerificationResultMethodName);
-
- string cacheLookupKey = GetCacheLookupKey(masterKeyPath, allowEnclaveComputations, signature, keyStoreName);
-
- TrimCacheIfNeeded();
-
- // By default evict after 8 hours.
- _cache.Set(cacheLookupKey, result, DateTimeOffset.UtcNow.AddHours(8));
- }
-
- private void ValidateSignatureNotNullOrEmpty(byte[] signature, string methodName)
- {
- if (signature == null || signature.Length == 0)
- {
- if (null == signature)
- {
- throw SQL.NullArgumentInternal(_signatureName, _className, methodName);
- }
- else
- {
- throw SQL.EmptyArgumentInternal(_signatureName, _className, methodName);
- }
- }
- }
-
- private void ValidateStringArgumentNotNullOrEmpty(string stringArgValue, string stringArgName, string methodName)
- {
- if (string.IsNullOrWhiteSpace(stringArgValue))
- {
- if (null == stringArgValue)
- {
- throw SQL.NullArgumentInternal(stringArgName, _className, methodName);
- }
- else
- {
- throw SQL.EmptyArgumentInternal(stringArgName, _className, methodName);
- }
- }
- }
-
- private void TrimCacheIfNeeded()
- {
- // If the size of the cache exceeds the threshold, set that we are in trimming and trim the cache accordingly.
- long currentCacheSize = _cache.GetCount();
- if ((currentCacheSize > _cacheSize + _cacheTrimThreshold) && (0 == Interlocked.CompareExchange(ref _inTrim, 1, 0)))
- {
- try
- {
- _cache.Trim((int)(((double)(currentCacheSize - _cacheSize) / (double)currentCacheSize) * 100));
- }
- finally
- {
- Interlocked.CompareExchange(ref _inTrim, 0, 1);
- }
- }
- }
-
- private string GetCacheLookupKey(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, string keyStoreName)
- {
- StringBuilder cacheLookupKeyBuilder = new StringBuilder(keyStoreName,
- capacity:
- keyStoreName.Length +
- masterKeyPath.Length +
- SqlSecurityUtility.GetBase64LengthFromByteLength(signature.Length) +
- 3 /*separators*/ +
- 10 /*boolean value + somebuffer*/);
-
- cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
- cacheLookupKeyBuilder.Append(masterKeyPath);
- cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
- cacheLookupKeyBuilder.Append(allowEnclaveComputations);
- cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
- cacheLookupKeyBuilder.Append(Convert.ToBase64String(signature));
- cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
- string cacheLookupKey = cacheLookupKeyBuilder.ToString();
- return cacheLookupKey;
- }
- }
-}
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/DataException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/DataException.cs
similarity index 70%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/DataException.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/DataException.cs
index 4d929e4031..e8a49ffa33 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/DataException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/DataException.cs
@@ -8,12 +8,6 @@
namespace Microsoft.Data
{
- // These functions are major point of localization.
- // We need to have a rules to enforce consistency there.
- // The dangerous point there are the string arguments of the exported (internal) methods.
- // This string can be argument, table or constraint name but never text of exception itself.
- // Make an invariant that all texts of exceptions coming from resources only.
-
internal static class ExceptionBuilder
{
// The class defines the exceptions that are specific to the DataSet.
@@ -25,14 +19,20 @@ internal static class ExceptionBuilder
// The resource Data.txt will ensure proper string text based on the appropriate
// locale.
- static private void TraceException(
- string trace, Exception e)
+ private static void TraceException(string trace, Exception e)
{
Debug.Assert(null != e, "TraceException: null Exception");
if (null != e)
{
SqlClientEventSource.Log.TryAdvancedTraceEvent(trace, e.Message);
- SqlClientEventSource.Log.TryAdvancedTraceEvent(" Environment StackTrace = '{0}'", Environment.StackTrace);
+ try
+ {
+ SqlClientEventSource.Log.TryAdvancedTraceEvent(" Environment StackTrace = '{0}'", Environment.StackTrace);
+ }
+ catch (System.Security.SecurityException)
+ {
+ // if you don't have permission - you don't get the stack trace
+ }
}
}
@@ -41,18 +41,16 @@ internal static void TraceExceptionAsReturnValue(Exception e)
TraceException(" Message='{0}'", e);
}
- //
- // COM+ exceptions
- //
internal static ArgumentException _Argument(string error)
{
ArgumentException e = new ArgumentException(error);
ExceptionBuilder.TraceExceptionAsReturnValue(e);
return e;
}
- public static Exception InvalidOffsetLength()
+
+ internal static Exception InvalidOffsetLength()
{
return _Argument(StringsHelper.GetString(Strings.Data_InvalidOffsetLength));
}
- }// ExceptionBuilder
+ }
}
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/OperationAbortedException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/OperationAbortedException.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/OperationAbortedException.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/OperationAbortedException.cs
index ea94e5405b..537a4ac0a1 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/OperationAbortedException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/OperationAbortedException.cs
@@ -4,10 +4,11 @@
using System;
using System.Runtime.Serialization;
+using Microsoft.Data.Common;
namespace Microsoft.Data
{
- ///
+ ///
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public sealed class OperationAbortedException : SystemException
@@ -32,6 +33,7 @@ internal static OperationAbortedException Aborted(Exception inner)
{
e = new OperationAbortedException(Strings.ADP_OperationAbortedExceptionMessage, inner);
}
+ ADP.TraceExceptionAsReturnValue(e);
return e;
}
}
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedAttestationException.cs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveSessionCache.cs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
similarity index 73%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
index c15bee4e08..8a82a0868f 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/InvalidUdtException.cs
@@ -8,7 +8,7 @@
namespace Microsoft.Data.SqlClient.Server
{
- ///
+ ///
[Serializable]
public sealed class InvalidUdtException : SystemException
{
@@ -33,7 +33,8 @@ private InvalidUdtException(SerializationInfo si, StreamingContext sc) : base(si
{
}
- ///
+ ///
+ [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
public override void GetObjectData(SerializationInfo si, StreamingContext context)
{
base.GetObjectData(si, context);
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs