FontConverter restore order of font properties (dotnet/runtime#45746)

.NET Framework implementation of `FontConverter` provided a different
order of font properties, that can be observed by inspecting an instance
of a font in a `PropertyGrid`.

Restore the original sort order.

The .NET Framework implementation has another sort argument "Weight",
which however doesn't appear to be a property of `Font` type.
It is possible this property has existed at some point, or the converter
may have been expected to work for instances of `IFontDisp` object.
Either way presence or absence of "Weight" doesn't appear to make any
difference, hence it has not been ported across.

Fixes dotnet/runtime#45631

Commit migrated from dotnet/runtime@22328c5

Author: RussKie

src/System.Drawing.Common/src/System/Drawing/FontConverter.cs

@@ -365,7 +365,11 @@ public override PropertyDescriptorCollection GetProperties(
             object? value,
             Attribute[]? attributes)
         {
-            return value is Font ? TypeDescriptor.GetProperties(value, attributes) : base.GetProperties(context, value, attributes);
+            if (value is not Font)
+                return base.GetProperties(context, value, attributes);
+
+            PropertyDescriptorCollection props = TypeDescriptor.GetProperties(value, attributes);
+            return props.Sort(new string[] { nameof(Font.Name), nameof(Font.Size), nameof(Font.Unit) });
         }
 
         public override bool GetPropertiesSupported(ITypeDescriptorContext context) => true;

src/System.Drawing.Common/tests/System/Drawing/FontConverterTests.cs

@@ -81,6 +81,38 @@ public void EmptyStringInput()
             Assert.Null(font);
         }
 
+        [ConditionalFact(Helpers.IsDrawingSupported)]
+        public void GetFontPropsSorted()
+        {
+            // The order provided since .NET Framework
+            string[] expectedPropNames = new[]
+            {
+                nameof(Font.Name),
+                nameof(Font.Size),
+                nameof(Font.Unit),
+                nameof(Font.Bold),
+                nameof(Font.GdiCharSet),
+                nameof(Font.GdiVerticalFont),
+                nameof(Font.Italic),
+                nameof(Font.Strikeout),
+                nameof(Font.Underline),
+            };
+
+            FontConverter converter = new FontConverter();
+            Font font = new($"Courier New", 8.25f, FontStyle.Regular, GraphicsUnit.Point);
+
+            PropertyDescriptorCollection props = converter.GetProperties(font);
+            string[] propNames = new string[props.Count];
+
+            int index = 0;
+            foreach (PropertyDescriptor prop in props)
+            {
+                propNames[index++] = prop.DisplayName;
+            }
+
+            Assert.True(propNames.SequenceEqual(expectedPropNames));
+        }
+
         public static TheoryData<string, string, float, GraphicsUnit, FontStyle> TestConvertFormData()
         {
             var data = PlatformDetection.IsWindows ?