Port DataGridViewColumnCollectionEditor

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

@@ -30,6 +30,7 @@
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TreeNodeCollectionEditor))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.DataMemberListEditor))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.DataGridViewColumnDataPropertyNameEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.DataGridViewColumnCollectionEditor))]
 
 // internal serializers
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ControlCodeDomSerializer))]

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

@@ -1572,6 +1572,9 @@ Press Ctrl+Enter to accept Text.</value>
   <data name="DataGridViewColumnTypePropertyDescription" xml:space="preserve">
     <value>The DataGridViewColumn type.</value>
   </data>
+  <data name="DataGridViewColumnCollectionTransaction" xml:space="preserve">
+    <value>DataGridView ColumnCollection Edit</value>
+  </data>
   <data name="DesignBindingPickerAddProjDataSourceLabel" xml:space="preserve">
     <value>Add new Object Data Source...</value>
   </data>

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

@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+
+namespace System.Windows.Forms.Design;
+internal class DataGridViewColumnCollectionEditor : UITypeEditor
+{
+    public DataGridViewColumnCollectionEditor() : base() { }
+
+    private DataGridViewColumnCollectionDialog? _dataGridViewColumnCollectionDialog;
+
+    public override object? EditValue(ITypeDescriptorContext? context, IServiceProvider provider, object? value)
+    {
+        IWindowsFormsEditorService? edSvc = provider?.GetService<IWindowsFormsEditorService>();
+
+        if (provider is null || edSvc is null || context?.Instance is null
+            || provider.GetService(typeof(IDesignerHost)) is not IDesignerHost host)
+        {
+            return value;
+        }
+
+        using (ScaleHelper.EnterDpiAwarenessScope(DPI_AWARENESS_CONTEXT.DPI_AWARENESS_CONTEXT_SYSTEM_AWARE))
+        {
+            _dataGridViewColumnCollectionDialog ??= new();
+
+            _dataGridViewColumnCollectionDialog.SetLiveDataGridView((DataGridView)context.Instance);
+
+            using DesignerTransaction trans = host.CreateTransaction(SR.DataGridViewColumnCollectionTransaction);
+            if (edSvc.ShowDialog(_dataGridViewColumnCollectionDialog) == DialogResult.OK)
+            {
+                trans.Commit();
+            }
+            else
+            {
+                trans.Cancel();
+            }
+        }
+
+        return value;
+    }
+
+    public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? context) => UITypeEditorEditStyle.Modal;
+}

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

@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using Moq;
+using System.ComponentModel;
+using System.Drawing.Design;
+
+namespace System.Windows.Forms.Design.Tests;
+
+public class DataGridViewColumnCollectionEditorTests
+{
+    [Fact]
+    public void DataGridViewColumnCollectionEditor_GetEditStyle()
+        => new DataGridViewColumnCollectionEditor().GetEditStyle().Should().Be(UITypeEditorEditStyle.Modal);
+
+    [Fact]
+    public void DataGridViewColumnCollectionEditor_IsDropDownResizable()
+        => new DataGridViewColumnCollectionEditor().IsDropDownResizable.Should().Be(false);
+
+    [Fact]
+    public void DataGridViewColumnCollectionEditor_EditValue()
+    {
+        DataGridViewColumnCollectionEditor dataGridViewColumnCollectionEditor = new();
+        object value = "123";
+        dataGridViewColumnCollectionEditor.EditValue(null, null!, value).Should().Be(value);
+
+        Mock<ITypeDescriptorContext> mockTypeDescriptorContext = new(MockBehavior.Strict);
+        dataGridViewColumnCollectionEditor.EditValue(mockTypeDescriptorContext.Object, null!, value).Should().Be(value);
+
+        Mock<IServiceProvider> mockServiceProvider = new(MockBehavior.Strict);
+        mockServiceProvider.Setup(x => x.GetService(typeof(IWindowsFormsEditorService))).Returns(null!);
+        dataGridViewColumnCollectionEditor.EditValue(null, mockServiceProvider.Object, value).Should().Be(value);
+
+        mockTypeDescriptorContext.Setup(x => x.Instance).Returns(null!);
+        dataGridViewColumnCollectionEditor.EditValue(null, mockServiceProvider.Object, value).Should().Be(value);
+    }
+}

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

@@ -25,6 +25,7 @@ public class DesignerAttributeTests
         $"System.Windows.Forms.Design.DataGridTableStyleMappingNameEditor, {Assemblies.SystemDesign}",
         $"System.Windows.Forms.Design.DataGridDesigner, {Assemblies.SystemDesign}",
         $"System.Windows.Forms.Design.DataGridViewColumnCollectionEditor, {Assemblies.SystemDesign}",
+        $"System.Windows.Forms.Design.DataGridViewColumnDataPropertyNameEditor, {Assemblies.SystemDesign}",
         $"System.Windows.Forms.Design.DataGridViewComponentEditor, {Assemblies.SystemDesign}",
         $"System.Windows.Forms.Design.DataMemberFieldEditor, {Assemblies.SystemDesign}",
         $"System.Windows.Forms.Design.StatusBarDesigner, {Assemblies.SystemDesign}",