manual followups

Author: halgab

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ErasingStroke.cs

@@ -79,7 +79,7 @@ internal void MoveTo(IEnumerable<Point> path)
             }
 #if POINTS_FILTER_TRACE
             _totalPointsAdded += path.Length;
-            System.Diagnostics.Debug.WriteLine(String.Format("Total Points added: {0} screened: {1} collinear screened: {2}", _totalPointsAdded, _totalPointsScreened, _collinearPointsScreened));
+            System.Diagnostics.Debug.WriteLine($"Total Points added: {_totalPointsAdded} screened: {_totalPointsScreened} collinear screened: {_collinearPointsScreened}");
 #endif
 
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/DynamicRendererThreadManager.cs

@@ -256,11 +256,9 @@ void Dispose(bool disposing)
                     }
                     catch(System.ComponentModel.Win32Exception e)
                     {
-                        if (e.NativeErrorCode != 1400) // ERROR_INVALID_WINDOW_HANDLE
-                        {
+                        Debug.WriteLineIf(e.NativeErrorCode != 1400, // ERROR_INVALID_WINDOW_HANDLE
                             // This is an unlocalized string but it only prints on the Debug Console
-                            Debug.WriteLine(String.Format("Dispatcher.CriticalInvokeShutdown() Failed.  Error={0}", e.NativeErrorCode));
-                        }
+                            $"Dispatcher.CriticalInvokeShutdown() Failed.  Error={e.NativeErrorCode}");
                     }
                     finally
                     {

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButton.cs

@@ -100,7 +100,7 @@ internal void SetOwner(StylusDeviceBase stylusDevice)
         /// <returns><see cref="System.String"/> name of the tablet</returns>
         public override string ToString()
         {
-            return String.Format(CultureInfo.CurrentCulture, "{0}({1})", base.ToString(), this.Name);
+            return $"{base.ToString()}({this.Name})";
         }
 
         /////////////////////////////////////////////////////////////////////

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDevice.cs

@@ -175,7 +175,7 @@ public string Name
         /// </summary>
         public override string ToString()
         {
-            return String.Format(CultureInfo.CurrentCulture, "{0}({1})", base.ToString(), this.Name);
+            return $"{base.ToString()}({this.Name})";
         }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceBase.cs

@@ -185,7 +185,7 @@ internal TabletDeviceType Type
         /// </summary>
         public override string ToString()
         {
-            return String.Format(CultureInfo.CurrentCulture, "{0}({1})", base.ToString(), Name);
+            return $"{base.ToString()}({this.Name})";
         }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThreadWorker.cs

@@ -1160,7 +1160,7 @@ internal void ThreadProc()
                 while (!__disposed)
                 {
 #if TRACEPTW
-                    Debug.WriteLine(String.Format("PenThreadWorker::ThreadProc():  Update __penContextWeakRefList loop"));
+                    Debug.WriteLine("PenThreadWorker::ThreadProc():  Update __penContextWeakRefList loop");
 #endif
 
                     // We need to ensure that the PenIMC COM objects can be used from this thread.
@@ -1195,7 +1195,7 @@ internal void ThreadProc()
                     while (true)
                     {
 #if TRACEPTW
-                        Debug.WriteLine (String.Format("PenThreadWorker::ThreadProc - handle event loop"));
+                        Debug.WriteLine("PenThreadWorker::ThreadProc - handle event loop");
 #endif
                         // get next event
                         int     evt;
@@ -1229,9 +1229,9 @@ internal void ThreadProc()
                         {
                             // dispatch the event
 #if TRACEPTW
-                            Debug.WriteLine (String.Format("PenThreadWorker::ThreadProc - FireEvent [evt={0}, stylusId={1}]", evt, stylusPointerId));
+                            Debug.WriteLine($"PenThreadWorker::ThreadProc - FireEvent [evt={evt}, stylusId={stylusPointerId}]");
 #endif
-                            
+
                             // This comment addresses and IndexOutOfRangeException in PenThreadWorker which is related and likely caused by the above.
                             // This index is safe as long as there are no corruption issues within PenIMC.  There have been
                             // instances of IndexOutOfRangeExceptions from this code but this should not occur in practice.
@@ -1248,7 +1248,7 @@ internal void ThreadProc()
                         else
                         {
 #if TRACEPTW
-                            Debug.WriteLine (String.Format("PenThreadWorker::ThreadProc - FlushInput"));
+                            Debug.WriteLine("PenThreadWorker::ThreadProc - FlushInput");
 #endif
                             FlushCache(true);
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs

@@ -1117,7 +1117,7 @@ internal override string Name
         /// </summary>
         public override string ToString()
         {
-            return String.Format(CultureInfo.CurrentCulture, "{0}({1})", base.ToString(), this.Name);
+            return $"{base.ToString()}({this.Name})";
         }
 
         /////////////////////////////////////////////////////////////////////

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispTabletDevice.cs

@@ -169,7 +169,7 @@ internal override PresentationSource ActiveSource
         /// </summary>
         public override string ToString()
         {
-            return String.Format(CultureInfo.CurrentCulture, "{0}({1})", base.ToString(), Name);
+            return $"{base.ToString()}({this.Name})";
         }
 
         /////////////////////////////////////////////////////////////////////////

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySpline.cs

@@ -491,12 +491,7 @@ internal string InternalConvertToString(string format, IFormatProvider formatPro
             // Helper to get the numeric list separator for a given culture.
             char separator = MS.Internal.TokenizerHelper.GetNumericListSeparator(formatProvider);
 
-            return String.Format(
-                formatProvider, 
-                "{1}{0}{2}",
-                separator,
-                _controlPoint1,
-                _controlPoint2);
+            return string.Create(formatProvider, $"{_controlPoint1}{separator}{_controlPoint2}");
         }
 
         #endregion

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySplineConverter.cs

@@ -122,15 +122,11 @@ public override object ConvertTo(
                 else if (destinationType == typeof(string))
                 {
 #pragma warning disable 56506 // Suppress presharp warning: Parameter 'cultureInfo.TextInfo' to this public method must be validated:  A null-dereference can occur here.
-                    return String.Format(
-                        cultureInfo,
-                        "{0}{4}{1}{4}{2}{4}{3}",
-                        keySpline.ControlPoint1.X,
-                        keySpline.ControlPoint1.Y,
-                        keySpline.ControlPoint2.X,
-                        keySpline.ControlPoint2.Y,
-                        cultureInfo != null ? cultureInfo.TextInfo.ListSeparator : CultureInfo.InvariantCulture.TextInfo.ListSeparator);
+                    string separator = cultureInfo != null ? cultureInfo.TextInfo.ListSeparator : CultureInfo.InvariantCulture.TextInfo.ListSeparator;
 #pragma warning restore 56506
+                    return string.Create(
+                        cultureInfo,
+                        $"{keySpline.ControlPoint1.X}{separator}{keySpline.ControlPoint1.Y}{separator}{keySpline.ControlPoint2.X}{separator}{keySpline.ControlPoint2.Y}");
                 }
             }