[StyleCleanUp] Addressing CA warnings Part 1

src/Microsoft.DotNet.Wpf/src/.editorconfig

@@ -105,15 +105,6 @@ dotnet_diagnostic.CA1834.severity = suggestion
 # CA1838: Avoid StringBuilder parameters for P/Invokes
 dotnet_diagnostic.CA1838.severity = suggestion
 
-# CA1845: Use span-based 'string.Concat'
-dotnet_diagnostic.CA1845.severity = suggestion
-
-# CA1846: Prefer AsSpan over Substring
-dotnet_diagnostic.CA1846.severity = suggestion
-
-# CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
-dotnet_diagnostic.CA1847.severity = suggestion
-
 # CA1851: Possible multiple enumerations of IEnumerable collection
 dotnet_diagnostic.CA1851.severity = suggestion
 
@@ -161,12 +152,6 @@ dotnet_diagnostic.CA2219.severity = suggestion
 # CA2242: Test for NaN correctly
 dotnet_diagnostic.CA2242.severity = suggestion
 
-# CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
-dotnet_diagnostic.CA2249.severity = suggestion
-
-# CA2251: Use String.Equals over String.Compare
-dotnet_diagnostic.CA2251.severity = suggestion
-
 # CA2300: Do not use insecure deserializer BinaryFormatter
 dotnet_diagnostic.CA2300.severity = suggestion
 

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

@@ -483,7 +483,7 @@ private void Initialize(FileUnit sourceFile)
                 }
 
                 int pathEndIndex = SourceFileInfo.RelativeSourceFilePath.LastIndexOf(Path.DirectorySeparatorChar);
-                string targetPath = TargetPath + SourceFileInfo.RelativeSourceFilePath.Substring(0, pathEndIndex + 1);
+                string targetPath = string.Concat(TargetPath, SourceFileInfo.RelativeSourceFilePath.Substring(0, pathEndIndex + 1));
 
                 // Create if not already exists
                 if (targetPath.Length > 0 && !Directory.Exists(targetPath))

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs

