diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.NetCoreApp.cs b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.NetCoreApp.cs
index d509a52ee6..1fb5b0345d 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.NetCoreApp.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.NetCoreApp.cs
@@ -51,145 +51,6 @@ public sealed partial class SqlConnectionStringBuilder : System.Data.Common.DbCo
[System.ComponentModel.DisplayNameAttribute("Pool Blocking Period")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public PoolBlockingPeriod PoolBlockingPeriod { get { throw null; } set { } }
- ///
- [System.ComponentModel.DisplayNameAttribute("Column Encryption Setting")]
- [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
- public Microsoft.Data.SqlClient.SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } set { } }
- ///
- [System.ComponentModel.DisplayNameAttribute("Enclave Attestation Url")]
- [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
- public string EnclaveAttestationUrl { get { throw null; } set { } }
- ///
- [System.ComponentModel.DisplayNameAttribute("Attestation Protocol")]
- [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
- public Microsoft.Data.SqlClient.SqlConnectionAttestationProtocol AttestationProtocol {get { throw null; } set { } }
- }
- ///
- public sealed partial class SqlParameter : System.Data.Common.DbParameter, System.ICloneable, System.Data.IDataParameter, System.Data.IDbDataParameter
- {
- ///
- public bool ForceColumnEncryption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
- }
- ///
- public enum SqlCommandColumnEncryptionSetting
- {
- ///
- Disabled = 3,
- ///
- Enabled = 1,
- ///
- ResultSetOnly = 2,
- ///
- UseConnectionSetting = 0,
- }
- public sealed partial class SqlCommand : System.Data.Common.DbCommand, System.ICloneable
- {
- ///
- public SqlCommand(string cmdText, Microsoft.Data.SqlClient.SqlConnection connection, Microsoft.Data.SqlClient.SqlTransaction transaction, Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting columnEncryptionSetting) { }
- ///
- [System.ComponentModel.BrowsableAttribute(false)]
- [System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
- public Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } }
- }
- public sealed partial class SqlConnection : System.Data.Common.DbConnection, System.ICloneable
- {
- ///
- public static System.TimeSpan ColumnEncryptionKeyCacheTtl { get { throw null; } set { } }
- ///
- public static bool ColumnEncryptionQueryMetadataCacheEnabled { get { throw null; } set { } }
- ///
- public static System.Collections.Generic.IDictionary> ColumnEncryptionTrustedMasterKeyPaths { get { throw null; } }
- ///
- public static void RegisterColumnEncryptionKeyStoreProviders(System.Collections.Generic.IDictionary customProviders) { }
- }
- ///
- public enum SqlConnectionColumnEncryptionSetting
- {
- ///
- Disabled = 0,
- ///
- Enabled = 1,
- }
-
- ///
- public enum SqlConnectionAttestationProtocol
- {
- ///
- NotSpecified = 0,
-
- ///
- AAS = 1,
-
-#if ENCLAVE_SIMULATOR
- ///
- SIM = 2,
-#endif
-
- ///
- HGS = 3
- }
-
- ///
- public partial class SqlColumnEncryptionCertificateStoreProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
- {
- ///
- public const string ProviderName = "MSSQL_CERTIFICATE_STORE";
- ///
- public SqlColumnEncryptionCertificateStoreProvider() { }
- ///
- public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
- ///
- public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
- ///
- public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
- ///
- public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
- }
- ///
- public partial class SqlColumnEncryptionCngProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
- {
- ///
- public const string ProviderName = "MSSQL_CNG_STORE";
- ///
- public SqlColumnEncryptionCngProvider() { }
- ///
- public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
- ///
- public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
- ///
- public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
- ///
- public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
- }
- ///
- public partial class SqlColumnEncryptionCspProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
- {
- ///
- public const string ProviderName = "MSSQL_CSP_PROVIDER";
- ///
- public SqlColumnEncryptionCspProvider() { }
- ///
- public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
- ///
- public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
- ///
- public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
- ///
- public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
- }
- ///
- public abstract partial class SqlColumnEncryptionKeyStoreProvider
- {
- ///
- protected SqlColumnEncryptionKeyStoreProvider() { }
- ///
- public abstract byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey);
- ///
- public abstract byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey);
- ///
- public virtual byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
- ///
- public virtual bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
}
}
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
index 66ad7c3679..88603b59ab 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
@@ -375,6 +375,99 @@ public static partial class SqlClientMetaDataCollectionNames
///
public static readonly string ColumnSetColumns;
}
+#if NETCOREAPP || NETSTANDARD21_AND_ABOVE
+ ///
+ public enum SqlConnectionAttestationProtocol
+ {
+ ///
+ NotSpecified = 0,
+
+ ///
+ AAS = 1,
+
+#if ENCLAVE_SIMULATOR
+ ///
+ SIM = 2,
+#endif
+
+ ///
+ HGS = 3
+ }
+#endif
+ ///
+ public partial class SqlColumnEncryptionCertificateStoreProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
+ {
+ ///
+ public const string ProviderName = "MSSQL_CERTIFICATE_STORE";
+ ///
+ public SqlColumnEncryptionCertificateStoreProvider() { }
+ ///
+ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
+ ///
+ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
+ ///
+ public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
+ ///
+ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
+ }
+ ///
+ public partial class SqlColumnEncryptionCngProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
+ {
+ ///
+ public const string ProviderName = "MSSQL_CNG_STORE";
+ ///
+ public SqlColumnEncryptionCngProvider() { }
+ ///
+ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
+ ///
+ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
+ ///
+ public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
+ ///
+ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
+ }
+ ///
+ public partial class SqlColumnEncryptionCspProvider : Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider
+ {
+ ///
+ public const string ProviderName = "MSSQL_CSP_PROVIDER";
+ ///
+ public SqlColumnEncryptionCspProvider() { }
+ ///
+ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) { throw null; }
+ ///
+ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) { throw null; }
+ ///
+ public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
+ ///
+ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
+ }
+ ///
+ public abstract partial class SqlColumnEncryptionKeyStoreProvider
+ {
+ ///
+ protected SqlColumnEncryptionKeyStoreProvider() { }
+ ///
+ public abstract byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey);
+ ///
+ public abstract byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey);
+ ///
+ public virtual byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
+ ///
+ public virtual bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
+ }
+ ///
+ public enum SqlCommandColumnEncryptionSetting
+ {
+ ///
+ Disabled = 3,
+ ///
+ Enabled = 1,
+ ///
+ ResultSetOnly = 2,
+ ///
+ UseConnectionSetting = 0,
+ }
///
[System.ComponentModel.DefaultEventAttribute("RecordsAffected")]
[System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
@@ -389,6 +482,12 @@ public SqlCommand(string cmdText) { }
public SqlCommand(string cmdText, Microsoft.Data.SqlClient.SqlConnection connection) { }
///
public SqlCommand(string cmdText, Microsoft.Data.SqlClient.SqlConnection connection, Microsoft.Data.SqlClient.SqlTransaction transaction) { }
+ ///
+ public SqlCommand(string cmdText, Microsoft.Data.SqlClient.SqlConnection connection, Microsoft.Data.SqlClient.SqlTransaction transaction, Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting columnEncryptionSetting) { }
+ ///
+ [System.ComponentModel.BrowsableAttribute(false)]
+ [System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
+ public Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } }
///
[System.ComponentModel.DefaultValueAttribute("")]
[System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.SQL.Design.SqlCommandTextEditor, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
@@ -576,6 +675,14 @@ public SqlConnection() { }
public SqlConnection(string connectionString) { }
///
public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCredential credential) { }
+ ///
+ public static System.TimeSpan ColumnEncryptionKeyCacheTtl { get { throw null; } set { } }
+ ///
+ public static bool ColumnEncryptionQueryMetadataCacheEnabled { get { throw null; } set { } }
+ ///
+ public static System.Collections.Generic.IDictionary> ColumnEncryptionTrustedMasterKeyPaths { get { throw null; } }
+ ///
+ public static void RegisterColumnEncryptionKeyStoreProviders(System.Collections.Generic.IDictionary customProviders) { }
///
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
@@ -688,6 +795,14 @@ public void ResetStatistics() { }
///
public System.Collections.Generic.IDictionary RetrieveInternalInfo() { throw null; }
}
+ ///
+ public enum SqlConnectionColumnEncryptionSetting
+ {
+ ///
+ Disabled = 0,
+ ///
+ Enabled = 1,
+ }
///
public enum SqlConnectionOverrides
{
@@ -721,6 +836,10 @@ public SqlConnectionStringBuilder(string connectionString) { }
[System.ComponentModel.DisplayNameAttribute("Authentication")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public Microsoft.Data.SqlClient.SqlAuthenticationMethod Authentication { get { throw null; } set { } }
+ ///
+ [System.ComponentModel.DisplayNameAttribute("Column Encryption Setting")]
+ [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
+ public Microsoft.Data.SqlClient.SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } set { } }
///
[System.ComponentModel.DisplayNameAttribute("Command Timeout")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
@@ -745,6 +864,16 @@ public SqlConnectionStringBuilder(string connectionString) { }
[System.ComponentModel.DisplayNameAttribute("Data Source")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public string DataSource { get { throw null; } set { } }
+#if NETCOREAPP || NETSTANDARD21_AND_ABOVE
+ ///
+ [System.ComponentModel.DisplayNameAttribute("Attestation Protocol")]
+ [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
+ public Microsoft.Data.SqlClient.SqlConnectionAttestationProtocol AttestationProtocol { get { throw null; } set { } }
+ ///
+ [System.ComponentModel.DisplayNameAttribute("Enclave Attestation Url")]
+ [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
+ public string EnclaveAttestationUrl { get { throw null; } set { } }
+#endif
///
[System.ComponentModel.DisplayNameAttribute("Encrypt")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
@@ -1279,6 +1408,8 @@ public SqlParameter(string parameterName, object value) { }
///
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public override System.Data.ParameterDirection Direction { get { throw null; } set { } }
+ ///
+ public bool ForceColumnEncryption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
///
[System.ComponentModel.DefaultValueAttribute(false)]
public override bool IsNullable { get { throw null; } set { } }
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index 0902edd7c1..9a6db6b167 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -12,6 +12,12 @@
netstandard
AnyCPU;x64;x86
+
+ $(DefineConstants);NETSTANDARD21_AND_ABOVE
+
+
+ $(DefineConstants);NETCOREAPP
+
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 5a876abd6b..b602857563 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -20,13 +20,13 @@
Core $(BaseProduct)
- $(DefineConstants);netcoreapp;
+ $(DefineConstants);NETCOREAPP;
- $(DefineConstants);netstandard;
+ $(DefineConstants);NETSTANDARD;
-
- $(DefineConstants);NETCORE3
+
+ $(DefineConstants);NETCOREAPP31_AND_ABOVE
portable
@@ -234,15 +234,6 @@
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
@@ -272,6 +263,15 @@
+
+ Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveProviderBase.cs
+
+
+ Microsoft\Data\SqlClient\EnclaveSessionCache.cs
+
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs
index ee9544b4ce..eb23fcdfef 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs
@@ -780,7 +780,7 @@ internal static partial class DbConnectionStringKeywords
internal const string MaxPoolSize = "Max Pool Size";
internal const string Pooling = "Pooling";
internal const string MinPoolSize = "Min Pool Size";
-#if netcoreapp
+#if NETCOREAPP
internal const string PoolBlockingPeriod = "Pool Blocking Period";
#endif
}
@@ -839,7 +839,7 @@ internal static class DbConnectionStringSynonyms
internal const string NET = "net";
internal const string NETWORK = "network";
-#if netcoreapp
+#if NETCOREAPP
//internal const string PoolBlockingPeriod = POOLBLOCKINGPERIOD;
internal const string POOLBLOCKINGPERIOD = "PoolBlockingPeriod";
#endif
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs
index 9099427e7f..b072a4fa01 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs
@@ -815,7 +815,7 @@ public override void KillConnection()
internal static void SetKeepAliveValues(ref Socket socket)
{
-#if NETCORE3
+#if NETCOREAPP31_AND_ABOVE
socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1);
socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30);
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
index ae7db9afeb..1b9001c8ee 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -2532,7 +2532,7 @@ private void SetCachedCommandExecuteReaderAsyncContext(ExecuteReaderAsyncCallCon
}
}
- ///
+ ///
public override Task