Use string.Contains(char) overload (#14368)

xtqqczze · web-flow · commit 5f3dd938b792 · 2020-12-19T20:00:51.000+05:00
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -1793,7 +1793,7 @@ internal static string GetLocalAdminUserName(string computerName, PSCredential p
             string localUserName = null;
 
             // The format of local admin username should be "ComputerName\AdminName"
-            if (psLocalCredential.UserName.Contains("\\"))
+            if (psLocalCredential.UserName.Contains('\\'))
             {
                 localUserName = psLocalCredential.UserName;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -1128,7 +1128,7 @@ private static bool IsSafeNameOrIdentifier(string name)
         /// <returns><see langword="true"/> if the name is safe; <see langword="false"/> otherwise.</returns>
         private static bool IsSafeParameterName(string parameterName)
         {
-            return IsSafeNameOrIdentifier(parameterName) && !parameterName.Contains(":");
+            return IsSafeNameOrIdentifier(parameterName) && !parameterName.Contains(':');
         }
 
         /// <summary>
diff --git a/src/Microsoft.WSMan.Management/ConfigProvider.cs b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -3573,7 +3573,7 @@ private string GetCorrectCaseOfName(string ChildName, string hostname, string pa
             string result = ChildName;
             if (ChildName != null)
             {
-                if (!ChildName.Contains("_"))
+                if (!ChildName.Contains('_'))
                 {
                     if (ChildName.Equals(WSManStringLiterals.containerQuotasParameters, StringComparison.OrdinalIgnoreCase))
                         result = WSManStringLiterals.containerQuotasParameters;
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -1092,7 +1092,7 @@ internal static void LoadResourceData()
                     while (!_sr.EndOfStream)
                     {
                         string Line = _sr.ReadLine();
-                        if (Line.Contains("="))
+                        if (Line.Contains('='))
                         {
                             string[] arr = Line.Split('=', count: 2);
                             if (!ResourceValueCache.ContainsKey(arr[0].Trim()))
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -2148,7 +2148,7 @@ public static void LoadResourcesFromModule(IScriptExtent scriptExtent,
                         }
 
                         // resource name without wildcard (*) should be imported only once
-                        if (!resourceToImport.Contains("*") && foundResources)
+                        if (!resourceToImport.Contains('*') && foundResources)
                         {
                             resourcesFound.Add(resourceToImport);
                         }
@@ -2170,7 +2170,7 @@ public static void LoadResourcesFromModule(IScriptExtent scriptExtent,
             {
                 foreach (var resourceNameToImport in resourcesToImport)
                 {
-                    if (!resourceNameToImport.Contains("*"))
+                    if (!resourceNameToImport.Contains('*'))
                     {
                         errorList.Add(new ParseError(scriptExtent,
                                                      "DscResourcesNotFoundDuringParsing",
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
@@ -333,7 +333,7 @@ internal static string FormatField(FieldFormattingDirective directive, object va
                 {
                     // use some heuristics to determine if we have "composite formatting"
                     // 2004/11/16-JonN This is heuristic but should be safe enough
-                    if (directive.formatString.Contains("{0") || directive.formatString.Contains("}"))
+                    if (directive.formatString.Contains("{0") || directive.formatString.Contains('}'))
                     {
                         // we do have it, just use it
                         return string.Format(CultureInfo.CurrentCulture, directive.formatString, so);
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -994,7 +994,7 @@ private static CommandInfo TryNormalSearch(string commandName,
             {
                 if (!searcher.MoveNext())
                 {
-                    if (!commandName.Contains("-") && !commandName.Contains("\\"))
+                    if (!commandName.Contains('-') && !commandName.Contains('\\'))
                     {
                         discoveryTracer.WriteLine(
                             "The command [{0}] was not found, trying again with get- prepended",
diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -2655,7 +2655,7 @@ public override object Transform(EngineIntrinsics engineIntrinsics, object input
                         return PSVersionInfo.PSVersion;
                     }
 
-                    if (versionStr.Contains("."))
+                    if (versionStr.Contains('.'))
                     {
                         // If the string contains a '.', let the Version constructor handle the conversion.
                         return inputData;
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -2133,7 +2133,7 @@ protected static object BaseConvertFrom(object sourceValue, Type destinationType
                 WildcardPattern[] fromValuePatterns;
                 if (!multipleValues)
                 {
-                    if (sourceValueString.Contains(","))
+                    if (sourceValueString.Contains(','))
                     {
                         throw new PSInvalidCastException("InvalidCastEnumCommaAndNoFlags", null,
                             ExtendedTypeSystem.InvalidCastExceptionEnumerationNoFlagAndComma,
diff --git a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
@@ -2373,7 +2373,7 @@ public object[] ModulesToImport
                         // Add this check after checking if it a path
                         if (!string.IsNullOrEmpty(modulepath.Trim()))
                         {
-                            if ((modulepath.Contains("\\") || modulepath.Contains(":")) &&
+                            if ((modulepath.Contains('\\') || modulepath.Contains(':')) &&
                                 !(Directory.Exists(modulepath) || File.Exists(modulepath)))
                             {
                                 throw new ArgumentException(
diff --git a/src/System.Management.Automation/help/SaveHelpCommand.cs b/src/System.Management.Automation/help/SaveHelpCommand.cs
@@ -188,7 +188,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
 
                     if (_credential != null)
                     {
-                        if (path.Contains("*"))
+                        if (path.Contains('*'))
                         {
                             // Deal with wildcards
 

Original file line number	Diff line number	Diff line change
`@@ -1793,7 +1793,7 @@ internal static string GetLocalAdminUserName(string computerName, PSCredential p`
`1793`	`1793`	`string localUserName = null;`
`1794`	`1794`
`1795`	`1795`	`// The format of local admin username should be "ComputerName\AdminName"`
`1796`		`- if (psLocalCredential.UserName.Contains("\\"))`
	`1796`	`+ if (psLocalCredential.UserName.Contains('\\'))`
`1797`	`1797`	`{`
`1798`	`1798`	`localUserName = psLocalCredential.UserName;`
`1799`	`1799`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1128,7 +1128,7 @@ private static bool IsSafeNameOrIdentifier(string name)`
`1128`	`1128`	`/// <returns><see langword="true"/> if the name is safe; <see langword="false"/> otherwise.</returns>`
`1129`	`1129`	`private static bool IsSafeParameterName(string parameterName)`
`1130`	`1130`	`{`
`1131`		`- return IsSafeNameOrIdentifier(parameterName) && !parameterName.Contains(":");`
	`1131`	`+ return IsSafeNameOrIdentifier(parameterName) && !parameterName.Contains(':');`
`1132`	`1132`	`}`
`1133`	`1133`
`1134`	`1134`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -3573,7 +3573,7 @@ private string GetCorrectCaseOfName(string ChildName, string hostname, string pa`
`3573`	`3573`	`string result = ChildName;`
`3574`	`3574`	`if (ChildName != null)`
`3575`	`3575`	`{`
`3576`		`- if (!ChildName.Contains("_"))`
	`3576`	`+ if (!ChildName.Contains('_'))`
`3577`	`3577`	`{`
`3578`	`3578`	`if (ChildName.Equals(WSManStringLiterals.containerQuotasParameters, StringComparison.OrdinalIgnoreCase))`
`3579`	`3579`	`result = WSManStringLiterals.containerQuotasParameters;`
Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,7 @@ internal static void LoadResourceData()`
`1092`	`1092`	`while (!_sr.EndOfStream)`
`1093`	`1093`	`{`
`1094`	`1094`	`string Line = _sr.ReadLine();`
`1095`		`- if (Line.Contains("="))`
	`1095`	`+ if (Line.Contains('='))`
`1096`	`1096`	`{`
`1097`	`1097`	`string[] arr = Line.Split('=', count: 2);`
`1098`	`1098`	`if (!ResourceValueCache.ContainsKey(arr[0].Trim()))`
Original file line number	Diff line number	Diff line change
`@@ -2148,7 +2148,7 @@ public static void LoadResourcesFromModule(IScriptExtent scriptExtent,`
`2148`	`2148`	`}`
`2149`	`2149`
`2150`	`2150`	`// resource name without wildcard (*) should be imported only once`
`2151`		`- if (!resourceToImport.Contains("*") && foundResources)`
	`2151`	`+ if (!resourceToImport.Contains('*') && foundResources)`
`2152`	`2152`	`{`
`2153`	`2153`	`resourcesFound.Add(resourceToImport);`
`2154`	`2154`	`}`
`@@ -2170,7 +2170,7 @@ public static void LoadResourcesFromModule(IScriptExtent scriptExtent,`
`2170`	`2170`	`{`
`2171`	`2171`	`foreach (var resourceNameToImport in resourcesToImport)`
`2172`	`2172`	`{`
`2173`		`- if (!resourceNameToImport.Contains("*"))`
	`2173`	`+ if (!resourceNameToImport.Contains('*'))`
`2174`	`2174`	`{`
`2175`	`2175`	`errorList.Add(new ParseError(scriptExtent,`
`2176`	`2176`	`"DscResourcesNotFoundDuringParsing",`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ internal static string FormatField(FieldFormattingDirective directive, object va`
`333`	`333`	`{`
`334`	`334`	`// use some heuristics to determine if we have "composite formatting"`
`335`	`335`	`// 2004/11/16-JonN This is heuristic but should be safe enough`
`336`		`- if (directive.formatString.Contains("{0") \|\| directive.formatString.Contains("}"))`
	`336`	`+ if (directive.formatString.Contains("{0") \|\| directive.formatString.Contains('}'))`
`337`	`337`	`{`
`338`	`338`	`// we do have it, just use it`
`339`	`339`	`return string.Format(CultureInfo.CurrentCulture, directive.formatString, so);`
Original file line number	Diff line number	Diff line change
`@@ -994,7 +994,7 @@ private static CommandInfo TryNormalSearch(string commandName,`
`994`	`994`	`{`
`995`	`995`	`if (!searcher.MoveNext())`
`996`	`996`	`{`
`997`		`- if (!commandName.Contains("-") && !commandName.Contains("\\"))`
	`997`	`+ if (!commandName.Contains('-') && !commandName.Contains('\\'))`
`998`	`998`	`{`
`999`	`999`	`discoveryTracer.WriteLine(`
`1000`	`1000`	`"The command [{0}] was not found, trying again with get- prepended",`
Original file line number	Diff line number	Diff line change
`@@ -2655,7 +2655,7 @@ public override object Transform(EngineIntrinsics engineIntrinsics, object input`
`2655`	`2655`	`return PSVersionInfo.PSVersion;`
`2656`	`2656`	`}`
`2657`	`2657`
`2658`		`- if (versionStr.Contains("."))`
	`2658`	`+ if (versionStr.Contains('.'))`
`2659`	`2659`	`{`
`2660`	`2660`	`// If the string contains a '.', let the Version constructor handle the conversion.`
`2661`	`2661`	`return inputData;`
Original file line number	Diff line number	Diff line change
`@@ -2133,7 +2133,7 @@ protected static object BaseConvertFrom(object sourceValue, Type destinationType`
`2133`	`2133`	`WildcardPattern[] fromValuePatterns;`
`2134`	`2134`	`if (!multipleValues)`
`2135`	`2135`	`{`
`2136`		`- if (sourceValueString.Contains(","))`
	`2136`	`+ if (sourceValueString.Contains(','))`
`2137`	`2137`	`{`
`2138`	`2138`	`throw new PSInvalidCastException("InvalidCastEnumCommaAndNoFlags", null,`
`2139`	`2139`	`ExtendedTypeSystem.InvalidCastExceptionEnumerationNoFlagAndComma,`
Original file line number	Diff line number	Diff line change
`@@ -2373,7 +2373,7 @@ public object[] ModulesToImport`
`2373`	`2373`	`// Add this check after checking if it a path`
`2374`	`2374`	`if (!string.IsNullOrEmpty(modulepath.Trim()))`
`2375`	`2375`	`{`
`2376`		`- if ((modulepath.Contains("\\") \|\| modulepath.Contains(":")) &&`
	`2376`	`+ if ((modulepath.Contains('\\') \|\| modulepath.Contains(':')) &&`
`2377`	`2377`	`!(Directory.Exists(modulepath) \|\| File.Exists(modulepath)))`
`2378`	`2378`	`{`
`2379`	`2379`	`throw new ArgumentException(`