From 26a71f95b708721065f974fd43ba82a1dcb3e8f0 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 19 Aug 2020 12:08:39 -0700 Subject: [PATCH] Add Designer attributes to types that had it in full framework (part 2) (#40966) * Move DesignerSerializerAttribute to S.CM.Primitives and add to StringDictionary * Add TolboxItemAttribute to types that had it in Desktop * Remove TypeDescriptionProviderAttribute from DefaultGenApiDocIds * PR Feedback, fix build --- eng/DefaultGenApiDocIds.txt | 3 --- src/libraries/System.CodeDom/ref/System.CodeDom.cs | 1 + .../src/System/CodeDom/Compiler/CodeDomProvider.cs | 1 + .../ref/System.Collections.Specialized.cs | 1 + .../ref/System.Collections.Specialized.csproj | 1 + .../src/System.Collections.Specialized.csproj | 1 + .../src/System/Collections/Specialized/StringDictionary.cs | 4 ++++ .../ref/System.ComponentModel.Primitives.cs | 13 +++++++++++++ .../src/System.ComponentModel.Primitives.csproj | 1 + .../Design/Serialization/DesignerSerializerAttribute.cs | 10 +++++----- .../Serialization/DesignerSerializerAttributeTests.cs | 0 .../ref/System.ComponentModel.TypeConverter.Forwards.cs | 1 + .../ref/System.ComponentModel.TypeConverter.cs | 10 ---------- .../src/System.ComponentModel.TypeConverter.csproj | 1 - .../tests/System.ComponentModel.TypeConverter.Tests.csproj | 1 - src/libraries/System.Data.Common/ref/System.Data.Common.cs | 3 ++- src/libraries/System.Data.Common/src/System/Data/DataSet.cs | 1 + src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs | 2 ++ .../System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs | 1 + .../src/System/Data/Odbc/OdbcDataAdapter.cs | 1 + src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs | 2 ++ src/libraries/System.Data.OleDb/src/OleDbCommand.cs | 1 + src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs | 1 + .../ref/System.Windows.Extensions.cs | 1 + .../src/System/Media/SoundPlayer.cs | 1 + .../System.Xml.XDocument/ref/System.Xml.XDocument.cs | 2 ++ .../System.Xml.XDocument/ref/System.Xml.XDocument.csproj | 1 + 27 files changed, 45 insertions(+), 21 deletions(-) rename src/libraries/{System.ComponentModel.TypeConverter => System.ComponentModel.Primitives}/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs (90%) rename src/libraries/{System.ComponentModel.TypeConverter/tests => System.ComponentModel.Primitives/tests/System/ComponentModel}/Design/Serialization/DesignerSerializerAttributeTests.cs (100%) diff --git a/eng/DefaultGenApiDocIds.txt b/eng/DefaultGenApiDocIds.txt index 51ea598..dc6867f 100644 --- a/eng/DefaultGenApiDocIds.txt +++ b/eng/DefaultGenApiDocIds.txt @@ -1,10 +1,7 @@ // These attributes should be excluded from reference assemblies. -T:System.ComponentModel.Design.Serialization.DesignerSerializerAttribute T:System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute T:System.ComponentModel.EditorAttribute -T:System.ComponentModel.ToolboxItemAttribute -T:System.ComponentModel.TypeDescriptionProviderAttribute T:System.Configuration.ConfigurationPropertyAttribute T:System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.cs b/src/libraries/System.CodeDom/ref/System.CodeDom.cs index fa701a2..410b503 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.cs +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.cs @@ -875,6 +875,7 @@ namespace System.CodeDom.Compiler System.CodeDom.Compiler.CompilerResults System.CodeDom.Compiler.ICodeCompiler.CompileAssemblyFromSource(System.CodeDom.Compiler.CompilerParameters options, string source) { throw null; } System.CodeDom.Compiler.CompilerResults System.CodeDom.Compiler.ICodeCompiler.CompileAssemblyFromSourceBatch(System.CodeDom.Compiler.CompilerParameters options, string[] sources) { throw null; } } + [System.ComponentModel.ToolboxItemAttribute(false)] public abstract partial class CodeDomProvider : System.ComponentModel.Component { protected CodeDomProvider() { } diff --git a/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeDomProvider.cs b/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeDomProvider.cs index eb21341..5274f81 100644 --- a/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeDomProvider.cs +++ b/src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeDomProvider.cs @@ -10,6 +10,7 @@ using System.Runtime.Serialization; namespace System.CodeDom.Compiler { + [ToolboxItem(false)] public abstract class CodeDomProvider : Component { private static readonly Dictionary s_compilerLanguages = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs index c24998c..2878f8a 100644 --- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs +++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs @@ -219,6 +219,7 @@ namespace System.Collections.Specialized void System.Collections.IList.Insert(int index, object? value) { } void System.Collections.IList.Remove(object? value) { } } + [System.ComponentModel.Design.Serialization.DesignerSerializerAttribute("System.Diagnostics.Design.StringDictionaryCodeDomSerializer, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.Serialization.CodeDomSerializer, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")] public partial class StringDictionary : System.Collections.IEnumerable { public StringDictionary() { } diff --git a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj index 90e7f97..c4211d6 100644 --- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj @@ -9,6 +9,7 @@ + \ No newline at end of file diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj index 1eff0c5..de6e924 100644 --- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -18,6 +18,7 @@ + diff --git a/src/libraries/System.Collections.Specialized/src/System/Collections/Specialized/StringDictionary.cs b/src/libraries/System.Collections.Specialized/src/System/Collections/Specialized/StringDictionary.cs index 4018290..aa4bde7 100644 --- a/src/libraries/System.Collections.Specialized/src/System/Collections/Specialized/StringDictionary.cs +++ b/src/libraries/System.Collections.Specialized/src/System/Collections/Specialized/StringDictionary.cs @@ -2,6 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. +using System.ComponentModel.Design.Serialization; + namespace System.Collections.Specialized { /// @@ -12,6 +14,8 @@ namespace System.Collections.Specialized /// [Serializable] [System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] + [DesignerSerializer("System.Diagnostics.Design.StringDictionaryCodeDomSerializer, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a", + "System.ComponentModel.Design.Serialization.CodeDomSerializer, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")] public class StringDictionary : IEnumerable { // For compatibility, we want the Keys property to return values in lower-case. diff --git a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs index 77a375b..5b57795 100644 --- a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs +++ b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs @@ -312,3 +312,16 @@ namespace System.ComponentModel public override bool IsDefaultAttribute() { throw null; } } } +namespace System.ComponentModel.Design.Serialization +{ + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple=true, Inherited=true)] + public sealed partial class DesignerSerializerAttribute : System.Attribute + { + public DesignerSerializerAttribute(string serializerTypeName, string baseSerializerTypeName) { } + public DesignerSerializerAttribute(string serializerTypeName, System.Type baseSerializerType) { } + public DesignerSerializerAttribute(System.Type serializerType, System.Type baseSerializerType) { } + public string? SerializerBaseTypeName { get { throw null; } } + public string? SerializerTypeName { get { throw null; } } + public override object TypeId { get { throw null; } } + } +} diff --git a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index 52c0c07..85c4743 100644 --- a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj +++ b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj @@ -15,6 +15,7 @@ + diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs similarity index 90% rename from src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs rename to src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs index 41a7669..91f604a 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs +++ b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/Design/Serialization/DesignerSerializerAttribute.cs @@ -11,7 +11,7 @@ namespace System.ComponentModel.Design.Serialization [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = true)] public sealed class DesignerSerializerAttribute : Attribute { - private string _typeId; + private string? _typeId; /// /// Creates a new designer serialization attribute. @@ -34,7 +34,7 @@ namespace System.ComponentModel.Design.Serialization /// /// Creates a new designer serialization attribute. /// - public DesignerSerializerAttribute(string serializerTypeName, Type baseSerializerType) + public DesignerSerializerAttribute(string? serializerTypeName, Type baseSerializerType) { if (baseSerializerType == null) { @@ -48,7 +48,7 @@ namespace System.ComponentModel.Design.Serialization /// /// Creates a new designer serialization attribute. /// - public DesignerSerializerAttribute(string serializerTypeName, string baseSerializerTypeName) + public DesignerSerializerAttribute(string? serializerTypeName, string? baseSerializerTypeName) { SerializerTypeName = serializerTypeName; SerializerBaseTypeName = baseSerializerTypeName; @@ -57,12 +57,12 @@ namespace System.ComponentModel.Design.Serialization /// /// Retrieves the fully qualified type name of the serializer. /// - public string SerializerTypeName { get; } + public string? SerializerTypeName { get; } /// /// Retrieves the fully qualified type name of the serializer base type. /// - public string SerializerBaseTypeName { get; } + public string? SerializerBaseTypeName { get; } /// /// This defines a unique ID for this attribute type. It is used diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/DesignerSerializerAttributeTests.cs b/src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/Design/Serialization/DesignerSerializerAttributeTests.cs similarity index 100% rename from src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/DesignerSerializerAttributeTests.cs rename to src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/Design/Serialization/DesignerSerializerAttributeTests.cs diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.Forwards.cs b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.Forwards.cs index 9fa6997..0b6b609 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.Forwards.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.Forwards.cs @@ -6,6 +6,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.Component))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.DesignerAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.Design.Serialization.DesignerSerializerAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.InvalidAsynchronousStateException))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.InvalidEnumArgumentException))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.ISupportInitialize))] diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs index cfe811b..372a0db 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs @@ -2052,16 +2052,6 @@ namespace System.ComponentModel.Design.Serialization public abstract void Dispose(); public virtual void Flush() { } } - [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple=true, Inherited=true)] - public sealed partial class DesignerSerializerAttribute : System.Attribute - { - public DesignerSerializerAttribute(string serializerTypeName, string baseSerializerTypeName) { } - public DesignerSerializerAttribute(string serializerTypeName, System.Type baseSerializerType) { } - public DesignerSerializerAttribute(System.Type serializerType, System.Type baseSerializerType) { } - public string SerializerBaseTypeName { get { throw null; } } - public string SerializerTypeName { get { throw null; } } - public override object TypeId { get { throw null; } } - } public partial interface IDesignerLoaderHost : System.ComponentModel.Design.IDesignerHost, System.ComponentModel.Design.IServiceContainer, System.IServiceProvider { void EndLoad(string baseClassName, bool successful, System.Collections.ICollection errorCollection); diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index f102c54..62af557 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -220,7 +220,6 @@ - diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index a7d84bb..bbb3ffd 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -83,7 +83,6 @@ - diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.cs b/src/libraries/System.Data.Common/ref/System.Data.Common.cs index d9df3c0..2610750 100644 --- a/src/libraries/System.Data.Common/ref/System.Data.Common.cs +++ b/src/libraries/System.Data.Common/ref/System.Data.Common.cs @@ -471,8 +471,9 @@ namespace System.Data object System.ComponentModel.ICustomTypeDescriptor.GetPropertyOwner(System.ComponentModel.PropertyDescriptor pd) { throw null; } #nullable enable } - [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.DataSetDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.ComponentModel.DefaultPropertyAttribute("DataSetName")] + [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.DataSetDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.DataSetToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.Xml.Serialization.XmlRootAttribute("DataSet")] [System.Xml.Serialization.XmlSchemaProviderAttribute("GetDataSetSchema")] public partial class DataSet : System.ComponentModel.MarshalByValueComponent, System.ComponentModel.IListSource, System.ComponentModel.ISupportInitialize, System.ComponentModel.ISupportInitializeNotification, System.Runtime.Serialization.ISerializable, System.Xml.Serialization.IXmlSerializable diff --git a/src/libraries/System.Data.Common/src/System/Data/DataSet.cs b/src/libraries/System.Data.Common/src/System/Data/DataSet.cs index 20af212..e5c7e2a 100644 --- a/src/libraries/System.Data.Common/src/System/Data/DataSet.cs +++ b/src/libraries/System.Data.Common/src/System/Data/DataSet.cs @@ -26,6 +26,7 @@ namespace System.Data [Designer("Microsoft.VSDesigner.Data.VS.DataSetDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [DefaultProperty(nameof(DataSetName))] [Serializable] + [ToolboxItem("Microsoft.VSDesigner.Data.VS.DataSetToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [XmlSchemaProvider(nameof(GetDataSetSchema))] [XmlRoot(nameof(DataSet))] [System.Runtime.CompilerServices.TypeForwardedFrom("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs index 858ecbf..f260fd2 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs @@ -7,6 +7,7 @@ namespace System.Data.Odbc { [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.OdbcCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class OdbcCommand : System.Data.Common.DbCommand, System.ICloneable { public OdbcCommand() { } @@ -125,6 +126,7 @@ namespace System.Data.Odbc public override bool TryGetValue(string keyword, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out object? value) { throw null; } } [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.OdbcDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.OdbcDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed partial class OdbcDataAdapter : System.Data.Common.DbDataAdapter, System.Data.IDataAdapter, System.Data.IDbDataAdapter, System.ICloneable { public OdbcDataAdapter() { } diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs index ca88997..7cda415 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcCommand.cs @@ -17,6 +17,7 @@ using System.Runtime.CompilerServices; namespace System.Data.Odbc { [Designer("Microsoft.VSDesigner.Data.VS.OdbcCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [ToolboxItem(true)] public sealed class OdbcCommand : DbCommand, ICloneable { private static int s_objectTypeCount; // Bid counter diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcDataAdapter.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcDataAdapter.cs index 77630d1..643024c 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcDataAdapter.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcDataAdapter.cs @@ -7,6 +7,7 @@ using System.Data.Common; namespace System.Data.Odbc { [Designer("Microsoft.VSDesigner.Data.VS.OdbcDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [ToolboxItem("Microsoft.VSDesigner.Data.VS.OdbcDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed class OdbcDataAdapter : DbDataAdapter, IDbDataAdapter, ICloneable { private static readonly object s_eventRowUpdated = new object(); diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs index eaaff82..74bd8ce 100644 --- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs +++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs @@ -7,6 +7,7 @@ namespace System.Data.OleDb { [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.OleDbCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [System.ComponentModel.ToolboxItemAttribute(true)] public sealed partial class OleDbCommand : System.Data.Common.DbCommand, System.Data.IDbCommand, System.ICloneable, System.IDisposable { public OleDbCommand() { } @@ -142,6 +143,7 @@ namespace System.Data.OleDb public override bool TryGetValue(string keyword, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out object? value) { throw null; } } [System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.OleDbDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.OleDbDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed partial class OleDbDataAdapter : System.Data.Common.DbDataAdapter, System.Data.IDataAdapter, System.Data.IDbDataAdapter, System.ICloneable { public OleDbDataAdapter() { } diff --git a/src/libraries/System.Data.OleDb/src/OleDbCommand.cs b/src/libraries/System.Data.OleDb/src/OleDbCommand.cs index 458335b..a949389 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbCommand.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbCommand.cs @@ -13,6 +13,7 @@ using System.Threading; namespace System.Data.OleDb { [Designer("Microsoft.VSDesigner.Data.VS.OleDbCommandDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [ToolboxItem(true)] public sealed class OleDbCommand : DbCommand, ICloneable, IDbCommand { // command data diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs index e4e7ba4..b5ba124 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs @@ -9,6 +9,7 @@ using System.Runtime.InteropServices; namespace System.Data.OleDb { [Designer("Microsoft.VSDesigner.Data.VS.OleDbDataAdapterDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [ToolboxItem("Microsoft.VSDesigner.Data.VS.OleDbDataAdapterToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] public sealed class OleDbDataAdapter : DbDataAdapter, IDbDataAdapter, ICloneable { private static readonly object EventRowUpdated = new object(); diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.cs b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.cs index ac07897..057fbfc 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.cs +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.cs @@ -6,6 +6,7 @@ namespace System.Media { + [System.ComponentModel.ToolboxItemAttribute(false)] public partial class SoundPlayer : System.ComponentModel.Component, System.Runtime.Serialization.ISerializable { public SoundPlayer() { } diff --git a/src/libraries/System.Windows.Extensions/src/System/Media/SoundPlayer.cs b/src/libraries/System.Windows.Extensions/src/System/Media/SoundPlayer.cs index 7a6c6f4..da68f70 100644 --- a/src/libraries/System.Windows.Extensions/src/System/Media/SoundPlayer.cs +++ b/src/libraries/System.Windows.Extensions/src/System/Media/SoundPlayer.cs @@ -12,6 +12,7 @@ using System.Threading.Tasks; namespace System.Media { + [ToolboxItem(false)] public class SoundPlayer : Component, ISerializable { private const int BlockSize = 1024; diff --git a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.cs b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.cs index f234946..489e049 100644 --- a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.cs +++ b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.cs @@ -48,6 +48,7 @@ namespace System.Xml.Linq DisableFormatting = 1, OmitDuplicateNamespaces = 2, } + [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider`1[[System.Xml.Linq.XAttribute, System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]],System.ComponentModel.TypeConverter")] public partial class XAttribute : System.Xml.Linq.XObject { public XAttribute(System.Xml.Linq.XAttribute other) { } @@ -209,6 +210,7 @@ namespace System.Xml.Linq public override System.Threading.Tasks.Task WriteToAsync(System.Xml.XmlWriter writer, System.Threading.CancellationToken cancellationToken) { throw null; } } [System.Xml.Serialization.XmlSchemaProviderAttribute(null, IsAny=true)] + [System.ComponentModel.TypeDescriptionProviderAttribute("MS.Internal.Xml.Linq.ComponentModel.XTypeDescriptionProvider`1[[System.Xml.Linq.XElement, System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]],System.ComponentModel.TypeConverter")] public partial class XElement : System.Xml.Linq.XContainer, System.Xml.Serialization.IXmlSerializable { public XElement(System.Xml.Linq.XElement other) { } diff --git a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj index 6e03dac..71f2fd0 100644 --- a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj +++ b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj @@ -6,6 +6,7 @@ + -- 2.7.4