StringBuilder.AppendFormat refactos

Author: halgab

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs

@@ -303,15 +303,10 @@ internal string ConvertToString(string format, IFormatProvider provider)
                 String uriString = safeUnescapedUri.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
 
                 var sb = new StringBuilder();
-                sb.AppendFormat(provider, "{0}{1} ", Parsers.s_ContextColor, uriString);
-                sb.AppendFormat(provider,"{1:" + format + "}{0}",separator,scRgbColor.a);
-                for (int i= 0; i< nativeColorValue.GetLength(0); ++i )
+                sb.Append(provider, $"{Parsers.s_ContextColor}{uriString}{scRgbColor.a:R}");
+                for (int i= 0; i< nativeColorValue.Length; ++i )
                 {
-                    sb.AppendFormat(provider,"{0:" + format + "}",nativeColorValue[i]);
-                    if (i< nativeColorValue.GetLength(0)-1 )
-                    {
-                        sb.AppendFormat(provider,"{0}",separator);
-                    }
+                    sb.Append(provider, $"{separator}{nativeColorValue[i]:R}");
                 }
                 return sb.ToString();
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyMap.cs

@@ -107,15 +107,19 @@ public string Unicode
 
             get 
             {
+                if (_ranges.Length == 0)
+                {
+                    return string.Empty;
+                }
+
                 System.Text.StringBuilder sb = new System.Text.StringBuilder();
 
                 for (int i = 0; i < _ranges.Length; ++i)
                 {
-                    if (i != 0) sb.Append(',');
-                    sb.AppendFormat(NumberFormatInfo.InvariantInfo, "{0:x4}-{1:x4}", _ranges[i].First, _ranges[i].Last);
+                    sb.Append(NumberFormatInfo.InvariantInfo, $"{_ranges[i].First:x4}-{_ranges[i].Last:x4},");
                 }
 
-                return sb.ToString();
+                return sb.ToString(0, sb.Length - 1);
             }
         }
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs

@@ -253,12 +253,12 @@ private void AddCluster(int glyphClusterStart, int glyphClusterEnd, int charClus
             // the format is ... [(CharacterClusterSize[:GlyphClusterSize])] GlyphIndex ...
             if (glyphsInCluster != 1)
             {
-                _indicesStringBuider.AppendFormat(CultureInfo.InvariantCulture, "({0}:{1})", charactersInCluster, glyphsInCluster);
+                _indicesStringBuider.Append(CultureInfo.InvariantCulture, $"({charactersInCluster}:{glyphsInCluster})");
             }
             else
             {
                 if (charactersInCluster != 1)
-                    _indicesStringBuider.AppendFormat(CultureInfo.InvariantCulture, "({0})", charactersInCluster);
+                    _indicesStringBuider.Append(CultureInfo.InvariantCulture, $"({charactersInCluster})");
                 else
                 {
                     // 1:1 cluster, we can omit (n:m) specification and possibly deduce some
@@ -315,13 +315,13 @@ private string CreateCaretStopsString()
                     mask >>= 1;
                 else
                 {
-                    sb.AppendFormat("{0:x1}", accumulatedValue);
+                    sb.Append($"{accumulatedValue:x1}");
                     accumulatedValue = 0;
                     mask = 0x8;
                 }
             }
             if (mask != 0x8)
-                sb.AppendFormat("{0:x1}", accumulatedValue);
+                sb.Append($"{accumulatedValue:x1}");
 
             Debug.Assert(caretStopStringLength == sb.ToString().Length);