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 f4e49c1ccb..dd20f91aa4 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -582,6 +582,9 @@
Microsoft\Data\SqlClient\SqlCommand.cs
+
+ Microsoft\Data\SqlClient\SqlCommand.Encryption.cs
+
Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
index 7a0491ad0f..eaf34d17e3 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
@@ -27,67 +27,17 @@ public sealed partial class SqlCommand : DbCommand, ICloneable
{
private const int MaxRPCNameLength = 1046;
- ///
- /// Indicates if the column encryption setting was set at-least once in the batch rpc mode, when using AddBatchCommand.
- ///
- private bool _wasBatchModeColumnEncryptionSettingSetOnce;
-
-#if DEBUG
- ///
- /// Force the client to sleep during sp_describe_parameter_encryption in the function TryFetchInputParameterEncryptionInfo.
- ///
- private static bool _sleepDuringTryFetchInputParameterEncryptionInfo = false;
-
- ///
- /// Force the client to sleep during sp_describe_parameter_encryption in the function RunExecuteReaderTds.
- ///
- private static bool _sleepDuringRunExecuteReaderTdsForSpDescribeParameterEncryption = false;
-
- ///
- /// Force the client to sleep during sp_describe_parameter_encryption after ReadDescribeEncryptionParameterResults.
- ///
- private static bool _sleepAfterReadDescribeEncryptionParameterResults = false;
-
- ///
- /// Internal flag for testing purposes that forces all queries to internally end async calls.
- ///
- private static bool _forceInternalEndQuery = false;
-
- ///
- /// Internal flag for testing purposes that forces one RetryableEnclaveQueryExecutionException during GenerateEnclavePackage
- ///
- private static bool _forceRetryableEnclaveQueryExecutionExceptionDuringGenerateEnclavePackage = false;
-#endif
-
private static readonly SqlDiagnosticListener s_diagnosticListener = new SqlDiagnosticListener();
private bool _parentOperationStarted = false;
internal static readonly Action