@@ -203,7 +203,11 @@ internal static string GetWholeExceptionMessage(Exception exception)
             while (e.InnerException != null)
             {
                 Exception eInner = e.InnerException;
+#if !NETFX
+                if (!e.Message.Contains(eInner.Message, StringComparison.Ordinal))
+#else
                 if (e.Message.IndexOf(eInner.Message, StringComparison.Ordinal) == -1)
+#endif
                 {
                     message += ", ";
                     message += eInner.Message;

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs

@@ -518,7 +518,11 @@ private UidCollector ParseFile(string fileName)
                                 collector.RootElementLinePosition = reader.LinePosition;
                             }
 
-                            if (reader.Name.IndexOf('.') >= 0)
+#if !NETFX
+                            if (reader.Name.Contains('.'))
+#else
+                            if (reader.Name.Contains("."))
+#endif
                             {
                                 // the name has a dot, which suggests it is a property tag.
                                 // we will ignore adding uid

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/RBNode.cs

@@ -822,21 +822,21 @@ protected RBNode<T> LoadTree(ref string s)
             s = s.Substring(1);
 
             index = s.IndexOf(',');         // read LeftSize
-            node.LeftSize = Int32.Parse(s.Substring(0, index), TypeConverterHelper.InvariantEnglishUS);
+            node.LeftSize = Int32.Parse(s.AsSpan(0, index), TypeConverterHelper.InvariantEnglishUS);
             s = s.Substring(index + 1);
 
             index = s.IndexOf(',');         // read Size
-            node.Size = Int32.Parse(s.Substring(0, index), TypeConverterHelper.InvariantEnglishUS);
+            node.Size = Int32.Parse(s.AsSpan(0, index), TypeConverterHelper.InvariantEnglishUS);
             s = s.Substring(index+1);
 
             for (int k = 0; k < node.Size-1; ++k) // read data
             {
                 index = s.IndexOf(',');
-                node.SetItemAt(k, AsT(Int32.Parse(s.Substring(0, index), TypeConverterHelper.InvariantEnglishUS)));
+                node.SetItemAt(k, AsT(Int32.Parse(s.AsSpan(0, index), TypeConverterHelper.InvariantEnglishUS)));
                 s = s.Substring(index+1);
             }
             index = s.IndexOf('(');
-            node.SetItemAt(node.Size - 1, AsT(Int32.Parse(s.Substring(0, index), TypeConverterHelper.InvariantEnglishUS)));
+            node.SetItemAt(node.Size - 1, AsT(Int32.Parse(s.AsSpan(0, index), TypeConverterHelper.InvariantEnglishUS)));
             s = s.Substring(index);
 
             node.LeftChild = LoadTree(ref s);   // read subtrees

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/RBTree.cs

@@ -659,7 +659,7 @@ public void LoadTree(string s)
         {
             if (s.StartsWith("\"", StringComparison.Ordinal)) s = s.Substring(1);
             int index = s.IndexOf('(');
-            LeftSize = Int32.Parse(s.Substring(0, index), TypeConverterHelper.InvariantEnglishUS);
+            LeftSize = Int32.Parse(s.AsSpan(0, index), TypeConverterHelper.InvariantEnglishUS);
             s = s.Substring(index);
             this.LeftChild = LoadTree(ref s);
             this.LeftChild.Parent = this;

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Interop/InternalDispatchObject.cs

@@ -119,7 +119,7 @@ object IReflect.InvokeMember(string name, BindingFlags invokeAttr, Binder binder
         // We never expect to get a real method name here--see the explanation in GetMethods().
         if (name.StartsWith("[DISPID=", StringComparison.OrdinalIgnoreCase))
         {
-            int dispid = int.Parse(name.Substring(8, name.Length-9), CultureInfo.InvariantCulture);
+            int dispid = int.Parse(name.AsSpan(8, name.Length-9), CultureInfo.InvariantCulture);
             MethodInfo method;
             if (_dispId2MethodMap.TryGetValue(dispid, out method))
             {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs

@@ -3672,11 +3672,11 @@ ref StrikeState strikeState
             {
                 ulState = ULState.ULNone;
                 strikeState = StrikeState.StrikeNone;
-                if (decoration.IndexOf("Underline", StringComparison.OrdinalIgnoreCase) != -1)
+                if (decoration.Contains("Underline", StringComparison.OrdinalIgnoreCase))
                 {
                     ulState = ULState.ULNormal;
                 }
-                if (decoration.IndexOf("Strikethrough", StringComparison.OrdinalIgnoreCase) != -1)
+                if (decoration.Contains("Strikethrough", StringComparison.OrdinalIgnoreCase))
                 {
                     strikeState = StrikeState.StrikeNormal;
                 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/DependencyPropertyConverter.cs

@@ -142,7 +142,7 @@ internal static DependencyProperty ResolveProperty(IServiceProvider serviceProvi
             {
                 value = value.Trim();
                 // If it contains a . it means that it is a full name with type and property.
-                if (value.Contains("."))
+                if (value.Contains('.'))
                 {
                     // Prefixes could have .'s so we take the last one and do a type resolve against that
                     int lastIndex = value.LastIndexOf('.');

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/MarkupExtensionParser.cs

@@ -1465,8 +1465,11 @@ private string ResolveAttributeNamespaceURI(string prefix, string name, string p
                 // if the prefix was "" then
                 // 1) normal properties resolve to the parent Tag namespace.
                 // 2) Attached properties resolve to the "" default namespace.
-                int dotIndex = name.IndexOf('.');
-                if (-1 == dotIndex)
+#if !NETFX
+                if (!name.Contains('.'))
+#else
+                if (!name.Contains("."))
+#endif
                     attribNamespaceURI = parentURI;
                 else
                     attribNamespaceURI = _parserHelper.LookupNamespace("");
@@ -1625,7 +1628,7 @@ internal static void RemoveEscapes(ref string value)
                     if (builder == null)
                     {
                         builder = new StringBuilder(value.Length);
-                        builder.Append(value.Substring(0,i));
+                        builder.Append(value, 0, i);
                     }
                     noEscape = false;
                 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReaderHelper.cs

@@ -2738,8 +2738,11 @@ private string ResolveAttributeNamespaceURI(string prefix, string name, string p
                 // if the prefix was "" then
                 // 1) normal properties resolve to the parent Tag namespace.
                 // 2) Attached properties resolve to the "" default namespace.
-                int dotIndex = name.IndexOf('.');
-                if (-1 == dotIndex)
+#if !NETFX
+                if (!name.Contains('.'))
+#else
+                if (!name.Contains("."))
+#endif
                     attribNamespaceURI = parentURI;
                 else
                     attribNamespaceURI = XmlReader.LookupNamespace("");

src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/ColorTypeConverter.cs

@@ -160,7 +160,7 @@ Type                                destinationType
             {
                 colorString = color.ToString(culture);
 
-                if (colorString.StartsWith("sc#", StringComparison.Ordinal) && colorString.Contains("E"))
+                if (colorString.StartsWith("sc#", StringComparison.Ordinal) && colorString.Contains('E'))
                 {
                     //
                     // Fix bug 1588888: Serialization produces non-compliant scRGB color string.

src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/VisualTreeFlattener.cs

@@ -148,7 +148,7 @@ Type destinationType
                 index = m_mainFile.Length;
             }
 
-            string uri = m_mainFile.Substring(0, index) + "_" + bitmapName;
+            string uri = string.Concat(m_mainFile.Substring(0, index), "_", bitmapName);
 
             Stream bitmapStreamDest = new System.IO.FileStream(uri, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
 

src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonKeyTipAndContentSyncHelper.cs

@@ -46,8 +46,7 @@ public static void Sync(ISyncKeyTipAndContent syncElement, DependencyProperty co
                         {
                             if (accessKeyIndex == -1)
                             {
-                                int accessorIndex = stringContent.IndexOf(keyTip[0]);
-                                if (accessorIndex != -1)
+                                if (stringContent.Contains(keyTip[0]))
                                 {
                                     syncElement.KeepKeyTipAndContentInSync = true;
                                     syncElement.IsKeyTipSyncSource = true;
@@ -155,7 +154,7 @@ public static object CoerceContentProperty(ISyncKeyTipAndContent syncElement,
                             if (accessorIndex >= 0)
                             {
                                 syncElement.KeepKeyTipAndContentInSync = true;
-                                return stringContent.Substring(0, accessorIndex) + '_' + stringContent.Substring(accessorIndex);
+                                return string.Concat(stringContent.Substring(0, accessorIndex), '_', stringContent.Substring(accessorIndex));
                             }
                         }
                     }

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Parser/GenericTypeNameParser.cs

@@ -40,9 +40,7 @@ public GenericTypeNameParser(Func<string, string> prefixResolver)
 
         public static XamlTypeName ParseIfTrivalName(string text, Func<string, string> prefixResolver, out string error)
         {
-            int parenIdx = text.IndexOf('(');
-            int bracketIdx = text.IndexOf('[');
-            if (parenIdx != -1 || bracketIdx != -1)
+            if (text.Contains('(') || text.Contains('['))
             {
                 error = string.Empty;
                 return null;

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/ProxyManager.cs

@@ -671,14 +671,14 @@ static private IRawElementProviderSimple GetProxyFromEntry(ProxyScoping findType
                             break;
 
                         case ProxyScoping.PartialMatchApparentClassName:
-                            if (classNameForPartialMatch.IndexOf(pi.ClassName, StringComparison.Ordinal) >= 0)
+                            if (classNameForPartialMatch.Contains(pi.ClassName, StringComparison.Ordinal))
                             {
                                 factoryCallback = pi.ClientSideProviderFactoryCallback;
                             }
                             break;
 
                         case ProxyScoping.PartialMatchRealClassName:
-                            if (classNameForPartialMatch.IndexOf(pi.ClassName, StringComparison.Ordinal) >= 0
+                            if (classNameForPartialMatch.Contains(pi.ClassName, StringComparison.Ordinal)
                                 && ((pi.Flags & ClientSideProviderMatchIndicator.DisallowBaseClassNameMatch) == 0))
                             {
                                 factoryCallback = pi.ClientSideProviderFactoryCallback;

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WinFormsSpinner.cs

@@ -154,15 +154,15 @@ internal static IRawElementProviderSimple Create(IntPtr hwnd, int idChild)
                 IntPtr hwndSpin;
 
                 // Find the Edit control.  Typically the UpDown is first so we'll start with the other window.                                
-                if (Misc.ProxyGetClassName(hwndLastChild).IndexOf("Edit", StringComparison.OrdinalIgnoreCase) != -1)
+                if (Misc.ProxyGetClassName(hwndLastChild).Contains("Edit", StringComparison.OrdinalIgnoreCase))
                 {
                     hwndEdit = hwndLastChild;
                     hwndSpin = hwndFirstChild;
                 }
                 else
                 {
                     // Haven't seen this but suppose it's possible.  Subsequent test will confirm.
-                    if (Misc.ProxyGetClassName(hwndFirstChild).IndexOf("Edit", StringComparison.OrdinalIgnoreCase) != -1)
+                    if (Misc.ProxyGetClassName(hwndFirstChild).Contains("Edit", StringComparison.OrdinalIgnoreCase))
                     {
                         hwndEdit = hwndFirstChild;
                         hwndSpin = hwndLastChild;

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsContainer.cs

@@ -37,7 +37,7 @@ public WindowsContainer (IntPtr hwnd, ProxyHwnd parent, int item)
                 {
                     _sType = SR.LocalizedControlTypeDialog;
                 }
-                else if (className.IndexOf("AfxControlBar", StringComparison.Ordinal) != -1)
+                else if (className.Contains("AfxControlBar", StringComparison.Ordinal))
                 {
                     _sType = SR.LocalizedControlTypeContainer;
                 }

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsMenu.cs

@@ -2460,7 +2460,7 @@ private static string AccelatorKeyCtrl(string sKeyword, string sCanonicalsKeywor
                         {
                             // Take the remaining string from the Keyword
                             // Case Alt+Enter
-                            return sCanonicalsKeyword + menuRawText.Substring(pos + cKeyChars + 1, cMenuChars - (pos + cKeyChars + 1));
+                            return string.Concat(sCanonicalsKeyword, menuRawText.Substring(pos + cKeyChars + 1, cMenuChars - (pos + cKeyChars + 1)));
                         }
                     }
                 }
@@ -2482,7 +2482,7 @@ private static string AccelatorFxx (string menuText)
                 // Check that it is the form Fxx
                 if (pos < cChars - 1 && pos > 0 && menuText [pos] == 'f')
                 {
-                    int iKey = int.Parse(menuText.Substring(pos + 1, cChars - (pos + 1)), CultureInfo.InvariantCulture);
+                    int iKey = int.Parse(menuText.AsSpan(pos + 1, cChars - (pos + 1)), CultureInfo.InvariantCulture);
                     if (iKey > 0 && iKey <= 12)
                     {
                         return "F" + iKey.ToString(CultureInfo.CurrentCulture);

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsRichEdit.cs

@@ -534,7 +534,7 @@ private string GetValue()
                     object embeddedObject;
                     while (start < end && embeddedObjectOffset != -1)
                     {
-                        sbText.Append(text.Substring(start, embeddedObjectOffset - start));
+                        sbText.Append(text.AsSpan(start, embeddedObjectOffset - start));
                         range.SetRange(embeddedObjectOffset, end);
                         if (range.GetEmbeddedObject(out embeddedObject) == NativeMethods.S_OK && embeddedObject != null)
                         {
@@ -552,7 +552,7 @@ private string GetValue()
 
                     if (start < end)
                     {
-                        sbText.Append(text.Substring(start, end - start));
+                        sbText.Append(text.AsSpan(start, end - start));
                     }
 
                     text = sbText.ToString();

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsSpinner.cs

@@ -67,7 +67,7 @@ internal static IRawElementProviderSimple Create(IntPtr hwnd, int idChild)
                     return null;
                 }
 
-                if (Misc.ProxyGetClassName(hwndBuddy).IndexOf("EDIT", StringComparison.OrdinalIgnoreCase) == -1)
+                if (!Misc.ProxyGetClassName(hwndBuddy).Contains("EDIT", StringComparison.OrdinalIgnoreCase))
                 {
                     return null;
                 }
@@ -281,7 +281,7 @@ internal static IntPtr GetUpDownFromEdit(IntPtr hwnd)
                 while (hwndChild != IntPtr.Zero)
                 {
                     string className = Misc.ProxyGetClassName(hwndChild);
-                    if (className.IndexOf("msctls_updown32", StringComparison.OrdinalIgnoreCase) != -1)
+                    if (className.Contains("msctls_updown32", StringComparison.OrdinalIgnoreCase))
                     {
                         IntPtr hwndBuddy = Misc.ProxySendMessage(hwndChild, NativeMethods.UDM_GETBUDDY, IntPtr.Zero, IntPtr.Zero);
                         if (hwnd == hwndBuddy)

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsSysHeader.cs

@@ -80,7 +80,7 @@ internal static void RaiseEvents (IntPtr hwnd, int eventId, object idProp, int i
                     IntPtr hwndParent = NativeMethodsSetLastError.GetAncestor (hwnd, NativeMethods.GA_PARENT);
                     if (hwndParent != IntPtr.Zero)
                     {
-                        if (Misc.GetClassName(hwndParent).IndexOf("SysListView32", StringComparison.Ordinal) >= 0)
+                        if (Misc.GetClassName(hwndParent).Contains("SysListView32", StringComparison.Ordinal))
                         {
                             // Notify the Listview that the header Change
                             WindowsListView wlv = (WindowsListView) WindowsListView.Create (hwndParent, 0);
@@ -251,7 +251,7 @@ internal void ScrollIntoView(HeaderItem headerItem)
             IntPtr hwndParent = NativeMethodsSetLastError.GetAncestor (_hwnd, NativeMethods.GA_PARENT);
             if (hwndParent != IntPtr.Zero)
             {
-                if (Misc.GetClassName(hwndParent).IndexOf("SysListView32", StringComparison.Ordinal) >= 0)
+                if (Misc.GetClassName(hwndParent).Contains("SysListView32", StringComparison.Ordinal))
                 {
                     // Determine the number of pixels or columns to scroll horizontally.
                     int pixels = 0;

src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/MS/Internal/AutomationProxies/WindowsUpDown.cs

@@ -373,7 +373,7 @@ private bool IsSpinnerElement()
             // If this is a Spinner UpDown Control, the buddy window should be a control with
             // the class of EDIT.
             IntPtr hwndBuddy = HwndBuddy(_hwnd);
-            return hwndBuddy != IntPtr.Zero && Misc.ProxyGetClassName(hwndBuddy).IndexOf("EDIT", StringComparison.OrdinalIgnoreCase) != -1;
+            return hwndBuddy != IntPtr.Zero && Misc.ProxyGetClassName(hwndBuddy).Contains("EDIT", StringComparison.OrdinalIgnoreCase);
         }
 
         private double Max

src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/AvTrace.cs

@@ -419,7 +419,7 @@ static public string AntiFormat(string s)
                 else
                 {
                     // duplicate the formatting character
-                    sb.Append(s.Substring(index, formatIndex - index + 1));
+                    sb.Append(s.AsSpan(index, formatIndex - index + 1));
                     sb.Append(s[formatIndex]);
 
                     index = formatIndex + 1;
@@ -429,7 +429,7 @@ static public string AntiFormat(string s)
 
             if (index <= lengthMinus1)
             {
-                sb.Append(s.Substring(index));
+                sb.Append(s.AsSpan(index));
             }
 
             return sb.ToString();

src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/ContainerUtilities.cs

@@ -459,7 +459,7 @@ static internal void CheckStringForEmbeddedPathSeparator(string testString,
         {
             CheckStringAgainstNullAndEmpty(testString, testStringIdentifier);
 
-            if (testString.IndexOf(PathSeparator) != -1)
+            if (testString.Contains(PathSeparator))
                 throw new ArgumentException(
                     SR.Format(SR.NameCanNotHaveDelimiter,
                         testStringIdentifier,

src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/PackUriHelper.cs

@@ -60,7 +60,7 @@ internal static Uri PackageRootUri
         internal static bool IsPackUri(Uri uri)
         {
             return uri != null && 
-                string.Compare(uri.Scheme, System.IO.Packaging.PackUriHelper.UriSchemePack, StringComparison.OrdinalIgnoreCase) == 0;
+                string.Equals(uri.Scheme, System.IO.Packaging.PackUriHelper.UriSchemePack, StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>