diff --git a/eng/DefaultGenApiDocIds.txt b/eng/DefaultGenApiDocIds.txt
index dc6867fbba2a4c..8b2af83b92d47e 100644
--- a/eng/DefaultGenApiDocIds.txt
+++ b/eng/DefaultGenApiDocIds.txt
@@ -1,7 +1,6 @@
// These attributes should be excluded from reference assemblies.
T:System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute
-T:System.ComponentModel.EditorAttribute
T:System.Configuration.ConfigurationPropertyAttribute
T:System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute
T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute
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 2878f8a5a21114..82d3c5b0b0c856 100644
--- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs
+++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.cs
@@ -219,7 +219,7 @@ void System.Collections.ICollection.CopyTo(System.Array array, int index) { }
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")]
+ [System.ComponentModel.Design.Serialization.DesignerSerializerAttribute("System.Diagnostics.Design.StringDictionaryCodeDomSerializer, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.Serialization.CodeDomSerializer, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class StringDictionary : System.Collections.IEnumerable
{
public StringDictionary() { }
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 aa4bde7cf69452..436514bf1773eb 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
@@ -14,8 +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")]
+ [DesignerSerializer("System.Diagnostics.Design.StringDictionaryCodeDomSerializer, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.ComponentModel.Design.Serialization.CodeDomSerializer, System.Design, Version=4.0.0.0, Culture=neutral, 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 5b5779553fe5cb..326179721c1989 100644
--- a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs
+++ b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs
@@ -158,6 +158,19 @@ public DisplayNameAttribute(string displayName) { }
public override int GetHashCode() { throw null; }
public override bool IsDefaultAttribute() { throw null; }
}
+ [System.AttributeUsageAttribute(System.AttributeTargets.All, AllowMultiple=true, Inherited=true)]
+ public sealed partial class EditorAttribute : System.Attribute
+ {
+ public EditorAttribute() { }
+ public EditorAttribute(string typeName, string? baseTypeName) { }
+ public EditorAttribute(string typeName, System.Type baseType) { }
+ public EditorAttribute(System.Type type, System.Type baseType) { }
+ public string? EditorBaseTypeName { get { throw null; } }
+ public string EditorTypeName { get { throw null; } }
+ public override object TypeId { get { throw null; } }
+ public override bool Equals(object? obj) { throw null; }
+ public override int GetHashCode() { throw null; }
+ }
public sealed partial class EventHandlerList : System.IDisposable
{
public EventHandlerList() { }
@@ -167,8 +180,8 @@ public void AddHandlers(System.ComponentModel.EventHandlerList listToAddFrom) {
public void Dispose() { }
public void RemoveHandler(object key, System.Delegate? value) { }
}
- [System.ComponentModel.DesignerAttribute("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
- [System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [System.ComponentModel.DesignerAttribute("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+ [System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.TypeConverterAttribute("System.ComponentModel.ComponentConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public partial interface IComponent : System.IDisposable
{
@@ -317,8 +330,8 @@ 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(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; } }
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 85c4743a5bedc9..80528cbd77750c 100644
--- a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
@@ -17,6 +17,7 @@
+
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/EditorAttribute.cs b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/EditorAttribute.cs
similarity index 93%
rename from src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/EditorAttribute.cs
rename to src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/EditorAttribute.cs
index 27e0e1b23345ec..d1f3e27f7c7779 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/EditorAttribute.cs
+++ b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/EditorAttribute.cs
@@ -9,7 +9,7 @@ namespace System.ComponentModel
[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = true)]
public sealed class EditorAttribute : Attribute
{
- private string _typeId;
+ private string? _typeId;
///
/// Initializes a new instance of the class
@@ -25,7 +25,7 @@ public EditorAttribute()
/// Initializes a new instance of the class with the type name and base type
/// name of the editor.
///
- public EditorAttribute(string typeName, string baseTypeName)
+ public EditorAttribute(string typeName, string? baseTypeName)
{
EditorTypeName = typeName ?? throw new ArgumentNullException(nameof(typeName));
EditorBaseTypeName = baseTypeName;
@@ -63,14 +63,14 @@ public EditorAttribute(Type type, Type baseType)
throw new ArgumentNullException(nameof(baseType));
}
- EditorTypeName = type.AssemblyQualifiedName;
+ EditorTypeName = type.AssemblyQualifiedName!;
EditorBaseTypeName = baseType.AssemblyQualifiedName;
}
///
/// Gets the name of the base class or interface serving as a lookup key for this editor.
///
- public string EditorBaseTypeName { get; }
+ public string? EditorBaseTypeName { get; }
///
/// Gets the name of the editor class.
@@ -102,7 +102,7 @@ public override object TypeId
}
}
- public override bool Equals(object obj)
+ public override bool Equals(object? obj)
{
if (obj == this)
{
diff --git a/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/IComponent.cs b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/IComponent.cs
index bf953543bdd10a..9d93f5fb9cb82f 100644
--- a/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/IComponent.cs
+++ b/src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/IComponent.cs
@@ -19,8 +19,8 @@ namespace System.ComponentModel
/// provided "site".
/// Provides functionality required by all components.
///
- [Designer("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
- [Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [Designer("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+ [Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[TypeConverter("System.ComponentModel.ComponentConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public interface IComponent : IDisposable
{
diff --git a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
index ab75a03e98333e..924a2be2b6289b 100644
--- a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
@@ -13,6 +13,7 @@
+
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/EditorAttributeTests.cs b/src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/EditorAttributeTests.cs
similarity index 100%
rename from src/libraries/System.ComponentModel.TypeConverter/tests/EditorAttributeTests.cs
rename to src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/EditorAttributeTests.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 0b6b60967c9697..a1e6ab4452b16e 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
@@ -7,6 +7,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.EditorAttribute))]
[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 372a0db9d50c12..0c4990e50491e6 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
@@ -398,19 +398,6 @@ public partial class DoubleConverter : System.ComponentModel.BaseNumberConverter
{
public DoubleConverter() { }
}
- [System.AttributeUsageAttribute(System.AttributeTargets.All, AllowMultiple=true, Inherited=true)]
- public sealed partial class EditorAttribute : System.Attribute
- {
- public EditorAttribute() { }
- public EditorAttribute(string typeName, string baseTypeName) { }
- public EditorAttribute(string typeName, System.Type baseType) { }
- public EditorAttribute(System.Type type, System.Type baseType) { }
- public string EditorBaseTypeName { get { throw null; } }
- public string EditorTypeName { get { throw null; } }
- public override object TypeId { get { throw null; } }
- public override bool Equals(object obj) { throw null; }
- public override int GetHashCode() { throw null; }
- }
public partial class EnumConverter : System.ComponentModel.TypeConverter
{
public EnumConverter(System.Type type) { }
@@ -586,6 +573,7 @@ public partial interface IIntellisenseBuilder
string Name { get; }
bool Show(string language, string value, ref string newValue);
}
+ [System.ComponentModel.EditorAttribute("System.Windows.Forms.Design.DataSourceListEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.MergablePropertyAttribute(false)]
public partial interface IListSource
{
@@ -1563,6 +1551,7 @@ protected virtual void PopulateOptionCollection(System.ComponentModel.Design.Des
protected virtual bool ShowDialog(System.ComponentModel.Design.DesignerOptionService.DesignerOptionCollection options, object optionObject) { throw null; }
object System.ComponentModel.Design.IDesignerOptionService.GetOptionValue(string pageName, string valueName) { throw null; }
void System.ComponentModel.Design.IDesignerOptionService.SetOptionValue(string pageName, string valueName, object value) { }
+ [System.ComponentModel.EditorAttribute("", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class DesignerOptionCollection : System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList
{
internal DesignerOptionCollection() { }
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 62af5577ab8cc9..7319c74b19b825 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -127,7 +127,6 @@
-
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs
index 4e76dc1673d9cc..3c19b44028fcc7 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/DesignerOptionService.cs
@@ -122,6 +122,7 @@ void IDesignerOptionService.SetOptionValue(string pageName, string valueName, ob
/// properties if all the branch's children.
///
[TypeConverter(typeof(DesignerOptionConverter))]
+ [Editor("", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed class DesignerOptionCollection : IList
{
private readonly DesignerOptionService _service;
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/IListSource.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/IListSource.cs
index 42befbcde0aa99..c2a205bd524e3f 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/IListSource.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/IListSource.cs
@@ -6,6 +6,8 @@
namespace System.ComponentModel
{
[MergableProperty(false)]
+ [Editor("System.Windows.Forms.Design.DataSourceListEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public interface IListSource
{
bool ContainsListCollection { get; }
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 bbb3ffd5127574..49f136f0c0b974 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
@@ -68,7 +68,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 2610750033ca9b..763f079568b2a2 100644
--- a/src/libraries/System.Data.Common/ref/System.Data.Common.cs
+++ b/src/libraries/System.Data.Common/ref/System.Data.Common.cs
@@ -61,6 +61,7 @@ protected internal void SetDataSet(System.Data.DataSet dataSet) { }
public override string ToString() { throw null; }
}
[System.ComponentModel.DefaultEventAttribute("CollectionChanged")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.ConstraintsCollectionEditor, 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")]
public sealed partial class ConstraintCollection : System.Data.InternalDataCollectionBase
{
internal ConstraintCollection() { }
@@ -93,6 +94,7 @@ public ConstraintException(string? message, System.Exception? innerException) {
}
[System.ComponentModel.DefaultPropertyAttribute("ColumnName")]
[System.ComponentModel.DesignTimeVisibleAttribute(false)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataColumnEditor, 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")]
[System.ComponentModel.ToolboxItemAttribute(false)]
public partial class DataColumn : System.ComponentModel.MarshalByValueComponent
{
@@ -161,6 +163,7 @@ public DataColumnChangeEventArgs(System.Data.DataRow row, System.Data.DataColumn
}
public delegate void DataColumnChangeEventHandler(object sender, System.Data.DataColumnChangeEventArgs e);
[System.ComponentModel.DefaultEventAttribute("CollectionChanged")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.ColumnsCollectionEditor, 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")]
public sealed partial class DataColumnCollection : System.Data.InternalDataCollectionBase
{
internal DataColumnCollection() { }
@@ -224,6 +227,7 @@ public static partial class DataReaderExtensions
public static System.Threading.Tasks.Task IsDBNullAsync(this System.Data.Common.DbDataReader reader, string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
}
[System.ComponentModel.DefaultPropertyAttribute("RelationName")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataRelationEditor, 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")]
public partial class DataRelation
{
public DataRelation(string? relationName, System.Data.DataColumn parentColumn, System.Data.DataColumn childColumn) { }
@@ -257,6 +261,7 @@ protected internal void RaisePropertyChanging(string name) { }
}
[System.ComponentModel.DefaultEventAttribute("CollectionChanged")]
[System.ComponentModel.DefaultPropertyAttribute("Table")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataRelationCollectionEditor, 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")]
public abstract partial class DataRelationCollection : System.Data.InternalDataCollectionBase
{
protected DataRelationCollection() { }
@@ -618,6 +623,7 @@ public DataSysDescriptionAttribute(string description) { }
[System.ComponentModel.DefaultEventAttribute("RowChanging")]
[System.ComponentModel.DefaultPropertyAttribute("TableName")]
[System.ComponentModel.DesignTimeVisibleAttribute(false)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataTableEditor, 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")]
[System.ComponentModel.ToolboxItemAttribute(false)]
[System.Xml.Serialization.XmlSchemaProviderAttribute("GetDataTableSchema")]
public partial class DataTable : System.ComponentModel.MarshalByValueComponent, System.ComponentModel.IListSource, System.ComponentModel.ISupportInitialize, System.ComponentModel.ISupportInitializeNotification, System.Runtime.Serialization.ISerializable, System.Xml.Serialization.IXmlSerializable
@@ -780,6 +786,7 @@ public DataTableClearEventArgs(System.Data.DataTable dataTable) { }
}
public delegate void DataTableClearEventHandler(object sender, System.Data.DataTableClearEventArgs e);
[System.ComponentModel.DefaultEventAttribute("CollectionChanged")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.TablesCollectionEditor, 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")]
[System.ComponentModel.ListBindableAttribute(false)]
public sealed partial class DataTableCollection : System.Data.InternalDataCollectionBase
{
@@ -867,6 +874,7 @@ public override void Close() { }
[System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.Data.VS.DataViewDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.DefaultEventAttribute("PositionChanged")]
[System.ComponentModel.DefaultPropertyAttribute("Table")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataSourceEditor, 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")]
public partial class DataView : System.ComponentModel.MarshalByValueComponent, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.ComponentModel.IBindingList, System.ComponentModel.IBindingListView, System.ComponentModel.ISupportInitialize, System.ComponentModel.ISupportInitializeNotification, System.ComponentModel.ITypedList
{
public DataView() { }
@@ -1015,6 +1023,7 @@ void System.ComponentModel.IBindingList.RemoveSort() { }
#nullable enable
protected virtual void TableCollectionChanged(object sender, System.ComponentModel.CollectionChangeEventArgs e) { }
}
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataViewRowStateEditor, 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")]
[System.FlagsAttribute]
public enum DataViewRowState
{
@@ -1042,6 +1051,7 @@ internal DataViewSetting() { }
[System.ComponentModel.BrowsableAttribute(false)]
public System.Data.DataTable? Table { get { throw null; } }
}
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataViewSettingsCollectionEditor, 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")]
public partial class DataViewSettingCollection : System.Collections.ICollection, System.Collections.IEnumerable
{
internal DataViewSettingCollection() { }
@@ -1160,6 +1170,7 @@ public FillErrorEventArgs(System.Data.DataTable? dataTable, object?[]? values) {
}
public delegate void FillErrorEventHandler(object sender, System.Data.FillErrorEventArgs e);
[System.ComponentModel.DefaultPropertyAttribute("ConstraintName")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.ForeignKeyConstraintEditor, 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")]
public partial class ForeignKeyConstraint : System.Data.Constraint
{
public ForeignKeyConstraint(System.Data.DataColumn parentColumn, System.Data.DataColumn childColumn) { }
@@ -1575,6 +1586,7 @@ protected TypedTableBase(System.Runtime.Serialization.SerializationInfo info, Sy
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
}
[System.ComponentModel.DefaultPropertyAttribute("ConstraintName")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.UniqueConstraintEditor, 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")]
public partial class UniqueConstraint : System.Data.Constraint
{
public UniqueConstraint(System.Data.DataColumn column) { }
@@ -1771,6 +1783,7 @@ public DataTableMapping(string? sourceTable, string? dataSetTable, System.Data.C
object System.ICloneable.Clone() { throw null; }
public override string ToString() { throw null; }
}
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataTableMappingCollectionEditor, 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")]
[System.ComponentModel.ListBindableAttribute(false)]
public sealed partial class DataTableMappingCollection : System.MarshalByRefObject, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Data.ITableMappingCollection
{
diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.manual.cs b/src/libraries/System.Data.Common/ref/System.Data.Common.manual.cs
index ad247f7ccf0d5f..692155e3279952 100644
--- a/src/libraries/System.Data.Common/ref/System.Data.Common.manual.cs
+++ b/src/libraries/System.Data.Common/ref/System.Data.Common.manual.cs
@@ -30,6 +30,7 @@ internal class DefaultValueTypeConverter { }
public partial class DataTable
{
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.PrimaryKeyEditor, 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")]
[System.ComponentModel.TypeConverter(typeof(PrimaryKeyTypeConverter))]
public System.Data.DataColumn[] PrimaryKey { get { throw null; } set { } }
}
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DataTableMappingCollection.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DataTableMappingCollection.cs
index 9cc1dcc7d9fbe5..46e2fbbc518804 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DataTableMappingCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DataTableMappingCollection.cs
@@ -10,6 +10,8 @@
namespace System.Data.Common
{
[ListBindable(false)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataTableMappingCollectionEditor, 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")]
public sealed class DataTableMappingCollection : MarshalByRefObject, ITableMappingCollection
{
private List? _items; // delay creation until AddWithoutEvents, Insert, CopyTo, GetEnumerator
diff --git a/src/libraries/System.Data.Common/src/System/Data/ConstraintCollection.cs b/src/libraries/System.Data.Common/src/System/Data/ConstraintCollection.cs
index aabcde99fe0323..a9d8ac3f1f0218 100644
--- a/src/libraries/System.Data.Common/src/System/Data/ConstraintCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/ConstraintCollection.cs
@@ -12,6 +12,8 @@ namespace System.Data
/// Represents a collection of constraints for a .
///
[DefaultEvent(nameof(CollectionChanged))]
+ [Editor("Microsoft.VSDesigner.Data.Design.ConstraintsCollectionEditor, 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")]
public sealed class ConstraintCollection : InternalDataCollectionBase
{
private readonly DataTable _table;
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataColumn.cs b/src/libraries/System.Data.Common/src/System/Data/DataColumn.cs
index 2547216825d58d..eec4b1d090f54f 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataColumn.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataColumn.cs
@@ -24,6 +24,8 @@ namespace System.Data
[ToolboxItem(false)]
[DesignTimeVisible(false)]
[DefaultProperty(nameof(ColumnName))]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataColumnEditor, 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")]
public class DataColumn : MarshalByValueComponent
{
private bool _allowNull = true;
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataColumnCollection.cs b/src/libraries/System.Data.Common/src/System/Data/DataColumnCollection.cs
index b02be7bf759af4..5a8742ae06965d 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataColumnCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataColumnCollection.cs
@@ -15,6 +15,8 @@ namespace System.Data
/// objects for a .
///
[DefaultEvent(nameof(CollectionChanged))]
+ [Editor("Microsoft.VSDesigner.Data.Design.ColumnsCollectionEditor, 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")]
public sealed class DataColumnCollection : InternalDataCollectionBase
{
private readonly DataTable _table;
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataRelation.cs b/src/libraries/System.Data.Common/src/System/Data/DataRelation.cs
index c53fa2a9f69bfe..31ea7240274378 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataRelation.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataRelation.cs
@@ -30,6 +30,8 @@
namespace System.Data
{
[DefaultProperty(nameof(RelationName))]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataRelationEditor, 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")]
[TypeConverter(typeof(RelationshipConverter))]
public class DataRelation
{
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataRelationCollection.cs b/src/libraries/System.Data.Common/src/System/Data/DataRelationCollection.cs
index d9102551954ca8..1bec593c84971e 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataRelationCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataRelationCollection.cs
@@ -15,6 +15,8 @@ namespace System.Data
///
[DefaultEvent(nameof(CollectionChanged))]
[DefaultProperty("Table")]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataRelationCollectionEditor, 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")]
public abstract class DataRelationCollection : InternalDataCollectionBase
{
private DataRelation? _inTransition;
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataTable.cs b/src/libraries/System.Data.Common/src/System/Data/DataTable.cs
index ff8af676e92c9f..ad0a64e64ec419 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataTable.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataTable.cs
@@ -26,6 +26,8 @@ namespace System.Data
[DesignTimeVisible(false)]
[DefaultProperty(nameof(TableName))]
[DefaultEvent(nameof(RowChanging))]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataTableEditor, 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")]
[XmlSchemaProvider(nameof(GetDataTableSchema))]
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
@@ -1586,6 +1588,8 @@ internal int NestedParentsCount
///
/// Gets or sets an array of columns that function as primary keys for the data table.
///
+ [Editor("Microsoft.VSDesigner.Data.Design.PrimaryKeyEditor, 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")]
[TypeConverter(typeof(PrimaryKeyTypeConverter))]
[AllowNull]
public DataColumn[] PrimaryKey
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataTableCollection.cs b/src/libraries/System.Data.Common/src/System/Data/DataTableCollection.cs
index 9597b3597cbdfc..7446a8441f1f01 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataTableCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataTableCollection.cs
@@ -14,6 +14,8 @@ namespace System.Data
/// Represents the collection of tables for the .
///
[DefaultEvent(nameof(CollectionChanged))]
+ [Editor("Microsoft.VSDesigner.Data.Design.TablesCollectionEditor, 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")]
[ListBindable(false)]
public sealed class DataTableCollection : InternalDataCollectionBase
{
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataView.cs b/src/libraries/System.Data.Common/src/System/Data/DataView.cs
index aa750a44d74194..8496446271314b 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataView.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataView.cs
@@ -18,6 +18,8 @@ namespace System.Data
[Designer("Microsoft.VSDesigner.Data.VS.DataViewDesigner, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[DefaultProperty(nameof(Table))]
[DefaultEvent("PositionChanged")]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataSourceEditor, 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")]
public class DataView : MarshalByValueComponent, IBindingListView, System.ComponentModel.ITypedList, ISupportInitializeNotification
{
private DataViewManager? _dataViewManager;
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataViewRowState.cs b/src/libraries/System.Data.Common/src/System/Data/DataViewRowState.cs
index 3269a05263224e..1bcd625cc2efa6 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataViewRowState.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataViewRowState.cs
@@ -9,6 +9,8 @@ namespace System.Data
/// Describes the version of data in a .
///
[Flags]
+ [Editor("Microsoft.VSDesigner.Data.Design.DataViewRowStateEditor, 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")]
public enum DataViewRowState
{
None = 0x00000000,
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataViewSettingCollection.cs b/src/libraries/System.Data.Common/src/System/Data/DataViewSettingCollection.cs
index 62b9fb6e470c4a..8145dadcdd5891 100644
--- a/src/libraries/System.Data.Common/src/System/Data/DataViewSettingCollection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/DataViewSettingCollection.cs
@@ -7,6 +7,8 @@
namespace System.Data
{
+ [Editor("Microsoft.VSDesigner.Data.Design.DataViewSettingsCollectionEditor, 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")]
public class DataViewSettingCollection : ICollection
{
private readonly DataViewManager _dataViewManager;
diff --git a/src/libraries/System.Data.Common/src/System/Data/ForeignKeyConstraint.cs b/src/libraries/System.Data.Common/src/System/Data/ForeignKeyConstraint.cs
index 058a2cf41a9c6c..a57fd09b1e4b33 100644
--- a/src/libraries/System.Data.Common/src/System/Data/ForeignKeyConstraint.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/ForeignKeyConstraint.cs
@@ -12,6 +12,8 @@ namespace System.Data
/// a value or row is either deleted or updated.
///
[DefaultProperty(nameof(ConstraintName))]
+ [Editor("Microsoft.VSDesigner.Data.Design.ForeignKeyConstraintEditor, 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")]
public class ForeignKeyConstraint : Constraint
{
// constants
diff --git a/src/libraries/System.Data.Common/src/System/Data/UniqueConstraint.cs b/src/libraries/System.Data.Common/src/System/Data/UniqueConstraint.cs
index f1512575a0a2b8..83c7e705f2a889 100644
--- a/src/libraries/System.Data.Common/src/System/Data/UniqueConstraint.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/UniqueConstraint.cs
@@ -10,6 +10,8 @@ namespace System.Data
/// Represents a restriction on a set of columns in which all values must be unique.
///
[DefaultProperty("ConstraintName")]
+ [Editor("Microsoft.VSDesigner.Data.Design.UniqueConstraintEditor, 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")]
public class UniqueConstraint : Constraint
{
private DataKey _key;
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 f260fd2be0877f..65430bf1bd8a78 100644
--- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs
+++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs
@@ -14,11 +14,13 @@ public OdbcCommand() { }
public OdbcCommand(string? cmdText) { }
public OdbcCommand(string? cmdText, System.Data.Odbc.OdbcConnection? connection) { }
public OdbcCommand(string? cmdText, System.Data.Odbc.OdbcConnection? connection, System.Data.Odbc.OdbcTransaction? transaction) { }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Odbc.Design.OdbcCommandTextEditor, 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")]
[System.Diagnostics.CodeAnalysis.AllowNullAttribute]
public override string CommandText { get { throw null; } set { } }
public override int CommandTimeout { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(System.Data.CommandType.Text)]
public override System.Data.CommandType CommandType { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, 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")]
public new System.Data.Odbc.OdbcConnection? Connection { get { throw null; } set { } }
protected override System.Data.Common.DbConnection? DbConnection { get { throw null; } set { } }
protected override System.Data.Common.DbParameterCollection DbParameterCollection { get { throw null; } }
@@ -74,6 +76,7 @@ public sealed partial class OdbcConnection : System.Data.Common.DbConnection, Sy
{
public OdbcConnection() { }
public OdbcConnection(string? connectionString) { }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Odbc.Design.OdbcConnectionStringEditor, 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")]
[System.Diagnostics.CodeAnalysis.AllowNullAttribute]
public override string ConnectionString { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(15)]
@@ -133,13 +136,17 @@ public OdbcDataAdapter() { }
public OdbcDataAdapter(System.Data.Odbc.OdbcCommand? selectCommand) { }
public OdbcDataAdapter(string? selectCommandText, System.Data.Odbc.OdbcConnection? selectConnection) { }
public OdbcDataAdapter(string? selectCommandText, string? selectConnectionString) { }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.Odbc.OdbcCommand? DeleteCommand { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.Odbc.OdbcCommand? InsertCommand { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.Odbc.OdbcCommand? SelectCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.DeleteCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.InsertCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.SelectCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.UpdateCommand { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.Odbc.OdbcCommand? UpdateCommand { get { throw null; } set { } }
public event System.Data.Odbc.OdbcRowUpdatedEventHandler? RowUpdated { add { } remove { } }
public event System.Data.Odbc.OdbcRowUpdatingEventHandler? RowUpdating { add { } remove { } }
@@ -283,6 +290,7 @@ public void ResetOdbcType() { }
object? System.ICloneable.Clone() { throw null; }
public override string ToString() { throw null; }
}
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBParametersEditor, 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")]
public sealed partial class OdbcParameterCollection : System.Data.Common.DbParameterCollection
{
internal OdbcParameterCollection() { }
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 7cda4153670de2..eb77a4c8c1951d 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
@@ -157,6 +157,8 @@ internal bool Canceling
}
[AllowNull]
+ [Editor("Microsoft.VSDesigner.Data.Odbc.Design.OdbcCommandTextEditor, 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")]
public override string CommandText
{
get
@@ -235,6 +237,8 @@ public override CommandType CommandType
}
}
+ [Editor("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, 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")]
public new OdbcConnection? Connection
{
get
diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs
index 9841dd7790662c..2444a8377503a5 100644
--- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs
+++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs
@@ -46,6 +46,8 @@ internal OdbcConnectionHandle? ConnectionHandle
}
[AllowNull]
+ [Editor("Microsoft.VSDesigner.Data.Odbc.Design.OdbcConnectionStringEditor, 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")]
public override string ConnectionString
{
get
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 643024cb7a4597..1af51675e76487 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
@@ -41,6 +41,8 @@ private OdbcDataAdapter(OdbcDataAdapter from) : base(from)
GC.SuppressFinalize(this);
}
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OdbcCommand? DeleteCommand
{
get { return _deleteCommand; }
@@ -53,6 +55,8 @@ private OdbcDataAdapter(OdbcDataAdapter from) : base(from)
set { _deleteCommand = (OdbcCommand?)value; }
}
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OdbcCommand? InsertCommand
{
get { return _insertCommand; }
@@ -65,6 +69,8 @@ private OdbcDataAdapter(OdbcDataAdapter from) : base(from)
set { _insertCommand = (OdbcCommand?)value; }
}
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OdbcCommand? SelectCommand
{
get { return _selectCommand; }
@@ -77,6 +83,8 @@ private OdbcDataAdapter(OdbcDataAdapter from) : base(from)
set { _selectCommand = (OdbcCommand?)value; }
}
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OdbcCommand? UpdateCommand
{
get { return _updateCommand; }
diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcParameterCollection.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcParameterCollection.cs
index d86b6d323f2603..b47238d42f6e42 100644
--- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcParameterCollection.cs
+++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcParameterCollection.cs
@@ -6,6 +6,8 @@
namespace System.Data.Odbc
{
+ [Editor("Microsoft.VSDesigner.Data.Design.DBParametersEditor, 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")]
public sealed partial class OdbcParameterCollection : DbParameterCollection
{
private bool _rebindCollection; // The collection needs to be (re)bound
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 74bd8ce59241bb..fc819919b613f3 100644
--- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs
+++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs
@@ -15,6 +15,7 @@ public OleDbCommand(string? cmdText) { }
public OleDbCommand(string? cmdText, System.Data.OleDb.OleDbConnection? connection) { }
public OleDbCommand(string? cmdText, System.Data.OleDb.OleDbConnection? connection, System.Data.OleDb.OleDbTransaction? transaction) { }
[System.ComponentModel.DefaultValueAttribute("")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, 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")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public override string? CommandText { get { throw null; } set { } }
public override int CommandTimeout { get { throw null; } set { } }
@@ -22,6 +23,7 @@ public OleDbCommand(string? cmdText, System.Data.OleDb.OleDbConnection? connecti
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public override System.Data.CommandType CommandType { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, 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")]
public new System.Data.OleDb.OleDbConnection? Connection { get { throw null; } set { } }
protected override System.Data.Common.DbConnection? DbConnection { get { throw null; } set { } }
protected override System.Data.Common.DbParameterCollection DbParameterCollection { get { throw null; } }
@@ -71,10 +73,10 @@ public static void DeriveParameters(System.Data.OleDb.OleDbCommand command) { }
public new System.Data.OleDb.OleDbCommand GetUpdateCommand() { throw null; }
public new System.Data.OleDb.OleDbCommand GetUpdateCommand(bool useColumnsForParameterNames) { throw null; }
public override string QuoteIdentifier(string unquotedIdentifier) { throw null; }
- public string QuoteIdentifier(string unquotedIdentifier, System.Data.OleDb.OleDbConnection connection) { throw null; }
+ public string QuoteIdentifier(string unquotedIdentifier, System.Data.OleDb.OleDbConnection? connection) { throw null; }
protected override void SetRowUpdatingHandler(System.Data.Common.DbDataAdapter adapter) { }
public override string UnquoteIdentifier(string quotedIdentifier) { throw null; }
- public string UnquoteIdentifier(string quotedIdentifier, System.Data.OleDb.OleDbConnection connection) { throw null; }
+ public string UnquoteIdentifier(string quotedIdentifier, System.Data.OleDb.OleDbConnection? connection) { throw null; }
}
[System.ComponentModel.DefaultEventAttribute("InfoMessage")]
public sealed partial class OleDbConnection : System.Data.Common.DbConnection, System.Data.IDbConnection, System.ICloneable, System.IDisposable
@@ -82,6 +84,7 @@ public sealed partial class OleDbConnection : System.Data.Common.DbConnection, S
public OleDbConnection() { }
public OleDbConnection(string? connectionString) { }
[System.ComponentModel.DefaultValueAttribute("")]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.ADO.Design.OleDbConnectionStringEditor, 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")]
[System.ComponentModel.RecommendedAsConfigurableAttribute(true)]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
[System.ComponentModel.SettingsBindableAttribute(true)]
@@ -129,6 +132,7 @@ public OleDbConnectionStringBuilder(string? connectionString) { }
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public string DataSource { get { throw null; } set { } }
[System.ComponentModel.DisplayNameAttribute("File Name")]
+ [System.ComponentModel.EditorAttribute("System.Windows.Forms.Design.FileNameEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public string FileName { get { throw null; } set { } }
[System.Diagnostics.CodeAnalysis.AllowNullAttribute]
@@ -151,16 +155,20 @@ public OleDbDataAdapter(System.Data.OleDb.OleDbCommand? selectCommand) { }
public OleDbDataAdapter(string? selectCommandText, System.Data.OleDb.OleDbConnection? selectConnection) { }
public OleDbDataAdapter(string? selectCommandText, string? selectConnectionString) { }
[System.ComponentModel.DefaultValueAttribute(null)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.OleDb.OleDbCommand? DeleteCommand { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.OleDb.OleDbCommand? InsertCommand { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.OleDb.OleDbCommand? SelectCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.DeleteCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.InsertCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.SelectCommand { get { throw null; } set { } }
System.Data.IDbCommand? System.Data.IDbDataAdapter.UpdateCommand { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new System.Data.OleDb.OleDbCommand? UpdateCommand { get { throw null; } set { } }
public event System.Data.OleDb.OleDbRowUpdatedEventHandler? RowUpdated { add { } remove { } }
public event System.Data.OleDb.OleDbRowUpdatingEventHandler? RowUpdating { add { } remove { } }
@@ -357,6 +365,7 @@ public void ResetOleDbType() { }
object? System.ICloneable.Clone() { throw null; }
public override string ToString() { throw null; }
}
+ [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBParametersEditor, 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")]
public sealed partial class OleDbParameterCollection : System.Data.Common.DbParameterCollection
{
internal OleDbParameterCollection() { }
diff --git a/src/libraries/System.Data.OleDb/src/OleDbCommand.cs b/src/libraries/System.Data.OleDb/src/OleDbCommand.cs
index a949389c893263..a47d9cd6fa444b 100644
--- a/src/libraries/System.Data.OleDb/src/OleDbCommand.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbCommand.cs
@@ -104,6 +104,8 @@ private Bindings? ParameterBindings
}
[DefaultValue("")]
+ [Editor("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, 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")]
[RefreshProperties(RefreshProperties.All)]
[AllowNull]
public override string CommandText
@@ -178,6 +180,8 @@ public override CommandType CommandType
}
[DefaultValue(null)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, 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")]
public new OleDbConnection? Connection
{
get
diff --git a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
index 06963692ec1d83..6417087aa62302 100644
--- a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
@@ -37,6 +37,8 @@ private OleDbConnection(OleDbConnection connection) : this()
[
DefaultValue(""),
+ Editor("Microsoft.VSDesigner.Data.ADO.Design.OleDbConnectionStringEditor, 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"),
#pragma warning disable 618 // ignore obsolete warning about RecommendedAsConfigurable to use SettingsBindableAttribute
RecommendedAsConfigurable(true),
#pragma warning restore 618
diff --git a/src/libraries/System.Data.OleDb/src/OleDbConnectionStringBuilder.cs b/src/libraries/System.Data.OleDb/src/OleDbConnectionStringBuilder.cs
index 91e07a35389d99..67737585e1ea27 100644
--- a/src/libraries/System.Data.OleDb/src/OleDbConnectionStringBuilder.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbConnectionStringBuilder.cs
@@ -146,6 +146,8 @@ public string DataSource
}
[DisplayName(DbConnectionStringKeywords.FileName)]
+ [Editor("System.Windows.Forms.Design.FileNameEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[RefreshProperties(RefreshProperties.All)]
// TODO: hand off to VS, they derive from FileNameEditor and set the OpenDialogFilter to *.UDL
public string FileName
diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
index b5ba124a7db63f..a9aa7d1d56b334 100644
--- a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
@@ -43,9 +43,9 @@ private OleDbDataAdapter(OleDbDataAdapter from) : base(from)
GC.SuppressFinalize(this);
}
- [
- DefaultValue(null),
- ]
+ [DefaultValue(null)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OleDbCommand? DeleteCommand
{
get { return _deleteCommand; }
@@ -58,9 +58,9 @@ private OleDbDataAdapter(OleDbDataAdapter from) : base(from)
set { _deleteCommand = (OleDbCommand?)value; }
}
- [
- DefaultValue(null)
- ]
+ [DefaultValue(null)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OleDbCommand? InsertCommand
{
get { return _insertCommand; }
@@ -73,9 +73,9 @@ private OleDbDataAdapter(OleDbDataAdapter from) : base(from)
set { _insertCommand = (OleDbCommand?)value; }
}
- [
- DefaultValue(null)
- ]
+ [DefaultValue(null)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OleDbCommand? SelectCommand
{
get { return _selectCommand; }
@@ -88,9 +88,9 @@ private OleDbDataAdapter(OleDbDataAdapter from) : base(from)
set { _selectCommand = (OleDbCommand?)value; }
}
- [
- DefaultValue(null)
- ]
+ [DefaultValue(null)]
+ [Editor("Microsoft.VSDesigner.Data.Design.DBCommandEditor, 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")]
public new OleDbCommand? UpdateCommand
{
get { return _updateCommand; }
diff --git a/src/libraries/System.Data.OleDb/src/OleDbParameterCollection.cs b/src/libraries/System.Data.OleDb/src/OleDbParameterCollection.cs
index 3f540656e000d3..3c7c54447e7099 100644
--- a/src/libraries/System.Data.OleDb/src/OleDbParameterCollection.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbParameterCollection.cs
@@ -6,6 +6,8 @@
namespace System.Data.OleDb
{
+ [Editor("Microsoft.VSDesigner.Data.Design.DBParametersEditor, 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")]
public sealed partial class OleDbParameterCollection : DbParameterCollection
{
private int _changeID;
diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.cs b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.cs
index d3a88c5dcd1b34..5daef043403889 100644
--- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.cs
+++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.cs
@@ -110,6 +110,7 @@ internal EventLogEntry() { }
public int Index { get { throw null; } }
public long InstanceId { get { throw null; } }
public string MachineName { get { throw null; } }
+ [System.ComponentModel.EditorAttribute("System.ComponentModel.Design.BinaryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string Message { get { throw null; } }
public string[] ReplacementStrings { get { throw null; } }
public string Source { get { throw null; } }
diff --git a/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogEntry.cs b/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogEntry.cs
index ea845ff0deba29..8b838f4a5c859b 100644
--- a/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogEntry.cs
+++ b/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/EventLogEntry.cs
@@ -140,6 +140,8 @@ public EventLogEntryType EntryType
///
/// The text of the message for this entry.
///
+ [Editor("System.ComponentModel.Design.BinaryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string Message
{
get
diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
index e2c682735fce1d..c507046069af80 100644
--- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
+++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs
@@ -26,7 +26,7 @@ public partial class MonitoringDescriptionAttribute : System.ComponentModel.Desc
public MonitoringDescriptionAttribute(string description) { }
public override string Description { get { throw null; } }
}
- [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class Process : System.ComponentModel.Component, System.IDisposable
{
public Process() { }
@@ -130,7 +130,7 @@ public void WaitForExit() { }
public bool WaitForInputIdle() { throw null; }
public bool WaitForInputIdle(int milliseconds) { throw null; }
}
- [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class ProcessModule : System.ComponentModel.Component
{
internal ProcessModule() { }
@@ -171,9 +171,11 @@ public ProcessStartInfo(string fileName, string arguments) { }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public string Domain { get { throw null; } set { } }
public System.Collections.Generic.IDictionary Environment { get { throw null; } }
+ [System.ComponentModel.EditorAttribute("System.Diagnostics.Design.StringDictionaryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public System.Collections.Specialized.StringDictionary EnvironmentVariables { get { throw null; } }
public bool ErrorDialog { get { throw null; } set { } }
public System.IntPtr ErrorDialogParentHandle { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("System.Diagnostics.Design.StartFileNameEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string FileName { get { throw null; } set { } }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public bool LoadUserProfile { get { throw null; } set { } }
@@ -195,9 +197,10 @@ public ProcessStartInfo(string fileName, string arguments) { }
public string[] Verbs { get { throw null; } }
[System.ComponentModel.DefaultValueAttribute(System.Diagnostics.ProcessWindowStyle.Normal)]
public System.Diagnostics.ProcessWindowStyle WindowStyle { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("System.Diagnostics.Design.WorkingDirectoryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string WorkingDirectory { get { throw null; } set { } }
}
- [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [System.ComponentModel.DesignerAttribute("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class ProcessThread : System.ComponentModel.Component
{
internal ProcessThread() { }
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
index 02bbf60cc7cb67..d317a3d6801ef5 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
@@ -21,7 +21,7 @@ namespace System.Diagnostics
/// processes. Enables you to start and stop system processes.
///
///
- [Designer("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [Designer("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class Process : Component
{
private bool _haveProcessId;
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs
index b2abe8263bc8e9..b45513b076c60b 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs
@@ -10,7 +10,7 @@ namespace System.Diagnostics
/// a particular process. Using this component, you can determine
/// information about the module.
///
- [Designer("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [Designer("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public class ProcessModule : Component
{
private FileVersionInfo? _fileVersionInfo;
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs
index 1f207cabc24c1c..050afb547972f2 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.cs
@@ -77,6 +77,8 @@ public Collection ArgumentList
public bool CreateNoWindow { get; set; }
+ [Editor("System.Diagnostics.Design.StringDictionaryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public StringDictionary EnvironmentVariables => new StringDictionaryWrapper((Environment as DictionaryWrapper)!);
public IDictionary Environment
@@ -121,6 +123,8 @@ public Collection ArgumentList
/// Returns or sets the application, document, or URL that is to be launched.
///
///
+ [Editor("System.Diagnostics.Design.StartFileNameEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string FileName
{
get => _fileName ?? string.Empty;
@@ -131,6 +135,8 @@ public string FileName
/// Returns or sets the initial directory for the process that is started.
/// Specify "" to if the default is desired.
///
+ [Editor("System.Diagnostics.Design.WorkingDirectoryEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string WorkingDirectory
{
get => _directory ?? string.Empty;
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs
index 6ff4cafba84986..e147573bc13bc9 100644
--- a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs
+++ b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs
@@ -13,7 +13,7 @@ namespace System.Diagnostics
/// returned from the System.Diagnostics.Process.ProcessThread property of the System.Diagnostics.Process component.
///
///
- [Designer("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+ [Designer("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public partial class ProcessThread : Component
{
private readonly bool _isRemoteMachine;
diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs
index b14173fb6c6ef1..20820945c2e044 100644
--- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs
+++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs
@@ -224,6 +224,7 @@ public DirectorySearcher(string filter, string[] propertiesToLoad, System.Direct
public string Filter { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(0)]
public int PageSize { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("System.Windows.Forms.Design.StringCollectionEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public System.Collections.Specialized.StringCollection PropertiesToLoad { get { throw null; } }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool PropertyNamesOnly { get { throw null; } set { } }
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
index 2aff6d1e9d7035..444455bdae31d4 100644
--- a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
+++ b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
@@ -230,6 +230,8 @@ public int PageSize
/// Gets the set of properties retrieved during the search. By default, the
/// and properties are retrieved.
///
+ [Editor("System.Windows.Forms.Design.StringCollectionEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public StringCollection PropertiesToLoad
{
get
diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
index ca1dd612121086..b6850ab97ef316 100644
--- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
+++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs
@@ -6,6 +6,7 @@
namespace System.Drawing
{
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.BitmapEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class Bitmap : System.Drawing.Image
{
public Bitmap(System.Drawing.Image original) { }
@@ -236,6 +237,7 @@ public partial struct CharacterRange
public static bool operator ==(System.Drawing.CharacterRange cr1, System.Drawing.CharacterRange cr2) { throw null; }
public static bool operator !=(System.Drawing.CharacterRange cr1, System.Drawing.CharacterRange cr2) { throw null; }
}
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.ContentAlignmentEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public enum ContentAlignment
{
TopLeft = 1,
@@ -268,6 +270,7 @@ public enum CopyPixelOperation
Whiteness = 16711778,
CaptureBlt = 1073741824,
}
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.FontEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.TypeConverterAttribute(typeof(System.Drawing.FontConverter))]
public sealed partial class Font : System.MarshalByRefObject, System.ICloneable, System.IDisposable, System.Runtime.Serialization.ISerializable
{
@@ -299,6 +302,7 @@ public Font(string familyName, float emSize, System.Drawing.GraphicsUnit unit) {
[System.ComponentModel.DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public bool Italic { get { throw null; } }
[System.ComponentModel.DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.FontNameEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.TypeConverterAttribute(typeof(System.Drawing.FontConverter.FontNameConverter))]
public string Name { get { throw null; } }
[System.ComponentModel.BrowsableAttribute(false)]
@@ -656,6 +660,7 @@ public enum GraphicsUnit
Document = 5,
Millimeter = 6,
}
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.IconEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.TypeConverterAttribute(typeof(System.Drawing.IconConverter))]
public sealed partial class Icon : System.MarshalByRefObject, System.ICloneable, System.IDisposable, System.Runtime.Serialization.ISerializable
{
@@ -698,6 +703,7 @@ public partial interface IDeviceContext : System.IDisposable
System.IntPtr GetHdc();
void ReleaseHdc();
}
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.ImageEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.ImmutableObjectAttribute(true)]
[System.ComponentModel.TypeConverterAttribute(typeof(System.Drawing.ImageConverter))]
public abstract partial class Image : System.MarshalByRefObject, System.ICloneable, System.IDisposable, System.Runtime.Serialization.ISerializable
@@ -2369,6 +2375,7 @@ public enum ImageLockMode
ReadWrite = 3,
UserInputBuffer = 4,
}
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.MetafileEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class Metafile : System.Drawing.Image
{
public Metafile(System.IntPtr henhmetafile, bool deleteEmf) { }
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.cs
index fbeaeebaaa37a9..9fd86e054c1bda 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.cs
@@ -10,6 +10,8 @@
namespace System.Drawing
{
+ [Editor("System.Drawing.Design.BitmapEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class Bitmap : Image
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/ContentAlignment.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/ContentAlignment.cs
index 64f863522cbb59..12a1932e19c820 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/ContentAlignment.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/ContentAlignment.cs
@@ -6,6 +6,8 @@ namespace System.Drawing
///
/// Specifies alignment of content on the drawing surface.
///
+ [System.ComponentModel.Editor("System.Drawing.Design.ContentAlignmentEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public enum ContentAlignment
{
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Font.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Font.cs
index 106653389c38f8..a1b970ef031384 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Font.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Font.cs
@@ -13,6 +13,8 @@ namespace System.Drawing
///
/// Defines a particular format for text, including font face, size, and style attributes.
///
+ [Editor("System.Drawing.Design.FontEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[TypeConverter(typeof(FontConverter))]
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
@@ -74,6 +76,8 @@ public sealed partial class Font : MarshalByRefObject, ICloneable, IDisposable,
/// Gets the face name of this .
///
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+ [Editor("System.Drawing.Design.FontNameEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[TypeConverter(typeof(FontConverter.FontNameConverter))]
public string Name => FontFamily.Name;
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs
index c5288cc6744d98..48d7e86210ab27 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs
@@ -44,7 +44,9 @@
namespace System.Drawing
{
- [System.ComponentModel.TypeConverter(typeof(IconConverter))]
+ [Editor("System.Drawing.Design.IconEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+ [TypeConverter(typeof(IconConverter))]
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class Icon : MarshalByRefObject, ISerializable, ICloneable, IDisposable
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs
index 6ade4a7267cd5d..7e1834e3708f86 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs
@@ -13,6 +13,8 @@
namespace System.Drawing
{
+ [Editor("System.Drawing.Design.IconEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[TypeConverter(typeof(IconConverter))]
[Serializable]
[TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs
index d6b2d3cc91ddff..4321b50a8140e9 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs
@@ -14,6 +14,8 @@ namespace System.Drawing
///
/// An abstract base class that provides functionality for 'Bitmap', 'Icon', 'Cursor', and 'Metafile' descended classes.
///
+ [Editor("System.Drawing.Design.ImageEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[ImmutableObject(true)]
[Serializable]
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.cs
index 042b69f9585449..d551e5ac9102eb 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.IO;
+using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
@@ -13,6 +14,8 @@ namespace System.Drawing.Imaging
/// Defines a graphic metafile. A metafile contains records that describe a sequence of graphics operations that
/// can be recorded and played back.
///
+ [Editor("System.Drawing.Design.MetafileEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[Serializable]
[TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public sealed partial class Metafile : Image
diff --git a/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs b/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs
index 47ef56bea8a5d4..7f409066648d0d 100644
--- a/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs
+++ b/src/libraries/System.Drawing.Primitives/ref/System.Drawing.Primitives.cs
@@ -6,6 +6,7 @@
namespace System.Drawing
{
+ [System.ComponentModel.EditorAttribute("System.Drawing.Design.ColorEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[System.ComponentModel.TypeConverterAttribute("System.Drawing.ColorConverter, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public readonly partial struct Color : System.IEquatable
{
diff --git a/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs b/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs
index 63f3fd6f353248..0ea4b583bd73c1 100644
--- a/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs
+++ b/src/libraries/System.Drawing.Primitives/src/System/Drawing/Color.cs
@@ -8,6 +8,8 @@
namespace System.Drawing
{
[DebuggerDisplay("{NameAndARGBValue}")]
+ [Editor("System.Drawing.Design.ColorEditor, System.Drawing.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[Serializable]
[TypeConverter("System.Drawing.ColorConverter, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
diff --git a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs
index 960ce490a91abb..1f926bff17f315 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs
+++ b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs
@@ -31,6 +31,7 @@ public FileSystemWatcher(string path, string filter) { }
public bool IncludeSubdirectories { get { throw null; } set { } }
public int InternalBufferSize { get { throw null; } set { } }
public System.IO.NotifyFilters NotifyFilter { get { throw null; } set { } }
+ [System.ComponentModel.EditorAttribute("System.Diagnostics.Design.FSWPathEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string Path { get { throw null; } set { } }
public override System.ComponentModel.ISite? Site { get { throw null; } set { } }
public System.ComponentModel.ISynchronizeInvoke? SynchronizingObject { get { throw null; } set { } }
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs b/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
index ae1c363e4d4ec1..16bdbb1074ce59 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
@@ -238,6 +238,8 @@ private byte[] AllocateBuffer()
///
/// Gets or sets the path of the directory to watch.
///
+ [Editor("System.Diagnostics.Design.FSWPathEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
+ "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
public string Path
{
get