Port PropertyGridDesigner NotifyIconDesigner to runtime #4908

src/System.Design/src/System.Design.Forwards.cs

@@ -44,7 +44,9 @@
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ListViewDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.MaskedTextBoxDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.MonthCalendarDesigner))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.NotifyIconDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PanelDesigner))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PropertyGridDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PictureBoxDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.PrintDialogDesigner))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.RadioButtonDesigner))]

src/System.Windows.Forms.Design/src/Resources/SR.resx

@@ -1446,4 +1446,7 @@ Press Ctrl+Enter to accept Text.</value>
   <data name="ImageListActionList_ImageSizeDisplayName" xml:space="preserve">
     <value>Image Size</value>
   </data>
-</root>
+  <data name="ChooseIconDisplayName" xml:space="preserve">
+    <value>Choose Icon...</value>
+  </data>
+</root>

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/NotifyIconDesigner.cs

@@ -0,0 +1,55 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+using System.ComponentModel.Design;
+
+namespace System.Windows.Forms.Design
+{
+    internal class NotifyIconDesigner : ComponentDesigner
+    {
+        private DesignerActionListCollection? _actionLists;
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            NotifyIcon icon = (NotifyIcon)Component;
+            icon.Visible = true;
+        }
+
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_actionLists is null)
+                {
+                    _actionLists = new DesignerActionListCollection();
+                    _actionLists.Add(new NotifyIconActionList(this));
+                }
+
+                return _actionLists;
+            }
+        }
+    }
+
+    internal class NotifyIconActionList : DesignerActionList
+    {
+        private NotifyIconDesigner _designer;
+        public NotifyIconActionList(NotifyIconDesigner designer) : base(designer.Component)
+        {
+            _designer = designer;
+        }
+
+        public void ChooseIcon()
+        {
+            EditorServiceContext.EditValue(_designer, Component, "Icon");
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionMethodItem(this, "ChooseIcon", SR.ChooseIconDisplayName, true));
+            return items;
+        }
+    }
+}

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/PropertyGridDesigner.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+
+namespace System.Windows.Forms.Design;
+
+internal class PropertyGridDesigner : ControlDesigner
+{
+    protected override void PreFilterProperties(IDictionary properties)
+    {
+        // Remove the ScrollableControl properties...
+        properties.Remove(nameof(PropertyGrid.AutoScroll));
+        properties.Remove(nameof(PropertyGrid.AutoScrollMargin));
+        properties.Remove(nameof(PropertyGrid.AutoScrollMinSize));
+        properties.Remove(nameof(PropertyGrid.DockPadding));
+
+        base.PreFilterProperties(properties);
+    }
+}

src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs

@@ -236,6 +236,8 @@ private void CreateDesignSurface(int n)
 
                         surface.CreateControl<TabControl>(new Size(400, 100), new Point(12, 21));
                         surface.CreateControl<TableLayoutPanel>(new Size(290, 160), new Point(20, 150));
+                        surface.CreateControl<PropertyGrid>(new Size(200, 150), new Point(430, 23));
+                        surface.CreateComponent<NotifyIcon>();
                     }
 
                     break;

src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/DesignerAttributeTests.cs

@@ -31,8 +31,6 @@ public class DesignerAttributeTests
         "System.Windows.Forms.Design.DataGridViewDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
         "System.Windows.Forms.Design.FlowLayoutPanelDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
         "System.Windows.Forms.Design.FolderBrowserDialogDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-        "System.Windows.Forms.Design.NotifyIconDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
-        "System.Windows.Forms.Design.PropertyGridDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
         "System.Windows.Forms.Design.SaveFileDialogDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
         "System.Windows.Forms.Design.StatusBarDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
         "System.Windows.Forms.Design.ToolStripContainerDesigner, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",