Merge branch 'master' into WFI-585-port-system-windows-forms-design-components

Author: JuditRose

eng/Version.Details.xml

@@ -39,9 +39,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27525-01">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27525-14">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>c521a89c14023a08d9cd6fb4b47dc13ca3c5e1f7</Sha>
+      <Sha>36f75eb9d513d79acbd84b8137e5f4c10b38f5a1</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
@@ -65,14 +65,14 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27525-71" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>a593024b85a6e074770c88867491f4f30cc6fc8a</Sha>
+      <Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
       <SourceBuildId>5596</SourceBuildId>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27525-71" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>a593024b85a6e074770c88867491f4f30cc6fc8a</Sha>
+      <Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
       <SourceBuildId>5596</SourceBuildId>
     </Dependency>
   </ToolsetDependencies>

eng/Versions.props

@@ -26,7 +26,7 @@
   </PropertyGroup>
   <!-- CoreCLR-updated dependencies -->
   <PropertyGroup>
-    <MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27525-71</MicrosoftNETCoreILAsmPackageVersion>
+    <MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27525-72</MicrosoftNETCoreILAsmPackageVersion>
   </PropertyGroup>
   <!-- Arcade-updated dependencies -->
   <PropertyGroup>

global.json

@@ -11,6 +11,6 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19162.7",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19162.7",
-    "Microsoft.NET.Sdk.IL": "3.0.0-preview4-27525-71"
+    "Microsoft.NET.Sdk.IL": "3.0.0-preview4-27525-72"
   }
 }

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionItemCollection.cs

