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 d1dd14f6b7..1cc249d23e 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -570,6 +570,9 @@
Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs
+
+ Microsoft\Data\SqlClient\SqlCommand.cs
+
Microsoft\Data\SqlClient\SqlCommandSet.cs
@@ -799,7 +802,7 @@
System\Diagnostics\CodeAnalysis.cs
-
+
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.netcore.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
rename to src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
index f4f38dbe73..0d7dbaf00f 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
@@ -26,16 +26,10 @@
// New attributes that are designed to work with Microsoft.Data.SqlClient and are publicly documented should be included in future.
namespace Microsoft.Data.SqlClient
{
- ///
- [DefaultEvent("RecordsAffected")]
- [ToolboxItem(true)]
- [DesignerCategory("")]
// TODO: Add designer attribute when Microsoft.VSDesigner.Data.VS.SqlCommandDesigner uses Microsoft.Data.SqlClient
public sealed partial class SqlCommand : DbCommand, ICloneable
{
- private static int _objectTypeCount; // EventSource Counter
private const int MaxRPCNameLength = 1046;
- internal readonly int ObjectID = Interlocked.Increment(ref _objectTypeCount);
internal sealed class ExecuteReaderAsyncCallContext : AAsyncCallContext
{
@@ -113,8 +107,6 @@ protected override void AfterCleared(SqlCommand owner)
}
}
- private string _commandText;
- private CommandType _commandType;
private int? _commandTimeout;
private UpdateRowSource _updatedRowSource = UpdateRowSource.Both;
private bool _designTimeInvisible;
@@ -164,39 +156,18 @@ protected override void AfterCleared(SqlCommand owner)
private bool _parentOperationStarted = false;
internal static readonly Action