Enable CA1858: Use 'StartsWith' instead of 'IndexOf' (#26107)

xtqqczze · web-flow · commit 5cdafbc4c784 · 2025-10-08T08:22:54.000+05:00
diff --git a/.globalconfig b/.globalconfig
@@ -510,6 +510,10 @@ dotnet_diagnostic.CA1846.severity = warning
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1847
 dotnet_diagnostic.CA1847.severity = warning
 
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1858
+dotnet_diagnostic.CA1858.severity = warning
+
 # CA1868: Unnecessary call to 'Contains' for sets
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1868
 dotnet_diagnostic.CA1868.severity = warning
diff --git a/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs b/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
@@ -311,8 +311,7 @@ protected override void ProcessRecord()
                 byte[] iv = null;
 
                 // If this is a V2 package
-                if (String.IndexOf(SecureStringHelper.SecureStringExportHeader,
-                        StringComparison.OrdinalIgnoreCase) == 0)
+                if (String.StartsWith(SecureStringHelper.SecureStringExportHeader, StringComparison.OrdinalIgnoreCase))
                 {
                     try
                     {
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -8286,7 +8286,7 @@ internal static void DeleteFileStream(string path, string streamName)
             ArgumentNullException.ThrowIfNull(streamName);
 
             string adjustedStreamName = streamName.Trim();
-            if (adjustedStreamName.IndexOf(':') != 0)
+            if (!adjustedStreamName.StartsWith(':'))
             {
                 adjustedStreamName = ":" + adjustedStreamName;
             }
diff --git a/src/System.Management.Automation/namespaces/LocationGlobber.cs b/src/System.Management.Automation/namespaces/LocationGlobber.cs
@@ -4539,7 +4539,7 @@ internal static bool IsHomePath(string path)
                 }
             }
 
-            if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)
+            if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))
             {
                 // Support the single "~"
                 if (path.Length == 1)
@@ -4638,7 +4638,7 @@ internal string GetHomeRelativePath(string path)
                     }
                 }
 
-                if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)
+                if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))
                 {
                     // Strip of the ~ and the \ or / if present
 
diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs
@@ -115,8 +115,8 @@ internal static Signature SignFile(SigningOption option,
             if (!string.IsNullOrEmpty(timeStampServerUrl))
             {
                 if ((timeStampServerUrl.Length <= 7) || (
-                    (timeStampServerUrl.IndexOf("http://", StringComparison.OrdinalIgnoreCase) != 0) &&
-                    (timeStampServerUrl.IndexOf("https://", StringComparison.OrdinalIgnoreCase) != 0)))
+                    !timeStampServerUrl.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+                    !timeStampServerUrl.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
                 {
                     throw PSTraceSource.NewArgumentException(
                         nameof(certificate),

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,7 @@ protected override void ProcessRecord()`
`311`	`311`	`byte[] iv = null;`
`312`	`312`
`313`	`313`	`// If this is a V2 package`
`314`		`- if (String.IndexOf(SecureStringHelper.SecureStringExportHeader,`
`315`		`- StringComparison.OrdinalIgnoreCase) == 0)`
	`314`	`+ if (String.StartsWith(SecureStringHelper.SecureStringExportHeader, StringComparison.OrdinalIgnoreCase))`
`316`	`315`	`{`
`317`	`316`	`try`
`318`	`317`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8286,7 +8286,7 @@ internal static void DeleteFileStream(string path, string streamName)`
`8286`	`8286`	`ArgumentNullException.ThrowIfNull(streamName);`
`8287`	`8287`
`8288`	`8288`	`string adjustedStreamName = streamName.Trim();`
`8289`		`- if (adjustedStreamName.IndexOf(':') != 0)`
	`8289`	`+ if (!adjustedStreamName.StartsWith(':'))`
`8290`	`8290`	`{`
`8291`	`8291`	`adjustedStreamName = ":" + adjustedStreamName;`
`8292`	`8292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4539,7 +4539,7 @@ internal static bool IsHomePath(string path)`
`4539`	`4539`	`}`
`4540`	`4540`	`}`
`4541`	`4541`
`4542`		`- if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)`
	`4542`	`+ if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))`
`4543`	`4543`	`{`
`4544`	`4544`	`// Support the single "~"`
`4545`	`4545`	`if (path.Length == 1)`
`@@ -4638,7 +4638,7 @@ internal string GetHomeRelativePath(string path)`
`4638`	`4638`	`}`
`4639`	`4639`	`}`
`4640`	`4640`
`4641`		`- if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)`
	`4641`	`+ if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))`
`4642`	`4642`	`{`
`4643`	`4643`	`// Strip of the ~ and the \ or / if present`
`4644`	`4644`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ internal static Signature SignFile(SigningOption option,`
`115`	`115`	`if (!string.IsNullOrEmpty(timeStampServerUrl))`
`116`	`116`	`{`
`117`	`117`	`if ((timeStampServerUrl.Length <= 7) \|\| (`
`118`		`- (timeStampServerUrl.IndexOf("http://", StringComparison.OrdinalIgnoreCase) != 0) &&`
`119`		`- (timeStampServerUrl.IndexOf("https://", StringComparison.OrdinalIgnoreCase) != 0)))`
	`118`	`+ !timeStampServerUrl.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&`
	`119`	`+ !timeStampServerUrl.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))`
`120`	`120`	`{`
`121`	`121`	`throw PSTraceSource.NewArgumentException(`
`122`	`122`	`nameof(certificate),`