Run some built-in .NET SDK perf analyzers over several WPF assemblies (#6274)

* CA2251 on PresentationCore (use string.Equals instead of string.Compare == 0)

* CA1846 on PresentationCore (use AsSpan instead of Substring)

* CA1840 on PresentationCore (use Environment.CurrentManagedThreadId)

* CA1825 on PresentationCore (avoid zero-length array allocations)

* CA1802 on PresentationCore (make constants const)

* CA1834 on PresentationCore (use StringBuilder.Append(char) instead of Append(string))

* CA2249 on PresentationCore (use Contains instead of IndexOf != -1)

* CA2249 on PresentationFramework

* CA1834 on PresentationFramework (StringBuilder.Append)

* CA1845 on PresentationFramework (string.Concat with Substring)

* CA1847 on WindowsBase (use Contains(char))

* CA1840 on WindowsBase (use Environment.CurrentManagedThreadId)

* CA1825 on WindowsBase (empty array allocation)

* CA1834 on WindowsBase (StringBuilder.Append(char))

* More StringBuilder.Append fixes (including generator files)

Co-authored-by: Dipesh Kumar <[email protected]>

Author: stephentoub

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

@@ -242,7 +242,7 @@ private static string GenerateStringFromFileNames(ITaskItem[] fileItemList)
                 for (int i = 0; i < fileItemList.Length; i++)
                 {
                     sb.Append(fileItemList[i].ItemSpec);
-                    sb.Append(";");
+                    sb.Append(';');
                 }
 
                 fileNames = sb.ToString();

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CookieHandler.cs

@@ -82,7 +82,7 @@ internal static void HandleWebResponse(WebResponse response)
             // associated with it. (WebHeaderCollection's internal storage is a string->ArrayList(of string) map.)
             for (int i = headers.Count-1; i >= 0; i--)
             {
-                if (string.Compare(headers.Keys[i], "Set-Cookie", StringComparison.OrdinalIgnoreCase) == 0)
+                if (string.Equals(headers.Keys[i], "Set-Cookie", StringComparison.OrdinalIgnoreCase))
                 {
                     string p3pHeader = httpResponse.Headers["P3P"];
                     foreach (string cookie in headers.GetValues(i))

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginContainer.cs

@@ -59,7 +59,7 @@ internal static Uri SiteOfOrigin
             if (_traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": SiteOfOriginContainer: returning site of origin " + siteOfOrigin);
 #endif
 
@@ -230,7 +230,7 @@ protected override PackagePart GetPartCore(Uri uri)
             if (_traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": SiteOfOriginContainer: Creating SiteOfOriginPart for Uri " + uri);
 #endif
             return new SiteOfOriginPart(this, uri);

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginPart.cs

@@ -56,7 +56,7 @@ protected override Stream GetStreamCore(FileMode mode, FileAccess access)
             if (SiteOfOriginContainer._traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": SiteOfOriginPart: Getting stream.");
 #endif
             return GetStreamAndSetContentType(false);
@@ -68,7 +68,7 @@ protected override string GetContentTypeCore()
             if (SiteOfOriginContainer._traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": SiteOfOriginPart: Getting content type.");
 #endif
 
@@ -96,7 +96,7 @@ private Stream GetStreamAndSetContentType(bool onlyNeedContentType)
                     if (SiteOfOriginContainer._traceSwitch.Enabled)
                         System.Diagnostics.Trace.TraceInformation(
                                 DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                                System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                                Environment.CurrentManagedThreadId + 
                                 ": SiteOfOriginPart: Getting content type and using previously determined value");
 #endif
                     return null;
@@ -112,7 +112,7 @@ private Stream GetStreamAndSetContentType(bool onlyNeedContentType)
                     if (SiteOfOriginContainer._traceSwitch.Enabled)
                         System.Diagnostics.Trace.TraceInformation(
                                 DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                                System.Threading.Thread.CurrentThread.ManagedThreadId +
+                                Environment.CurrentManagedThreadId +
                                 "SiteOfOriginPart: Using Cached stream");
 #endif
                     Stream temp = _cacheStream;
@@ -126,7 +126,7 @@ private Stream GetStreamAndSetContentType(bool onlyNeedContentType)
                     if (SiteOfOriginContainer._traceSwitch.Enabled)
                         System.Diagnostics.Trace.TraceInformation(
                                 DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                                System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                                Environment.CurrentManagedThreadId + 
                                 ": SiteOfOriginPart: Determining absolute uri for this resource");
 #endif
                     string original = Uri.ToString();
@@ -139,7 +139,7 @@ private Stream GetStreamAndSetContentType(bool onlyNeedContentType)
                 if (SiteOfOriginContainer._traceSwitch.Enabled)
                     System.Diagnostics.Trace.TraceInformation(
                             DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                            System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                            Environment.CurrentManagedThreadId + 
                             ": SiteOfOriginPart: Making web request to " + _absoluteLocation);
 #endif
 
@@ -165,7 +165,7 @@ private Stream HandleFileSource(bool onlyNeedContentType)
             if (SiteOfOriginContainer._traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": Opening local file " + _absoluteLocation);
 #endif
             if (_contentType == MS.Internal.ContentType.Empty)
@@ -189,7 +189,7 @@ private Stream HandleWebSource(bool onlyNeedContentType)
             if (SiteOfOriginContainer._traceSwitch.Enabled)
                 System.Diagnostics.Trace.TraceInformation(
                         DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                        System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                        Environment.CurrentManagedThreadId + 
                         ": Successfully retrieved stream from " + _absoluteLocation);
 #endif
 
@@ -199,7 +199,7 @@ private Stream HandleWebSource(bool onlyNeedContentType)
                 if (SiteOfOriginContainer._traceSwitch.Enabled)
                     System.Diagnostics.Trace.TraceInformation(
                             DateTime.Now.ToLongTimeString() + " " + DateTime.Now.Millisecond + " " +
-                            System.Threading.Thread.CurrentThread.ManagedThreadId + 
+                            Environment.CurrentManagedThreadId + 
                             ": SiteOfOriginPart: Setting _contentType");
 #endif                    
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/DWriteFactory.cs

@@ -74,7 +74,7 @@ private static Text.TextInterface.FontCollection GetFontCollectionFromFileOrFold
                 }
 
                 // If the directory specifed is the windows fonts directory then no need to reenumerate system fonts.
-                if (String.Compare(((localPath.Length > 0 && localPath[localPath.Length - 1] != Path.DirectorySeparatorChar) ? localPath + Path.DirectorySeparatorChar : localPath), Util.WindowsFontsUriObject.LocalPath, StringComparison.OrdinalIgnoreCase) == 0)
+                if (string.Equals((localPath.Length > 0 && localPath[localPath.Length - 1] != Path.DirectorySeparatorChar) ? localPath + Path.DirectorySeparatorChar : localPath, Util.WindowsFontsUriObject.LocalPath, StringComparison.OrdinalIgnoreCase))
                 {
                     return SystemFontCollection;
                 }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FamilyCollection.cs

@@ -140,7 +140,7 @@ internal static bool IsLegacyArabicFont(string familyName)
             {
                 for (int i = 0; i < _legacyArabicFonts.Length; ++i)
                 {
-                    if (String.Compare(familyName, _legacyArabicFonts[i], StringComparison.OrdinalIgnoreCase) == 0)
+                    if (string.Equals(familyName, _legacyArabicFonts[i], StringComparison.OrdinalIgnoreCase))
                     {
                         return true;
                     }
@@ -270,7 +270,7 @@ private static int GetIndexOfFamily(string familyName)
             {
                 for (int i = 0; i < _systemCompositeFontsNames.Length; ++i)
                 {
-                    if (String.Compare(_systemCompositeFontsNames[i], familyName, StringComparison.OrdinalIgnoreCase) == 0)
+                    if (string.Equals(_systemCompositeFontsNames[i], familyName, StringComparison.OrdinalIgnoreCase))
                     {
                         return i;
                     }
@@ -396,7 +396,7 @@ ref FontStretch fontStretch
                     else
                     {
                         // store the stripped off style names to look for the specific face later.
-                        potentialFaceName.Insert(0, familyName.Substring(indexOfSpace));
+                        potentialFaceName.Insert(0, familyName.AsSpan(indexOfSpace));
                         familyName = familyName.Substring(0, indexOfSpace);
                     }
 
@@ -447,7 +447,7 @@ private CompositeFontFamily LookUpUserCompositeFamily(string familyName)
                 {
                     foreach (KeyValuePair<XmlLanguage, string> localizedFamilyName in compositeFamily.FamilyNames)
                     {
-                        if (String.Compare(localizedFamilyName.Value, familyName, StringComparison.OrdinalIgnoreCase) == 0)
+                        if (string.Equals(localizedFamilyName.Value, familyName, StringComparison.OrdinalIgnoreCase))
                         {
                             return compositeFamily;
                         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheUtil.cs

@@ -545,7 +545,7 @@ internal static bool IsSupportedFontExtension(string extension, out bool isCompo
             for (int i = 0; i < SupportedExtensions.Length; ++i)
             {
                 string supportedExtension = SupportedExtensions[i];
-                if (String.Compare(extension, supportedExtension, StringComparison.OrdinalIgnoreCase) == 0)
+                if (string.Equals(extension, supportedExtension, StringComparison.OrdinalIgnoreCase))
                 {
                     isComposite = (i == 0); // First array entry is *.CompositeFont
                     return true;
@@ -557,7 +557,7 @@ internal static bool IsSupportedFontExtension(string extension, out bool isCompo
 
         internal static bool IsCompositeFont(string extension)
         {
-            return (String.Compare(extension, CompositeFontExtension, StringComparison.OrdinalIgnoreCase) == 0);
+            return (string.Equals(extension, CompositeFontExtension, StringComparison.OrdinalIgnoreCase));
         }
 
         internal static bool IsEnumerableFontUriScheme(Uri fontLocation)

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDifferentiator.cs

@@ -68,7 +68,7 @@ FontStretch fontStretch
             {
                 if (faceNameBuilder.Length > 0)
                 {
-                    faceNameBuilder.Append(" ");
+                    faceNameBuilder.Append(' ');
                 }
                 faceNameBuilder.Append(parsedWeightName);
             }
@@ -77,7 +77,7 @@ FontStretch fontStretch
             {
                 if (faceNameBuilder.Length > 0)
                 {
-                    faceNameBuilder.Append(" ");
+                    faceNameBuilder.Append(' ');
                 }
                 faceNameBuilder.Append(parsedStyleName);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs

@@ -417,8 +417,7 @@ private ByteRangeDownloader(Uri requestedUri, SafeWaitHandle eventHandle)
             }
 
             // Ensure uri is correct scheme (http or https) Do case-sensitive comparison since Uri.Scheme contract is to return in lower case only.
-            if (String.Compare(requestedUri.Scheme, Uri.UriSchemeHttp, StringComparison.Ordinal) != 0
-                    && String.Compare(requestedUri.Scheme, Uri.UriSchemeHttps, StringComparison.Ordinal) != 0)
+            if (!string.Equals(requestedUri.Scheme, Uri.UriSchemeHttp, StringComparison.Ordinal) && !string.Equals(requestedUri.Scheme, Uri.UriSchemeHttps, StringComparison.Ordinal))
             {
                 throw new ArgumentException(SR.Get(SRID.InvalidScheme), "requestedUri");
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/DeobfuscatingStream.cs

@@ -326,7 +326,7 @@ private static byte[] GetGuidByteArray(string guidString)
         {
             // Make sure we have at least on '-' since Guid constructor will take both dash'ed and non-dash'ed format of GUID string
             //  while XPS spec requires dash'ed format of GUID
-            if (guidString.IndexOf('-') == -1)
+            if (!guidString.Contains('-'))
             {
                 throw new ArgumentException(SR.Get(SRID.InvalidPartName));
             }