Reverted changes based on IDE analyzer adjustments.

Author: MiYanni

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/MSBuildProjectExtensions.cs

@@ -47,7 +47,7 @@ public static ISet<string> ConditionChain(this ProjectElement projectElement)
 
         public static ProjectItemGroupElement FindUniformOrCreateItemGroupWithCondition(this ProjectRootElement root, string projectItemElementType, string framework)
         {
-            var lastMatchingItemGroup = root.FindExistingUniformItemGroupWithCondition(projectItemElementType, framework);
+            var lastMatchingItemGroup = FindExistingUniformItemGroupWithCondition(root, projectItemElementType, framework);
 
             if (lastMatchingItemGroup != null)
             {

src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs

@@ -9,9 +9,9 @@ namespace Microsoft.DotNet.Cli.Extensions
 {
     public static class OptionForwardingExtensions
     {
-        public static ForwardedOption<T> Forward<T>(this ForwardedOption<T> option) => option.SetForwardingFunction((o) => new string[] { option.Name });
+        public static ForwardedOption<T> Forward<T>(this ForwardedOption<T> option) => option.SetForwardingFunction((T o) => new string[] { option.Name });
 
-        public static ForwardedOption<T> ForwardAs<T>(this ForwardedOption<T> option, string value) => option.SetForwardingFunction((o) => new string[] { value });
+        public static ForwardedOption<T> ForwardAs<T>(this ForwardedOption<T> option, string value) => option.SetForwardingFunction((T o) => new string[] { value });
 
         public static ForwardedOption<T> ForwardAsSingle<T>(this ForwardedOption<T> option, Func<T, string> format) => option.SetForwardingFunction(format);
 
@@ -24,7 +24,7 @@ public static class OptionForwardingExtensions
         /// <returns>The option</returns>
         public static ForwardedOption<string> ForwardAsOutputPath(this ForwardedOption<string> option, string outputPropertyName, bool surroundWithDoubleQuotes = false)
         {
-            return option.SetForwardingFunction((o) =>
+            return option.SetForwardingFunction((string o) =>
             {
                 string argVal = CommandDirectoryContext.GetFullPath(o);
                 if (surroundWithDoubleQuotes)
@@ -136,13 +136,13 @@ public ForwardedOption<T> SetForwardingFunction(Func<T, string> format)
 
         public ForwardedOption<T> SetForwardingFunction(Func<T, ParseResult, IEnumerable<string>> func)
         {
-            ForwardingFunction = (parseResult) => parseResult.GetResult(this) is not null ? func(parseResult.GetValue(this), parseResult) : Array.Empty<string>();
+            ForwardingFunction = (ParseResult parseResult) => parseResult.GetResult(this) is not null ? func(parseResult.GetValue<T>(this), parseResult) : Array.Empty<string>();
             return this;
         }
 
         public Func<ParseResult, IEnumerable<string>> GetForwardingFunction(Func<T, IEnumerable<string>> func)
         {
-            return (parseResult) => parseResult.GetResult(this) is not null ? func(parseResult.GetValue(this)) : Array.Empty<string>();
+            return (ParseResult parseResult) => parseResult.GetResult(this) is not null ? func(parseResult.GetValue<T>(this)) : Array.Empty<string>();
         }
 
         public Func<ParseResult, IEnumerable<string>> GetForwardingFunction()

src/Cli/dotnet/Extensions/ParseResultExtensions.cs

@@ -103,7 +103,7 @@ public static bool CanBeInvoked(this ParseResult parseResult)
         {
             return GetBuiltInCommand(parseResult.RootSubCommandResult()) != null ||
                 parseResult.Tokens.Any(token => token.Type == CliTokenType.Directive) ||
-                parseResult.IsTopLevelDotnetCommand() && string.IsNullOrEmpty(parseResult.GetValue(DotnetSubCommand));
+                (parseResult.IsTopLevelDotnetCommand() && string.IsNullOrEmpty(parseResult.GetValue(DotnetSubCommand)));
         }
 
         public static int HandleMissingCommand(this ParseResult parseResult)