@@ -10,38 +10,20 @@ public class DesignerActionItemCollection : CollectionBase
     {
         public DesignerActionItem this[int index]
         {
-            get => throw new NotImplementedException(SR.NotImplementedByDesign);
-            set => throw new NotImplementedException(SR.NotImplementedByDesign);
+            get => (DesignerActionItem)(List[index]);
+            set => List[index] = value;
         }
 
-        public int Add(DesignerActionItem value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public bool Contains(DesignerActionItem value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public void CopyTo(DesignerActionItem[] array, int index)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
+        public int Add(DesignerActionItem value) => List.Add(value);
 
-        public int IndexOf(DesignerActionItem value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
+        public bool Contains(DesignerActionItem value) => List.Contains(value);
 
-        public void Insert(int index, DesignerActionItem value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
+        public void CopyTo(DesignerActionItem[] array, int index) => List.CopyTo(array, index);
 
-        public void Remove(DesignerActionItem value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
+        public int IndexOf(DesignerActionItem value) => List.IndexOf(value);
+        
+        public void Insert(int index, DesignerActionItem value) => List.Insert(index, value);
+        
+        public void Remove(DesignerActionItem value) => List.Remove(value);
     }
 }

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionListCollection.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace System.ComponentModel.Design
@@ -21,50 +22,50 @@ public DesignerActionListCollection(DesignerActionList[] value)
 
         public DesignerActionList this[int index]
         {
-            get => throw new NotImplementedException(SR.NotImplementedByDesign);
-            set => throw new NotImplementedException(SR.NotImplementedByDesign);
+            get => (DesignerActionList)(List[index]);
+            set => List[index] = value;
         }
 
         public int Add(DesignerActionList value)
         {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
+            return List.Add(value);
         }
 
         public void AddRange(DesignerActionList[] value)
         {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+            for (int i = 0; i < value.Length; i++)
+            {
+                Add(value[i]);
+            }
         }
 
         public void AddRange(DesignerActionListCollection value)
         {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public void Insert(int index, DesignerActionList value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public int IndexOf(DesignerActionList value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public bool Contains(DesignerActionList value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public void Remove(DesignerActionList value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
-        public void CopyTo(DesignerActionList[] array, int index)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
-
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+            int currentCount = value.Count;
+            for (int i = 0; i < currentCount; i++)
+            {
+                Add(value[i]);
+            }
+        }
+
+        public void Insert(int index, DesignerActionList value) => List.Insert(index, value);
+
+        public int IndexOf(DesignerActionList value) => List.IndexOf(value);
+        
+        public bool Contains(DesignerActionList value) => List.Contains(value);
+        
+        public void Remove(DesignerActionList value) => List.Remove(value);
+        
+        public void CopyTo(DesignerActionList[] array, int index) => List.CopyTo(array, index);
+        
         protected override void OnSet(int index, object oldValue, object newValue)
         {
         }
@@ -81,9 +82,6 @@ protected override void OnRemove(int index, object value)
         {
         }
 
-        protected override void OnValidate(object value)
-        {
-            throw new NotImplementedException(SR.NotImplementedByDesign);
-        }
+        protected override void OnValidate(object value) => Debug.Assert(value != null, "Don't add null actionlist!");
     }
 }

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

@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel.Design;
+using Xunit;
+
+namespace System.Windows.Forms.Design.Tests
+{
+    public class DesignerActionItemCollectionTests
+    {
+        [Fact]
+        public void DesignerActionItemCollection_Constructor()
+        {
+            DesignerActionItemCollection underTest = new DesignerActionItemCollection();
+            Assert.NotNull(underTest);
+            Assert.Empty(underTest);
+        }
+
+        [Fact]
+        public void DesignerActionItemCollection_Add_Contains_IndexOf()
+        {
+            DesignerActionItemCollection underTest = new DesignerActionItemCollection();
+
+            DesignerActionItem item1 = new DesignerActionItemTest("name", "category", "description");
+            underTest.Add(item1);
+            Assert.True(underTest.Contains(item1));
+            Assert.Equal(0, underTest.IndexOf(item1));
+
+            DesignerActionItem item2 = new DesignerActionItemTest("name1", "category1", "description1");
+            underTest.Add(item2);
+            Assert.True(underTest.Contains(item2));
+            Assert.Equal(1, underTest.IndexOf(item2));
+        }
+
+        [Fact]
+        public void DesignerActionItemCollection_Insert_Remove_Count()
+        {
+            DesignerActionItemCollection underTest = new DesignerActionItemCollection();
+            DesignerActionItem item1 = new DesignerActionItemTest("name", "category", "description");
+            DesignerActionItem item2 = new DesignerActionItemTest("name1", "category1", "description1");
+            DesignerActionItem item3 = new DesignerActionItemTest("name2", "category2", "description2");
+            DesignerActionItem item4 = new DesignerActionItemTest("name3", "category3", "description3");
+
+            underTest.Add(item1);
+            underTest.Add(item2);
+
+            underTest.Add(item3);
+            Assert.Equal(2, underTest.IndexOf(item3));
+
+            underTest.Insert(2, item4);
+            Assert.Equal(3, underTest.IndexOf(item3));
+            Assert.Equal(2, underTest.IndexOf(item4));
+
+            underTest.Remove(item4);
+            Assert.False(underTest.Contains(item4));
+            Assert.Equal(2, underTest.IndexOf(item3));
+            Assert.Equal(3, underTest.Count);
+        }
+
+        private class DesignerActionItemTest : DesignerActionItem
+        {
+            public DesignerActionItemTest(string displayName, string category, string description) : base(displayName, category, description)
+            {
+            }
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel.Design;
+using WinForms.Common.Tests;
+using Xunit;
+
+namespace System.Windows.Forms.Design.Tests
+{
+    public class DesignerActionListCollectionTests
+    {
+        [Fact]
+        public void DesignerActionListCollection_Constructor()
+        {
+            DesignerActionListCollection underTest = new DesignerActionListCollection();
+            Assert.NotNull(underTest);
+        }
+
+        [Fact]
+        public void DesignerActionListCollection_Constructor_DesignerActionList()
+        {
+            DesignerActionListCollection underTest = CreateNewCollectionOfItems();
+            Assert.NotNull(underTest);
+        }
+
+        [Fact]
+        public void DesignerActionItemCollection_Add_AddRange()
+        {
+            DesignerActionListCollection underTest = CreateNewCollectionOfItems(5);
+            Assert.Equal(5, underTest.Count);
+
+            Button button = new Button();
+            DesignerActionList list = new DesignerActionList(button);
+            underTest.Add(list);
+            Assert.Equal(6, underTest.Count);
+
+            DesignerActionListCollection other = CreateNewCollectionOfItems(3);
+            underTest.AddRange(other);
+            Assert.Equal(9, underTest.Count);
+        }
+
+
+        [Fact]
+        public void DesignerActionItemCollection_Insert_Contains_IndexOf()
+        {
+            DesignerActionListCollection underTest = CreateNewCollectionOfItems(5);
+
+            Button button = new Button();
+            DesignerActionList list = new DesignerActionList(button);
+            underTest.Insert(3, list);
+            Assert.True(underTest.Contains(list));
+            Assert.Equal(3, underTest.IndexOf(list));
+        }
+
+        [Fact]
+        public void DesignerActionItemCollection_Remove()
+        {
+            DesignerActionListCollection underTest = CreateNewCollectionOfItems(5);
+
+            Button button = new Button();
+            DesignerActionList list = new DesignerActionList(button);
+            underTest.Insert(3, list);
+            underTest.Remove(list);
+            Assert.False(underTest.Contains(list));
+            Assert.Equal(5, underTest.Count);
+        }
+
+        private DesignerActionListCollection CreateNewCollectionOfItems(int numberOfItems = 1)
+        {
+            Button button = new Button();
+            DesignerActionList[] list = new DesignerActionList[] { new DesignerActionList(button) };
+            DesignerActionListCollection underTest = new DesignerActionListCollection(list);
+
+            for (int i = 1; i < numberOfItems; i++)
+            {
+                underTest.Add(new DesignerActionList(button));
+            }
+
+            return underTest;
+        }
+    }
+}