Skip to content

Commit 3700448

Browse files
authored
Fix ComponentDocumentDesigner references in DesignerAttribute to include right base type (#44774) (#44899)
* Fix IComponent Designer attribute that was missing base designer type * Fix IRootDesigner references to use assembly qualified name * Fix build failures
1 parent 2767f44 commit 3700448

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void Dispose() { }
181181
public void RemoveHandler(object key, System.Delegate? value) { }
182182
}
183183
[System.ComponentModel.DesignerAttribute("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
184-
[System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
184+
[System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.IRootDesigner, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
185185
[System.ComponentModel.TypeConverterAttribute("System.ComponentModel.ComponentConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
186186
public partial interface IComponent : System.IDisposable
187187
{

src/libraries/System.ComponentModel.Primitives/src/System/ComponentModel/IComponent.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System.ComponentModel.Design;
45
using System.Runtime.InteropServices;
56

67
namespace System.ComponentModel
@@ -20,7 +21,8 @@ namespace System.ComponentModel
2021
/// Provides functionality required by all components.
2122
/// </summary>
2223
[Designer("System.ComponentModel.Design.ComponentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
23-
[Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
24+
[Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
25+
"System.ComponentModel.Design.IRootDesigner, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
2426
[TypeConverter("System.ComponentModel.ComponentConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
2527
public interface IComponent : IDisposable
2628
{

src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ public LookupBindingPropertiesAttribute(string dataSource, string displayMember,
809809
public override bool Equals(object obj) { throw null; }
810810
public override int GetHashCode() { throw null; }
811811
}
812-
[System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.ComponentModel.Design.IRootDesigner))]
812+
[System.ComponentModel.DesignerAttribute("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.IRootDesigner, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
813813
[System.ComponentModel.DesignerCategoryAttribute("Component")]
814814
[System.ComponentModel.TypeConverterAttribute(typeof(System.ComponentModel.ComponentConverter))]
815815
public partial class MarshalByValueComponent : System.ComponentModel.IComponent, System.IDisposable, System.IServiceProvider

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/MarshalByValueComponent.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ namespace System.ComponentModel
1010
/// Provides the base implementation for <see cref='System.ComponentModel.IComponent'/>,
1111
/// which is the base class for all components in Win Forms.
1212
/// </summary>
13-
[Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(IRootDesigner))]
13+
[Designer("System.Windows.Forms.Design.ComponentDocumentDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
14+
"System.ComponentModel.Design.IRootDesigner, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
1415
[DesignerCategory("Component")]
1516
[TypeConverter(typeof(ComponentConverter))]
1617
public class MarshalByValueComponent : IComponent, IServiceProvider

0 commit comments

Comments
 (0)