From 2f502970a6fe1fbc76e2aaaf5b672fc7a2328cde Mon Sep 17 00:00:00 2001 From: Wraith Date: Fri, 14 Jan 2022 20:01:57 +0000 Subject: [PATCH] find replace windows doc paths to unix (#1442) --- .../Data/SqlClient/Server/TriggerAction.cs | 154 +++++++++--------- .../Data/SqlClient/SqlClientPermission.cs | 28 ++-- ...olumnEncryptionCertificateStoreProvider.cs | 12 +- .../SqlColumnEncryptionCngProvider.cs | 12 +- .../SqlColumnEncryptionCspProvider.cs | 12 +- .../Microsoft/Data/SqlClient/SqlConnection.cs | 84 +++++----- .../Data/SqlClient/SqlConnectionHelper.cs | 14 +- .../Microsoft/Data/SqlClient/SqlDataReader.cs | 140 ++++++++-------- .../Data/SqlClient/SqlTransaction.cs | 18 +- .../src/Microsoft/Data/SqlClient/TdsEnums.cs | 34 ++-- .../SqlEnclaveAttestationParameters.Crypto.cs | 10 +- 11 files changed, 259 insertions(+), 259 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/TriggerAction.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/TriggerAction.cs index bf5a789125..1f1b011ee1 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/TriggerAction.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/TriggerAction.cs @@ -106,161 +106,161 @@ internal enum EMDEventType // WHEN ADDING, PLEASE CHECK WITH FILE-OWNER FOR WHICH NUMBERS TO USE. THANKS! }; - /// + /// public enum TriggerAction { - /// + /// Invalid = EMDEventType.x_eet_Invalid, - /// + /// Insert = EMDEventType.x_eet_Insert, - /// + /// Update = EMDEventType.x_eet_Update, - /// + /// Delete = EMDEventType.x_eet_Delete, - /// + /// CreateTable = EMDEventType.x_eet_Create_Table, - /// + /// AlterTable = EMDEventType.x_eet_Alter_Table, - /// + /// DropTable = EMDEventType.x_eet_Drop_Table, - /// + /// CreateIndex = EMDEventType.x_eet_Create_Index, - /// + /// AlterIndex = EMDEventType.x_eet_Alter_Index, - /// + /// DropIndex = EMDEventType.x_eet_Drop_Index, - /// + /// CreateSynonym = EMDEventType.x_eet_Create_Synonym, - /// + /// DropSynonym = EMDEventType.x_eet_Drop_Synonym, - /// + /// CreateSecurityExpression = EMDEventType.x_eet_Create_Secexpr, - /// + /// DropSecurityExpression = EMDEventType.x_eet_Drop_Secexpr, - /// + /// CreateView = EMDEventType.x_eet_Create_View, - /// + /// AlterView = EMDEventType.x_eet_Alter_View, - /// + /// DropView = EMDEventType.x_eet_Drop_View, - /// + /// CreateProcedure = EMDEventType.x_eet_Create_Procedure, - /// + /// AlterProcedure = EMDEventType.x_eet_Alter_Procedure, - /// + /// DropProcedure = EMDEventType.x_eet_Drop_Procedure, - /// + /// CreateFunction = EMDEventType.x_eet_Create_Function, - /// + /// AlterFunction = EMDEventType.x_eet_Alter_Function, - /// + /// DropFunction = EMDEventType.x_eet_Drop_Function, - /// + /// CreateTrigger = EMDEventType.x_eet_Create_Trigger, - /// + /// AlterTrigger = EMDEventType.x_eet_Alter_Trigger, - /// + /// DropTrigger = EMDEventType.x_eet_Drop_Trigger, - /// + /// CreateEventNotification = EMDEventType.x_eet_Create_Event_Notification, - /// + /// DropEventNotification = EMDEventType.x_eet_Drop_Event_Notification, - /// + /// CreateType = EMDEventType.x_eet_Create_Type, // Alter_Type = EMDEventType.x_eet_Alter_Type, - /// + /// DropType = EMDEventType.x_eet_Drop_Type, - /// + /// CreateAssembly = EMDEventType.x_eet_Create_Assembly, - /// + /// AlterAssembly = EMDEventType.x_eet_Alter_Assembly, - /// + /// DropAssembly = EMDEventType.x_eet_Drop_Assembly, - /// + /// CreateUser = EMDEventType.x_eet_Create_User, - /// + /// AlterUser = EMDEventType.x_eet_Alter_User, - /// + /// DropUser = EMDEventType.x_eet_Drop_User, - /// + /// CreateRole = EMDEventType.x_eet_Create_Role, - /// + /// AlterRole = EMDEventType.x_eet_Alter_Role, - /// + /// DropRole = EMDEventType.x_eet_Drop_Role, - /// + /// CreateAppRole = EMDEventType.x_eet_Create_AppRole, - /// + /// AlterAppRole = EMDEventType.x_eet_Alter_AppRole, - /// + /// DropAppRole = EMDEventType.x_eet_Drop_AppRole, - /// + /// CreateSchema = EMDEventType.x_eet_Create_Schema, - /// + /// AlterSchema = EMDEventType.x_eet_Alter_Schema, - /// + /// DropSchema = EMDEventType.x_eet_Drop_Schema, - /// + /// CreateLogin = EMDEventType.x_eet_Create_Login, - /// + /// AlterLogin = EMDEventType.x_eet_Alter_Login, - /// + /// DropLogin = EMDEventType.x_eet_Drop_Login, - /// + /// CreateMsgType = EMDEventType.x_eet_Create_MsgType, - /// + /// DropMsgType = EMDEventType.x_eet_Drop_MsgType, - /// + /// CreateContract = EMDEventType.x_eet_Create_Contract, - /// + /// DropContract = EMDEventType.x_eet_Drop_Contract, - /// + /// CreateQueue = EMDEventType.x_eet_Create_Queue, - /// + /// AlterQueue = EMDEventType.x_eet_Alter_Queue, - /// + /// DropQueue = EMDEventType.x_eet_Drop_Queue, - /// + /// CreateService = EMDEventType.x_eet_Create_Service, - /// + /// AlterService = EMDEventType.x_eet_Alter_Service, - /// + /// DropService = EMDEventType.x_eet_Drop_Service, - /// + /// CreateRoute = EMDEventType.x_eet_Create_Route, - /// + /// AlterRoute = EMDEventType.x_eet_Alter_Route, - /// + /// DropRoute = EMDEventType.x_eet_Drop_Route, - /// + /// GrantStatement = EMDEventType.x_eet_Grant_Statement, - /// + /// DenyStatement = EMDEventType.x_eet_Deny_Statement, - /// + /// RevokeStatement = EMDEventType.x_eet_Revoke_Statement, - /// + /// GrantObject = EMDEventType.x_eet_Grant_Object, - /// + /// DenyObject = EMDEventType.x_eet_Deny_Object, - /// + /// RevokeObject = EMDEventType.x_eet_Revoke_Object, - /// + /// CreateBinding = EMDEventType.x_eet_Create_Binding, - /// + /// AlterBinding = EMDEventType.x_eet_Alter_Binding, - /// + /// DropBinding = EMDEventType.x_eet_Drop_Binding, - /// + /// CreatePartitionFunction = EMDEventType.x_eet_Create_Partition_Function, - /// + /// AlterPartitionFunction = EMDEventType.x_eet_Alter_Partition_Function, - /// + /// DropPartitionFunction = EMDEventType.x_eet_Drop_Partition_Function, - /// + /// CreatePartitionScheme = EMDEventType.x_eet_Create_Partition_Scheme, - /// + /// AlterPartitionScheme = EMDEventType.x_eet_Alter_Partition_Scheme, - /// + /// DropPartitionScheme = EMDEventType.x_eet_Drop_Partition_Scheme, } } diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientPermission.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientPermission.cs index 2d8b080be7..8c497f90d2 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientPermission.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlClientPermission.cs @@ -15,23 +15,23 @@ namespace Microsoft.Data.SqlClient { - /// + /// [Serializable] public sealed class SqlClientPermission : System.Data.Common.DBDataPermission { - /// + /// [Obsolete("SqlClientPermission() has been deprecated. Use the SqlClientPermission(PermissionState.None) constructor. http://go.microsoft.com/fwlink/?linkid=14202", true)] // MDAC 86034 public SqlClientPermission() : this(PermissionState.None) { } - /// + /// public SqlClientPermission(PermissionState state) : base(state) { } - /// + /// [Obsolete("SqlClientPermission(PermissionState state, Boolean allowBlankPassword) has been deprecated. Use the SqlClientPermission(PermissionState.None) constructor. http://go.microsoft.com/fwlink/?linkid=14202", true)] // MDAC 86034 public SqlClientPermission(PermissionState state, bool allowBlankPassword) : this(state) { @@ -61,14 +61,14 @@ internal SqlClientPermission(SqlConnectionString constr) : base(PermissionState. } } - /// + /// public override void Add(string connectionString, string restrictions, KeyRestrictionBehavior behavior) { DBConnectionString constr = new DBConnectionString(connectionString, restrictions, behavior, SqlConnectionString.GetParseSynonyms(), false); AddPermissionEntry(constr); } - /// + /// override public IPermission Copy() { return new SqlClientPermission(this); @@ -126,7 +126,7 @@ private void CopyFrom(SqlClientPermission permission) } } - /// + /// override public IPermission Intersect(IPermission target) { // used during Deny actions if (null == target) @@ -179,7 +179,7 @@ private bool IsEmpty() return flag; } - /// + /// override public bool IsSubsetOf(IPermission target) { if (null == target) @@ -218,7 +218,7 @@ override public bool IsSubsetOf(IPermission target) return subset; } - /// + /// override public IPermission Union(IPermission target) { if (null == target) @@ -281,7 +281,7 @@ private string EncodeXmlValue(string value) // // // - /// + /// override public void FromXml(SecurityElement securityElement) { // code derived from CodeAccessPermission.ValidateElement @@ -344,7 +344,7 @@ override public void FromXml(SecurityElement securityElement) // // // - /// + /// override public SecurityElement ToXml() { Type type = this.GetType(); @@ -410,18 +410,18 @@ private static class XmlStr } - /// + /// [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)] [Serializable] public sealed class SqlClientPermissionAttribute : DBDataPermissionAttribute { - /// + /// public SqlClientPermissionAttribute(SecurityAction action) : base(action) { } - /// + /// override public IPermission CreatePermission() { return new SqlClientPermission(this); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs index bbe7e2f76b..e8dca4c858 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs @@ -10,7 +10,7 @@ namespace Microsoft.Data.SqlClient { - /// + /// public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKeyStoreProvider { // Constants @@ -18,7 +18,7 @@ public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKe // Assumption: Certificate Locations (LocalMachine & CurrentUser), Certificate Store name "My" // Certificate provider name (CertificateStore) dont need to be localized. - /// + /// public const string ProviderName = @"MSSQL_CERTIFICATE_STORE"; /// @@ -56,7 +56,7 @@ public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKe /// private readonly byte[] _version = new byte[] { 0x01 }; - /// + /// public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { // Validate the input parameters @@ -150,7 +150,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e return RSADecrypt(cipherText, certificate); } - /// + /// public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { // Validate the input parameters @@ -240,7 +240,7 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e return encryptedColumnEncryptionKey; } - /// + /// public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { var hash = ComputeMasterKeyMetadataHash(masterKeyPath, allowEnclaveComputations, isSystemOp: false); @@ -253,7 +253,7 @@ public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool al return signature; } - /// + /// public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { var hash = ComputeMasterKeyMetadataHash(masterKeyPath, allowEnclaveComputations, isSystemOp: true); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs index bded38eeee..ad84233197 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs @@ -9,10 +9,10 @@ namespace Microsoft.Data.SqlClient { - /// + /// public class SqlColumnEncryptionCngProvider : SqlColumnEncryptionKeyStoreProvider { - /// + /// public const string ProviderName = @"MSSQL_CNG_STORE"; /// @@ -26,7 +26,7 @@ public class SqlColumnEncryptionCngProvider : SqlColumnEncryptionKeyStoreProvide /// private readonly byte[] _version = new byte[] { 0x01 }; - /// + /// public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { // Validate the input parameters @@ -120,7 +120,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e return RSADecrypt(rsaCngProvider, cipherText); } - /// + /// public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { // Validate the input parameters @@ -210,13 +210,13 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e return encryptedColumnEncryptionKey; } - /// + /// public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw new NotSupportedException(); } - /// + /// public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw new NotSupportedException(); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs index 33996913c2..6296d4005d 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs @@ -10,10 +10,10 @@ namespace Microsoft.Data.SqlClient { - /// + /// public class SqlColumnEncryptionCspProvider : SqlColumnEncryptionKeyStoreProvider { - /// + /// public const string ProviderName = @"MSSQL_CSP_PROVIDER"; /// @@ -30,7 +30,7 @@ public class SqlColumnEncryptionCspProvider : SqlColumnEncryptionKeyStoreProvide /// private readonly byte[] _version = new byte[] { 0x01 }; - /// + /// public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { // Validate the input parameters @@ -124,7 +124,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e return RSADecrypt(rsaProvider, cipherText); } - /// + /// public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { // Validate the input parameters @@ -214,13 +214,13 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e return encryptedColumnEncryptionKey; } - /// + /// public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw new NotSupportedException(); } - /// + /// public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw new NotSupportedException(); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs index 711ac3eaeb..71c9be4cbc 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs @@ -36,7 +36,7 @@ namespace Microsoft.Data.SqlClient using System.Diagnostics.Tracing; using Microsoft.Data.Common; - /// + /// [ DefaultEvent("InfoMessage"), DesignerCategory("") @@ -88,7 +88,7 @@ static private readonly ConcurrentDictionary> _ColumnEncry capacity: 1, comparer: StringComparer.OrdinalIgnoreCase); - /// + /// [ DefaultValue(null), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -101,7 +101,7 @@ static private readonly ConcurrentDictionary> _ColumnEncry /// static private bool _ColumnEncryptionQueryMetadataCacheEnabled = true; - /// + /// [ DefaultValue(null), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -124,7 +124,7 @@ static public bool ColumnEncryptionQueryMetadataCacheEnabled /// static private TimeSpan _ColumnEncryptionKeyCacheTtl = TimeSpan.FromHours(2); - /// + /// [ DefaultValue(null), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -136,7 +136,7 @@ static public TimeSpan ColumnEncryptionKeyCacheTtl set => _ColumnEncryptionKeyCacheTtl = value; } - /// + /// static public void RegisterColumnEncryptionKeyStoreProviders(IDictionary customProviders) { ValidateCustomProviders(customProviders); @@ -340,12 +340,12 @@ public SqlRetryLogicBaseProvider RetryLogicProvider // using SqlConnection.Open() method. internal bool _applyTransientFaultHandling = false; - /// + /// public SqlConnection(string connectionString) : this(connectionString, null) { } - /// + /// public SqlConnection(string connectionString, SqlCredential credential) : this() { ConnectionString = connectionString; // setting connection string first so that ConnectionOption is available @@ -445,7 +445,7 @@ private void CacheConnectionStringProperties() // PUBLIC PROPERTIES // - /// + /// // used to start/stop collection of statistics data and do verify the current state // // devnote: start/stop should not performed using a property since it requires execution of code @@ -683,7 +683,7 @@ internal int ConnectRetryInterval } } - /// + /// override protected DbProviderFactory DbProviderFactory { get @@ -693,7 +693,7 @@ override protected DbProviderFactory DbProviderFactory } // AccessToken: To be used for token based authentication - /// + /// [ Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), @@ -734,7 +734,7 @@ public string AccessToken } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResDescriptionAttribute(StringsHelper.ResourceNames.SqlConnection_ConnectionTimeout), @@ -748,7 +748,7 @@ public int CommandTimeout } } - /// + /// [ DefaultValue(""), #pragma warning disable 618 // ignore obsolete warning about RecommendedAsConfigurable to use SettingsBindableAttribute @@ -814,7 +814,7 @@ override public string ConnectionString } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResDescriptionAttribute(StringsHelper.ResourceNames.SqlConnection_ConnectionTimeout), @@ -828,7 +828,7 @@ override public int ConnectionTimeout } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResDescriptionAttribute(StringsHelper.ResourceNames.SqlConnection_Database), @@ -904,7 +904,7 @@ internal string SQLDNSCachingSupportedStateBeforeRedirect } } - /// + /// [ Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), @@ -930,7 +930,7 @@ override public string DataSource } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -964,7 +964,7 @@ public int PacketSize } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -995,7 +995,7 @@ public Guid ClientConnectionId } } - /// + /// [ Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), @@ -1021,7 +1021,7 @@ public int ServerProcessId GetOpenTdsConnection().ServerProcessId : 0; } - /// + /// [ Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), @@ -1049,7 +1049,7 @@ internal SqlStatistics Statistics } } - /// + /// [ DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_Data), @@ -1079,7 +1079,7 @@ public string WorkstationId } } - /// + /// // SqlCredential: Pair User Id and password in SecureString which are to be used for SQL authentication [ Browsable(false), @@ -1218,7 +1218,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(S // PUBLIC EVENTS // - /// + /// [ ResCategoryAttribute(StringsHelper.ResourceNames.DataCategory_InfoMessage), ResDescriptionAttribute(StringsHelper.ResourceNames.DbConnection_InfoMessage), @@ -1235,7 +1235,7 @@ public event SqlInfoMessageEventHandler InfoMessage } } - /// + /// public bool FireInfoMessageEventOnUserErrors { get @@ -1299,21 +1299,21 @@ internal int ReconnectCount // // PUBLIC METHODS // - /// + /// new public SqlTransaction BeginTransaction() { // this is just a delegate. The actual method tracks executiontime return BeginTransaction(IsolationLevel.Unspecified, null); } - /// + /// new public SqlTransaction BeginTransaction(IsolationLevel iso) { // this is just a delegate. The actual method tracks executiontime return BeginTransaction(iso, null); } - /// + /// public SqlTransaction BeginTransaction(string transactionName) { // Use transaction names only on the outermost pair of nested @@ -1323,7 +1323,7 @@ public SqlTransaction BeginTransaction(string transactionName) return BeginTransaction(IsolationLevel.Unspecified, transactionName); } - /// + /// // suppress this message - we cannot use SafeHandle here. Also, see notes in the code (VSTFDEVDIV# 560355) [SuppressMessage("Microsoft.Reliability", "CA2004:RemoveCallsToGCKeepAlive")] override protected DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) @@ -1343,7 +1343,7 @@ override protected DbTransaction BeginDbTransaction(IsolationLevel isolationLeve } } - /// + /// public SqlTransaction BeginTransaction(IsolationLevel iso, string transactionName) { WaitForPendingReconnection(); @@ -1381,7 +1381,7 @@ public SqlTransaction BeginTransaction(IsolationLevel iso, string transactionNam } } - /// + /// override public void ChangeDatabase(string database) { SqlStatistics statistics = null; @@ -1435,14 +1435,14 @@ override public void ChangeDatabase(string database) } } - /// + /// static public void ClearAllPools() { (new SqlClientPermission(PermissionState.Unrestricted)).Demand(); SqlConnectionFactory.SingletonInstance.ClearAllPools(); } - /// + /// static public void ClearPool(SqlConnection connection) { ADP.CheckArgumentNull(connection, "connection"); @@ -1459,7 +1459,7 @@ static public void ClearPool(SqlConnection connection) } } - /// + /// object ICloneable.Clone() { SqlConnection clone = new SqlConnection(this); @@ -1477,7 +1477,7 @@ void CloseInnerConnection() InnerConnection.CloseConnection(this, ConnectionFactory); } - /// + /// override public void Close() { using (TryEventScope.Create(" {0}", ObjectID)) @@ -1573,7 +1573,7 @@ override public void Close() } } - /// + /// new public SqlCommand CreateCommand() { return new SqlCommand(null, this); @@ -1604,7 +1604,7 @@ private void DisposeMe(bool disposing) } } - /// + /// public void EnlistDistributedTransaction(System.EnterpriseServices.ITransaction transaction) { if (IsContextConnection) @@ -1615,7 +1615,7 @@ public void EnlistDistributedTransaction(System.EnterpriseServices.ITransaction EnlistDistributedTransactionHelper(transaction); } - /// + /// override public void Open() { Open(SqlConnectionOverrides.None); @@ -1881,7 +1881,7 @@ void CancelOpenAndWait() private Task InternalOpenWithRetryAsync(CancellationToken cancellationToken) => RetryLogicProvider.ExecuteAsync(this, () => InternalOpenAsync(cancellationToken), cancellationToken); - /// + /// public override Task OpenAsync(CancellationToken cancellationToken) => IsProviderRetriable ? InternalOpenWithRetryAsync(cancellationToken) : @@ -2664,7 +2664,7 @@ private void IssueSQLDebug(uint option, string machineName, uint pid, uint id, s c.ExecuteNonQuery(); } - /// + /// public static void ChangePassword(string connectionString, string newPassword) { using (TryEventScope.Create("")) @@ -2707,7 +2707,7 @@ public static void ChangePassword(string connectionString, string newPassword) } } - /// + /// public static void ChangePassword(string connectionString, SqlCredential credential, SecureString newSecurePassword) { using (TryEventScope.Create("")) @@ -2816,7 +2816,7 @@ static private void RefreshMemoryMappedData(SqlDebugContext sdc) sdc.data = memMap.rgbData; } - /// + /// public void ResetStatistics() { if (IsContextConnection) @@ -2835,7 +2835,7 @@ public void ResetStatistics() } } - /// + /// public IDictionary RetrieveStatistics() { if (IsContextConnection) @@ -2865,7 +2865,7 @@ private void UpdateStatistics() Statistics.UpdateStatistics(); } - /// + /// public IDictionary RetrieveInternalInfo() { IDictionary internalDictionary = new Dictionary(); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs index eb41758480..07d44f020c 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs @@ -28,7 +28,7 @@ public sealed partial class SqlConnection : DbConnection private static int _objectTypeCount; // EventSource Counter internal readonly int ObjectID = System.Threading.Interlocked.Increment(ref _objectTypeCount); - /// + /// public SqlConnection() : base() { GC.SuppressFinalize(this); @@ -197,7 +197,7 @@ internal void AddWeakReference(object value, int tag) InnerConnection.AddWeakReference(value, tag); } - /// + /// override protected DbCommand CreateDbCommand() { using (TryEventScope.Create(" {0}", ObjectID)) @@ -216,7 +216,7 @@ private static System.Security.CodeAccessPermission CreateExecutePermission() return p; } - /// + /// override protected void Dispose(bool disposing) { if (disposing) @@ -262,7 +262,7 @@ private void EnlistDistributedTransactionHelper(System.EnterpriseServices.ITrans GC.KeepAlive(this); } - /// + /// override public void EnlistTransaction(SysTx.Transaction transaction) { SqlConnection.ExecutePermission.Demand(); @@ -312,19 +312,19 @@ internal DbMetaDataFactory GetMetaDataFactoryInternal(DbConnectionInternal inter return GetMetaDataFactory(internalConnection); } - /// + /// override public DataTable GetSchema() { return this.GetSchema(DbMetaDataCollectionNames.MetaDataCollections, null); } - /// + /// override public DataTable GetSchema(string collectionName) { return this.GetSchema(collectionName, null); } - /// + /// override public DataTable GetSchema(string collectionName, string[] restrictionValues) { // NOTE: This is virtual because not all providers may choose to support diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs index bc16b8d5d1..75f17d565f 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs @@ -24,7 +24,7 @@ namespace Microsoft.Data.SqlClient { - /// + /// public class SqlDataReader : DbDataReader, IDataReader { private enum ALTROWSTATUS @@ -143,7 +143,7 @@ internal SqlCommand Command } } - /// + /// protected SqlConnection Connection { get @@ -152,10 +152,10 @@ protected SqlConnection Connection } } - /// + /// public SensitivityClassification SensitivityClassification { get; internal set; } - /// + /// override public int Depth { get @@ -169,7 +169,7 @@ override public int Depth } } - /// + /// // fields/attributes collection override public int FieldCount { @@ -193,7 +193,7 @@ override public int FieldCount } } - /// + /// override public bool HasRows { get @@ -211,7 +211,7 @@ override public bool HasRows } } - /// + /// override public bool IsClosed { get @@ -404,7 +404,7 @@ internal virtual SmiExtendedMetaData[] GetInternalSmiMetaData() return metaDataReturn; } - /// + /// override public int RecordsAffected { get @@ -444,7 +444,7 @@ internal MultiPartTableName[] TableNames _tableNames = value; } } - /// + /// override public int VisibleFieldCount { get @@ -462,7 +462,7 @@ override public int VisibleFieldCount } } - /// + /// // this operator override public object this[int i] { @@ -472,7 +472,7 @@ override public object this[int i] } } - /// + /// override public object this[string name] { get @@ -950,7 +950,7 @@ protected override void Dispose(bool disposing) } } - /// + /// override public void Close() { SqlStatistics statistics = null; @@ -1381,7 +1381,7 @@ private bool TryConsumeMetaData() return true; } - /// + /// override public string GetDataTypeName(int i) { SqlStatistics statistics = null; @@ -1458,13 +1458,13 @@ virtual internal SqlBuffer.StorageType GetVariantInternalStorageType(int i) return _data[i].VariantInternalStorageType; } - /// + /// override public IEnumerator GetEnumerator() { return new DbEnumerator(this, IsCommandBehavior(CommandBehavior.CloseConnection)); } - /// + /// override public Type GetFieldType(int i) { SqlStatistics statistics = null; @@ -1567,7 +1567,7 @@ virtual internal int GetLocaleId(int i) return lcid; } - /// + /// override public string GetName(int i) { CheckMetaDataIsReady(columnIndex: i); @@ -1576,7 +1576,7 @@ override public string GetName(int i) return _metaData[i].column; } - /// + /// override public Type GetProviderSpecificFieldType(int i) { SqlStatistics statistics = null; @@ -1648,7 +1648,7 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData) return providerSpecificFieldType; } - /// + /// // named field access override public int GetOrdinal(string name) { @@ -1669,19 +1669,19 @@ override public int GetOrdinal(string name) } } - /// + /// override public object GetProviderSpecificValue(int i) { return GetSqlValue(i); } - /// + /// override public int GetProviderSpecificValues(object[] values) { return GetSqlValues(values); } - /// + /// override public DataTable GetSchemaTable() { SqlStatistics statistics = null; @@ -1707,14 +1707,14 @@ override public DataTable GetSchemaTable() } } - /// + /// override public bool GetBoolean(int i) { ReadColumn(i); return _data[i].Boolean; } - /// + /// virtual public XmlReader GetXmlReader(int i) { // NOTE: sql_variant can not contain a XML data type: http://msdn.microsoft.com/en-us/library/ms173829.aspx @@ -1754,7 +1754,7 @@ virtual public XmlReader GetXmlReader(int i) } } - /// + /// override public Stream GetStream(int i) { CheckDataIsReady(columnIndex: i, methodName: "GetStream"); @@ -1802,14 +1802,14 @@ override public Stream GetStream(int i) } } - /// + /// override public byte GetByte(int i) { ReadColumn(i); return _data[i].Byte; } - /// + /// override public long GetBytes(int i, long dataIndex, byte[] buffer, int bufferIndex, int length) { SqlStatistics statistics = null; @@ -2242,7 +2242,7 @@ internal bool TryGetBytesInternalSequential(int i, byte[] buffer, int index, int } } - /// + /// override public TextReader GetTextReader(int i) { CheckDataIsReady(columnIndex: i, methodName: "GetTextReader"); @@ -2312,14 +2312,14 @@ override public TextReader GetTextReader(int i) } } - /// + /// [EditorBrowsableAttribute(EditorBrowsableState.Never)] // MDAC 69508 override public char GetChar(int i) { throw ADP.NotSupported(); } - /// + /// override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIndex, int length) { SqlStatistics statistics = null; @@ -2661,14 +2661,14 @@ internal long GetStreamingXmlChars(int i, long dataIndex, char[] buffer, int buf return cnt; } - /// + /// [EditorBrowsableAttribute(EditorBrowsableState.Never)] // MDAC 69508 IDataReader IDataRecord.GetData(int i) { throw ADP.NotSupported(); } - /// + /// override public DateTime GetDateTime(int i) { ReadColumn(i); @@ -2690,77 +2690,77 @@ override public DateTime GetDateTime(int i) return dt; } - /// + /// override public Decimal GetDecimal(int i) { ReadColumn(i); return _data[i].Decimal; } - /// + /// override public double GetDouble(int i) { ReadColumn(i); return _data[i].Double; } - /// + /// override public float GetFloat(int i) { ReadColumn(i); return _data[i].Single; } - /// + /// override public Guid GetGuid(int i) { ReadColumn(i); return _data[i].Guid; } - /// + /// override public Int16 GetInt16(int i) { ReadColumn(i); return _data[i].Int16; } - /// + /// override public Int32 GetInt32(int i) { ReadColumn(i); return _data[i].Int32; } - /// + /// override public Int64 GetInt64(int i) { ReadColumn(i); return _data[i].Int64; } - /// + /// virtual public SqlBoolean GetSqlBoolean(int i) { ReadColumn(i); return _data[i].SqlBoolean; } - /// + /// virtual public SqlBinary GetSqlBinary(int i) { ReadColumn(i, setTimeout: true, allowPartiallyReadColumn: true); return _data[i].SqlBinary; } - /// + /// virtual public SqlByte GetSqlByte(int i) { ReadColumn(i); return _data[i].SqlByte; } - /// + /// virtual public SqlBytes GetSqlBytes(int i) { ReadColumn(i); @@ -2768,7 +2768,7 @@ virtual public SqlBytes GetSqlBytes(int i) return new SqlBytes(data); } - /// + /// virtual public SqlChars GetSqlChars(int i) { ReadColumn(i); @@ -2785,70 +2785,70 @@ virtual public SqlChars GetSqlChars(int i) return new SqlChars(data); } - /// + /// virtual public SqlDateTime GetSqlDateTime(int i) { ReadColumn(i); return _data[i].SqlDateTime; } - /// + /// virtual public SqlDecimal GetSqlDecimal(int i) { ReadColumn(i); return _data[i].SqlDecimal; } - /// + /// virtual public SqlGuid GetSqlGuid(int i) { ReadColumn(i); return _data[i].SqlGuid; } - /// + /// virtual public SqlDouble GetSqlDouble(int i) { ReadColumn(i); return _data[i].SqlDouble; } - /// + /// virtual public SqlInt16 GetSqlInt16(int i) { ReadColumn(i); return _data[i].SqlInt16; } - /// + /// virtual public SqlInt32 GetSqlInt32(int i) { ReadColumn(i); return _data[i].SqlInt32; } - /// + /// virtual public SqlInt64 GetSqlInt64(int i) { ReadColumn(i); return _data[i].SqlInt64; } - /// + /// virtual public SqlMoney GetSqlMoney(int i) { ReadColumn(i); return _data[i].SqlMoney; } - /// + /// virtual public SqlSingle GetSqlSingle(int i) { ReadColumn(i); return _data[i].SqlSingle; } - /// + /// // UNDONE: need non-unicode SqlString support virtual public SqlString GetSqlString(int i) { @@ -2862,7 +2862,7 @@ virtual public SqlString GetSqlString(int i) return _data[i].SqlString; } - /// + /// virtual public SqlXml GetSqlXml(int i) { ReadColumn(i); @@ -2893,7 +2893,7 @@ virtual public SqlXml GetSqlXml(int i) return sx; } - /// + /// virtual public object GetSqlValue(int i) { SqlStatistics statistics = null; @@ -2979,7 +2979,7 @@ private object GetSqlValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData met } } - /// + /// virtual public int GetSqlValues(object[] values) { SqlStatistics statistics = null; @@ -3008,7 +3008,7 @@ virtual public int GetSqlValues(object[] values) } } - /// + /// override public string GetString(int i) { ReadColumn(i); @@ -3022,7 +3022,7 @@ override public string GetString(int i) return _data[i].String; } - /// + /// override public T GetFieldValue(int i) { SqlStatistics statistics = null; @@ -3039,7 +3039,7 @@ override public T GetFieldValue(int i) } } - /// + /// override public object GetValue(int i) { SqlStatistics statistics = null; @@ -3056,7 +3056,7 @@ override public object GetValue(int i) } } - /// + /// virtual public TimeSpan GetTimeSpan(int i) { ReadColumn(i); @@ -3078,7 +3078,7 @@ virtual public TimeSpan GetTimeSpan(int i) return t; } - /// + /// virtual public DateTimeOffset GetDateTimeOffset(int i) { ReadColumn(i); @@ -3381,7 +3381,7 @@ private T GetFieldValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData met } } - /// + /// override public int GetValues(object[] values) { SqlStatistics statistics = null; @@ -3668,7 +3668,7 @@ private bool IsRowToken(byte token) return TdsEnums.SQLROW == token || TdsEnums.SQLNBCROW == token; } - /// + /// override public bool IsDBNull(int i) { if ((IsCommandBehavior(CommandBehavior.SequentialAccess)) && ((_sharedState._nextColumnHeaderToRead > i + 1) || (_lastColumnWithDataChunkRead > i))) @@ -3693,13 +3693,13 @@ override public bool IsDBNull(int i) return _data[i].IsNull; } - /// + /// protected internal bool IsCommandBehavior(CommandBehavior condition) { return (condition == (condition & _commandBehavior)); } - /// + /// override public bool NextResult() { if (_currentTask != null) @@ -3905,7 +3905,7 @@ private bool TryNextResult(out bool more) } } - /// + /// // user must call Read() to position on the first row override public bool Read() { @@ -4979,7 +4979,7 @@ private void AssertReaderState(bool requireData, bool permitAsync, int? columnIn } } - /// + /// public override Task NextResultAsync(CancellationToken cancellationToken) { using (TryEventScope.Create(" {0}", ObjectID)) @@ -5316,7 +5316,7 @@ out bytesRead return null; } - /// + /// public override Task ReadAsync(CancellationToken cancellationToken) { using (TryEventScope.Create(" {0}", ObjectID)) @@ -5492,7 +5492,7 @@ private void SetCachedReadAsyncCallContext(ReadAsyncCallContext instance) Interlocked.CompareExchange(ref _cachedReadAsyncContext, instance, null); } - /// + /// override public Task IsDBNullAsync(int i, CancellationToken cancellationToken) { @@ -5630,7 +5630,7 @@ private void SetCachedIDBNullAsyncCallContext(IsDBNullAsyncCallContext instance) Interlocked.CompareExchange(ref _cachedIsDBNullContext, instance, null); } - /// + /// override public Task GetFieldValueAsync(int i, CancellationToken cancellationToken) { try diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlTransaction.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlTransaction.cs index f344f9cdba..6b10dc40ef 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlTransaction.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlTransaction.cs @@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient { - /// + /// public sealed class SqlTransaction : DbTransaction { private static int _objectTypeCount; // EventSource Counter @@ -48,7 +48,7 @@ internal SqlTransaction(SqlInternalConnection internalConnection, SqlConnection // PROPERTIES //////////////////////////////////////////////////////////////////////////////////////// - /// + /// new public SqlConnection Connection { // MDAC 66655 get @@ -64,7 +64,7 @@ internal SqlTransaction(SqlInternalConnection internalConnection, SqlConnection } } - /// + /// override protected DbConnection DbConnection { get @@ -81,7 +81,7 @@ internal SqlInternalTransaction InternalTransaction } } - /// + /// override public IsolationLevel IsolationLevel { get @@ -134,7 +134,7 @@ internal SqlStatistics Statistics // PUBLIC METHODS //////////////////////////////////////////////////////////////////////////////////////// - /// + /// override public void Commit() { SqlConnection.ExecutePermission.Demand(); // MDAC 81476 @@ -211,7 +211,7 @@ override public void Commit() } } - /// + /// protected override void Dispose(bool disposing) { if (disposing) @@ -263,7 +263,7 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } - /// + /// override public void Rollback() { if (Is2005PartialZombie) @@ -336,7 +336,7 @@ override public void Rollback() } } - /// + /// public void Rollback(string transactionName) { SqlConnection.ExecutePermission.Demand(); // MDAC 81476 @@ -399,7 +399,7 @@ public void Rollback(string transactionName) } } - /// + /// public void Save(string savePointName) { SqlConnection.ExecutePermission.Demand(); // MDAC 81476 diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs index b30b57154e..9dcba442eb 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs @@ -1024,13 +1024,13 @@ internal enum SniContext Snix_SendRows, } - /// + /// public enum SqlConnectionColumnEncryptionSetting { - /// + /// Disabled = 0, - /// + /// Enabled, } @@ -1044,50 +1044,50 @@ public enum SqlConnectionOverrides OpenWithoutRetry = 1, } - /// + /// public enum SqlCommandColumnEncryptionSetting { - /// + /// UseConnectionSetting = 0, - /// + /// Enabled, - /// + /// ResultSetOnly, - /// + /// Disabled, } - /// + /// public enum SqlConnectionAttestationProtocol { - /// + /// NotSpecified = 0, - /// + /// AAS = 1, #if ENCLAVE_SIMULATOR - /// + /// SIM = 2, #endif - /// + /// HGS = 3 } - /// + /// public enum SqlConnectionIPAddressPreference { - /// + /// IPv4First = 0, // default - /// + /// IPv6First = 1, - /// + /// UsePlatformDefault = 2 } diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlEnclaveAttestationParameters.Crypto.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlEnclaveAttestationParameters.Crypto.cs index 06262b364f..c2e9739237 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlEnclaveAttestationParameters.Crypto.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlEnclaveAttestationParameters.Crypto.cs @@ -7,12 +7,12 @@ namespace Microsoft.Data.SqlClient { - /// + /// internal class SqlEnclaveAttestationParameters { private readonly byte[] _input; - /// + /// internal SqlEnclaveAttestationParameters(int protocol, byte[] input, ECDiffieHellman clientDiffieHellmanKey) { if (input == null) @@ -29,13 +29,13 @@ internal SqlEnclaveAttestationParameters(int protocol, byte[] input, ECDiffieHel ClientDiffieHellmanKey = clientDiffieHellmanKey; } - /// + /// internal int Protocol { get; private set; } - /// + /// internal ECDiffieHellman ClientDiffieHellmanKey { get; private set; } - /// + /// internal byte[] GetInput() { // return a new array for safety so the caller cannot mutate the original