From 0b8f24554853d629cbb7d0925350e8e357ce291f Mon Sep 17 00:00:00 2001 From: Johnny Pham Date: Tue, 22 Jun 2021 11:57:49 -0700 Subject: [PATCH 1/5] remove designer attribute --- .../netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs index 19fd0902f3..951fc554a3 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs @@ -32,8 +32,8 @@ namespace Microsoft.Data.SqlClient [ DefaultEvent("RecordsAffected"), ToolboxItem(true), - Designer("Microsoft.VSDesigner.Data.VS.SqlCommandDesigner, " + AssemblyRef.MicrosoftVSDesigner), DesignerCategory("") + // TODO: Add designer attribute when Microsoft.VSDesigner.Data.VS.SqlCommandDesigner uses Microsoft.Data.SqlClient ] public sealed class SqlCommand : DbCommand, ICloneable { From 65af28f325d45f40c2e873525ea1cdd3e713a18b Mon Sep 17 00:00:00 2001 From: Johnny Pham Date: Tue, 22 Jun 2021 12:50:20 -0700 Subject: [PATCH 2/5] remove designer and toolboxitem attribute from sqldataadapter --- .../netfx/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs index 0e223df8ba..c423fd8240 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs @@ -14,9 +14,8 @@ namespace Microsoft.Data.SqlClient /// [ DefaultEvent("RowUpdated"), - ToolboxItem("Microsoft.VSDesigner.Data.VS.SqlDataAdapterToolboxItem, " + AssemblyRef.MicrosoftVSDesigner), - Designer("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, " + AssemblyRef.MicrosoftVSDesigner), DesignerCategory("") + // TODO: Add designer and toolbox attribute when Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner uses Microsoft.Data.SqlClient ] public sealed class SqlDataAdapter : DbDataAdapter, IDbDataAdapter, ICloneable { From 35ae0360e1afd5a8eca2f293cfc17cf7a2b99ec9 Mon Sep 17 00:00:00 2001 From: Johnny Pham Date: Tue, 22 Jun 2021 12:54:11 -0700 Subject: [PATCH 3/5] remove from refs --- .../netfx/ref/Microsoft.Data.SqlClient.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs index 9b77d05d7e..36590c9a49 100644 --- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs +++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs @@ -511,7 +511,6 @@ public abstract partial class SqlColumnEncryptionKeyStoreProvider } /// [System.ComponentModel.DefaultEventAttribute("RecordsAffected")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class SqlCommand : System.Data.Common.DbCommand, System.ICloneable { @@ -1125,8 +1124,6 @@ public sealed class SqlCredential } /// [System.ComponentModel.DefaultEventAttribute("RowUpdated")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] - [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed partial class SqlDataAdapter : System.Data.Common.DbDataAdapter, System.Data.IDataAdapter, System.Data.IDbDataAdapter, System.ICloneable { /// From 49738789b0ac91cd32a6942a5c6adc3d68e254ca Mon Sep 17 00:00:00 2001 From: Johnny Pham Date: Wed, 23 Jun 2021 10:24:41 -0700 Subject: [PATCH 4/5] remove from netcore refs --- .../netcore/ref/Microsoft.Data.SqlClient.cs | 3 --- 1 file changed, 3 deletions(-) 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 80069a220f..b8c4c8a15e 100644 --- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs +++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs @@ -490,7 +490,6 @@ public enum SqlCommandColumnEncryptionSetting } /// [System.ComponentModel.DefaultEventAttribute("RecordsAffected")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class SqlCommand : System.Data.Common.DbCommand, System.ICloneable { @@ -1021,8 +1020,6 @@ public sealed class SqlCredential } /// [System.ComponentModel.DefaultEventAttribute("RowUpdated")] - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] - [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.SqlDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed partial class SqlDataAdapter : System.Data.Common.DbDataAdapter, System.Data.IDataAdapter, System.Data.IDbDataAdapter, System.ICloneable { /// From 94599b4f15298489405960bd7b1bb8dc5b56b155 Mon Sep 17 00:00:00 2001 From: Johnny Pham Date: Wed, 23 Jun 2021 10:50:30 -0700 Subject: [PATCH 5/5] add TODOs in netfx refs --- .../netfx/ref/Microsoft.Data.SqlClient.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs index 36590c9a49..93adb4b621 100644 --- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs +++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs @@ -512,6 +512,7 @@ public abstract partial class SqlColumnEncryptionKeyStoreProvider /// [System.ComponentModel.DefaultEventAttribute("RecordsAffected")] [System.ComponentModel.ToolboxItemAttribute(true)] + // TODO: Add designer attribute when Microsoft.VSDesigner.Data.VS.SqlCommandDesigner uses Microsoft.Data.SqlClient public sealed partial class SqlCommand : System.Data.Common.DbCommand, System.ICloneable { /// @@ -1124,6 +1125,7 @@ public sealed class SqlCredential } /// [System.ComponentModel.DefaultEventAttribute("RowUpdated")] + // TODO: Add designer and toolbox attribute when Microsoft.VSDesigner.Data.VS.SqlDataAdapterDesigner uses Microsoft.Data.SqlClient public sealed partial class SqlDataAdapter : System.Data.Common.DbDataAdapter, System.Data.IDataAdapter, System.Data.IDbDataAdapter, System.ICloneable { ///