Enable CA2249: Consider using String.Contains instead of IndexOf (#14395)

xtqqczze · web-flow · commit 9ea718f1719e · 2021-01-10T18:15:02.000+05:00
https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249
diff --git a/.globalconfig b/.globalconfig
@@ -468,7 +468,7 @@ dotnet_diagnostic.CA2247.severity = warning
 dotnet_diagnostic.CA2248.severity = suggestion
 
 # CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
-dotnet_diagnostic.CA2249.severity = suggestion
+dotnet_diagnostic.CA2249.severity = warning
 
 # CA2300: Do not use insecure deserializer BinaryFormatter
 dotnet_diagnostic.CA2300.severity = none
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -1989,9 +1989,9 @@ private static string EscapeFunctionNameForRemoteHelp(string name)
             StringBuilder result = new(name.Length);
             foreach (char c in name)
             {
-                if (("\"'`$".IndexOf(c) == (-1)) &&
-                    (!char.IsControl(c)) &&
-                    (!char.IsWhiteSpace(c)))
+                if (!"\"'`$".Contains(c)
+                    && !char.IsControl(c)
+                    && !char.IsWhiteSpace(c))
                 {
                     result.Append(c);
                 }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
@@ -832,9 +832,9 @@ private static string EscapeModuleNameForHelpComment(string name)
             StringBuilder result = new(name.Length);
             foreach (char c in name)
             {
-                if (("\"'`$#".IndexOf(c) == (-1)) &&
-                    (!char.IsControl(c)) &&
-                    (!char.IsWhiteSpace(c)))
+                if (!"\"'`$#".Contains(c)
+                    && !char.IsControl(c)
+                    && !char.IsWhiteSpace(c))
                 {
                     result.Append(c);
                 }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -1502,7 +1502,7 @@ internal static object GetConverter(Type type, TypeTable backupTypeTable)
 
         private static object NewConverterInstance(string assemblyQualifiedTypeName)
         {
-            if (assemblyQualifiedTypeName.IndexOf(',') == -1)
+            if (!assemblyQualifiedTypeName.Contains(','))
             {
                 typeConversion.WriteLine("Type name \"{0}\" should be assembly qualified.", assemblyQualifiedTypeName);
                 return null;
diff --git a/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs b/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
@@ -815,9 +815,10 @@ private static IEnumerable<CimModule> GetCimModules(
                     ErrorRecord errorRecord = GetErrorRecordForRemoteDiscoveryProvider(exception);
                     if (!cmdlet.MyInvocation.ExpectingInput)
                     {
-                        if ((errorRecord.FullyQualifiedErrorId.IndexOf(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase) != (-1)) ||
-                            (cancellationToken.IsCancellationRequested || (exception is OperationCanceledException)) ||
-                            (!cimSession.TestConnection()))
+                        if (errorRecord.FullyQualifiedErrorId.Contains(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase)
+                            || cancellationToken.IsCancellationRequested
+                            || exception is OperationCanceledException
+                            || !cimSession.TestConnection())
                         {
                             cmdlet.ThrowTerminatingError(errorRecord);
                         }
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -1154,10 +1154,9 @@ private static string ResolveShellUri(string shell)
                 resolvedShellUri = DefaultShellUri;
             }
 
-            if (resolvedShellUri.IndexOf(
-                System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix, StringComparison.OrdinalIgnoreCase) == -1)
+            if (!resolvedShellUri.Contains(WSManNativeApi.ResourceURIPrefix, StringComparison.OrdinalIgnoreCase))
             {
-                resolvedShellUri = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix + resolvedShellUri;
+                resolvedShellUri = WSManNativeApi.ResourceURIPrefix + resolvedShellUri;
             }
 
             return resolvedShellUri;
@@ -1464,8 +1463,7 @@ internal bool UseDefaultWSManPort
         /// <summary>
         /// Default value for shell.
         /// </summary>
-        private const string DefaultShellUri =
-             System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix + RemotingConstants.DefaultShellName;
+        private const string DefaultShellUri = WSManNativeApi.ResourceURIPrefix + RemotingConstants.DefaultShellName;
 
         /// <summary>
         /// Default credentials - null indicates credentials of
diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -1022,7 +1022,7 @@ internal override IEnumerable<HelpInfo> SearchHelp(HelpRequest helpRequest, bool
             {
                 if (decoratedSearch)
                 {
-                    if (target.IndexOf(StringLiterals.CommandVerbNounSeparator) >= 0)
+                    if (target.Contains(StringLiterals.CommandVerbNounSeparator))
                     {
                         patternList.Add(target + "*");
                     }
diff --git a/src/System.Management.Automation/help/MUIFileSearcher.cs b/src/System.Management.Automation/help/MUIFileSearcher.cs
@@ -127,7 +127,7 @@ private static string[] GetFiles(string path, string pattern)
 
             foreach (string filePath in files)
             {
-                if (filePath.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) >= 0)
+                if (filePath.Contains(pattern, StringComparison.OrdinalIgnoreCase))
                 {
                     result.Add(filePath);
                     break;
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -1406,7 +1406,7 @@ internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, str
             const string EICAR_STRING = "X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*";
             if (InternalTestHooks.UseDebugAmsiImplementation)
             {
-                if (content.IndexOf(EICAR_STRING, StringComparison.Ordinal) >= 0)
+                if (content.Contains(EICAR_STRING, StringComparison.Ordinal))
                 {
                     return AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_DETECTED;
                 }
diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -361,7 +361,7 @@ private static SystemEnforcementMode GetDebugLockdownPolicy(string path)
             {
                 // Assume everything under SYSTEM32 is trusted, with a purposefully sloppy
                 // check so that we can actually put it in the filename during testing.
-                if (path.IndexOf("System32", StringComparison.OrdinalIgnoreCase) >= 0)
+                if (path.Contains("System32", StringComparison.OrdinalIgnoreCase))
                 {
                     return SystemEnforcementMode.None;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1989,9 +1989,9 @@ private static string EscapeFunctionNameForRemoteHelp(string name)`
`1989`	`1989`	`StringBuilder result = new(name.Length);`
`1990`	`1990`	`foreach (char c in name)`
`1991`	`1991`	`{`
`1992`		- if (("\"'`$".IndexOf(c) == (-1)) &&
`1993`		`- (!char.IsControl(c)) &&`
`1994`		`- (!char.IsWhiteSpace(c)))`
	`1992`	+ if (!"\"'`$".Contains(c)
	`1993`	`+ && !char.IsControl(c)`
	`1994`	`+ && !char.IsWhiteSpace(c))`
`1995`	`1995`	`{`
`1996`	`1996`	`result.Append(c);`
`1997`	`1997`	`}`
Original file line number	Diff line number	Diff line change
`@@ -832,9 +832,9 @@ private static string EscapeModuleNameForHelpComment(string name)`
`832`	`832`	`StringBuilder result = new(name.Length);`
`833`	`833`	`foreach (char c in name)`
`834`	`834`	`{`
`835`		- if (("\"'`$#".IndexOf(c) == (-1)) &&
`836`		`- (!char.IsControl(c)) &&`
`837`		`- (!char.IsWhiteSpace(c)))`
	`835`	+ if (!"\"'`$#".Contains(c)
	`836`	`+ && !char.IsControl(c)`
	`837`	`+ && !char.IsWhiteSpace(c))`
`838`	`838`	`{`
`839`	`839`	`result.Append(c);`
`840`	`840`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1502,7 +1502,7 @@ internal static object GetConverter(Type type, TypeTable backupTypeTable)`
`1502`	`1502`
`1503`	`1503`	`private static object NewConverterInstance(string assemblyQualifiedTypeName)`
`1504`	`1504`	`{`
`1505`		`- if (assemblyQualifiedTypeName.IndexOf(',') == -1)`
	`1505`	`+ if (!assemblyQualifiedTypeName.Contains(','))`
`1506`	`1506`	`{`
`1507`	`1507`	`typeConversion.WriteLine("Type name \"{0}\" should be assembly qualified.", assemblyQualifiedTypeName);`
`1508`	`1508`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -815,9 +815,10 @@ private static IEnumerable<CimModule> GetCimModules(`
`815`	`815`	`ErrorRecord errorRecord = GetErrorRecordForRemoteDiscoveryProvider(exception);`
`816`	`816`	`if (!cmdlet.MyInvocation.ExpectingInput)`
`817`	`817`	`{`
`818`		`- if ((errorRecord.FullyQualifiedErrorId.IndexOf(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase) != (-1)) \|\|`
`819`		`- (cancellationToken.IsCancellationRequested \|\| (exception is OperationCanceledException)) \|\|`
`820`		`- (!cimSession.TestConnection()))`
	`818`	`+ if (errorRecord.FullyQualifiedErrorId.Contains(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase)`
	`819`	`+ \|\| cancellationToken.IsCancellationRequested`
	`820`	`+ \|\| exception is OperationCanceledException`
	`821`	`+ \|\| !cimSession.TestConnection())`
`821`	`822`	`{`
`822`	`823`	`cmdlet.ThrowTerminatingError(errorRecord);`
`823`	`824`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1154,10 +1154,9 @@ private static string ResolveShellUri(string shell)`
`1154`	`1154`	`resolvedShellUri = DefaultShellUri;`
`1155`	`1155`	`}`
`1156`	`1156`
`1157`		`- if (resolvedShellUri.IndexOf(`
`1158`		`- System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix, StringComparison.OrdinalIgnoreCase) == -1)`
	`1157`	`+ if (!resolvedShellUri.Contains(WSManNativeApi.ResourceURIPrefix, StringComparison.OrdinalIgnoreCase))`
`1159`	`1158`	`{`
`1160`		`- resolvedShellUri = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix + resolvedShellUri;`
	`1159`	`+ resolvedShellUri = WSManNativeApi.ResourceURIPrefix + resolvedShellUri;`
`1161`	`1160`	`}`
`1162`	`1161`
`1163`	`1162`	`return resolvedShellUri;`
`@@ -1464,8 +1463,7 @@ internal bool UseDefaultWSManPort`
`1464`	`1463`	`/// <summary>`
`1465`	`1464`	`/// Default value for shell.`
`1466`	`1465`	`/// </summary>`
`1467`		`- private const string DefaultShellUri =`
`1468`		`- System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix + RemotingConstants.DefaultShellName;`
	`1466`	`+ private const string DefaultShellUri = WSManNativeApi.ResourceURIPrefix + RemotingConstants.DefaultShellName;`
`1469`	`1467`
`1470`	`1468`	`/// <summary>`
`1471`	`1469`	`/// Default credentials - null indicates credentials of`
Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,7 @@ internal override IEnumerable<HelpInfo> SearchHelp(HelpRequest helpRequest, bool`
`1022`	`1022`	`{`
`1023`	`1023`	`if (decoratedSearch)`
`1024`	`1024`	`{`
`1025`		`- if (target.IndexOf(StringLiterals.CommandVerbNounSeparator) >= 0)`
	`1025`	`+ if (target.Contains(StringLiterals.CommandVerbNounSeparator))`
`1026`	`1026`	`{`
`1027`	`1027`	`patternList.Add(target + "*");`
`1028`	`1028`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private static string[] GetFiles(string path, string pattern)`
`127`	`127`
`128`	`128`	`foreach (string filePath in files)`
`129`	`129`	`{`
`130`		`- if (filePath.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) >= 0)`
	`130`	`+ if (filePath.Contains(pattern, StringComparison.OrdinalIgnoreCase))`
`131`	`131`	`{`
`132`	`132`	`result.Add(filePath);`
`133`	`133`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1406,7 +1406,7 @@ internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, str`
`1406`	`1406`	`const string EICAR_STRING = "X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*";`
`1407`	`1407`	`if (InternalTestHooks.UseDebugAmsiImplementation)`
`1408`	`1408`	`{`
`1409`		`- if (content.IndexOf(EICAR_STRING, StringComparison.Ordinal) >= 0)`
	`1409`	`+ if (content.Contains(EICAR_STRING, StringComparison.Ordinal))`
`1410`	`1410`	`{`
`1411`	`1411`	`return AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_DETECTED;`
`1412`	`1412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ private static SystemEnforcementMode GetDebugLockdownPolicy(string path)`
`361`	`361`	`{`
`362`	`362`	`// Assume everything under SYSTEM32 is trusted, with a purposefully sloppy`
`363`	`363`	`// check so that we can actually put it in the filename during testing.`
`364`		`- if (path.IndexOf("System32", StringComparison.OrdinalIgnoreCase) >= 0)`
	`364`	`+ if (path.Contains("System32", StringComparison.OrdinalIgnoreCase))`
`365`	`365`	`{`
`366`	`366`	`return SystemEnforcementMode.None;`
`367`	`367`	`}`