stop using GetValue<T>(name) as it throws when given symbol was not parsed

Author: adamsitnik

src/Cli/dotnet/Commands/Test/ValidationUtility.cs

@@ -47,9 +47,8 @@ static void ValidateOptionsIrrelevantToModulesFilter(ParseResult parseResult)
                 parseResult.HasOption(TestingPlatformOptions.ConfigurationOption) ||
                 parseResult.HasOption(TestingPlatformOptions.FrameworkOption) ||
                 parseResult.HasOption(CommonOptions.OperatingSystemOption) ||
-                ((parseResult.GetValue<string>(CommonOptions.RuntimeOptionLongName) ??
-                 parseResult.GetValue<string>(CommonOptions.RuntimeOptionShortName)) is not null)
-            )
+                parseResult.HasOption(CommonOptions.RuntimeOptionLongName) ||
+                parseResult.HasOption(CommonOptions.RuntimeOptionShortName))
             {
                 throw new GracefulException(CliCommandStrings.CmdOptionCannotBeUsedWithTestModulesDescription);
             }

src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs

@@ -67,7 +67,7 @@ internal static void EnsureNoConflictGlobalLocalToolPathOption(
             options.Add(LocalOptionName);
         }
 
-        if (!string.IsNullOrWhiteSpace(parseResult.GetValue<string>(ToolPathName)))
+        if (parseResult.RootCommandResult.GetResult(ToolPathName) is not null)
         {
             options.Add(ToolPathName);
         }
@@ -108,7 +108,7 @@ internal static void EnsureNoConflictUpdateAllVersionOption(
     internal static void EnsureToolManifestAndOnlyLocalFlagCombination(ParseResult parseResult)
     {
         if (GlobalOrToolPath(parseResult) &&
-            !string.IsNullOrWhiteSpace(parseResult.GetValue<string>(ToolManifestName)))
+            parseResult.RootCommandResult.GetResult(ToolManifestName) is not null)
         {
             throw new GracefulException(
                 string.Format(
@@ -117,10 +117,7 @@ internal static void EnsureToolManifestAndOnlyLocalFlagCombination(ParseResult p
     }
 
     private static bool GlobalOrToolPath(ParseResult parseResult)
-    {
-        return GlobalOptionWasProvided(parseResult) ||
-               !string.IsNullOrWhiteSpace(parseResult.GetValue<string>(ToolPathName));
-    }
+        => GlobalOptionWasProvided(parseResult) || parseResult.RootCommandResult.GetResult(ToolPathName) is not null;
 
     private static bool GlobalOptionWasProvided(ParseResult parseResult)
         => (parseResult.RootCommandResult.GetResult(GlobalOptionName) ?? parseResult.RootCommandResult.GetResult(GlobalOptionAlias)) is not null;

src/Cli/dotnet/CommonOptions.cs

@@ -258,7 +258,8 @@ public static void ValidateSelfContainedOptions(bool hasSelfContainedOption, boo
 
     internal static IEnumerable<string> ResolveArchOptionToRuntimeIdentifier(string? arg, ParseResult parseResult)
     {
-        if ((parseResult.GetValue<string>(RuntimeOptionLongName) ?? parseResult.GetValue<string>(RuntimeOptionShortName)) is not null)
+        if ((parseResult.RootCommandResult.GetResult(RuntimeOptionLongName) ??
+             parseResult.RootCommandResult.GetResult(RuntimeOptionShortName)) is not null)
         {
             throw new GracefulException(CliStrings.CannotSpecifyBothRuntimeAndArchOptions);
         }
@@ -274,7 +275,8 @@ internal static IEnumerable<string> ResolveArchOptionToRuntimeIdentifier(string?
 
     internal static IEnumerable<string> ResolveOsOptionToRuntimeIdentifier(string? arg, ParseResult parseResult)
     {
-        if ((parseResult.GetValue<string>(RuntimeOptionLongName) ?? parseResult.GetValue<string>(RuntimeOptionShortName)) is not null)
+        if ((parseResult.RootCommandResult.GetResult(RuntimeOptionLongName) ??
+             parseResult.RootCommandResult.GetResult(RuntimeOptionShortName)) is not null)
         {
             throw new GracefulException(CliStrings.CannotSpecifyBothRuntimeAndOsOptions);
         }

src/Cli/dotnet/Extensions/ParseResultExtensions.cs

@@ -178,10 +178,10 @@ public static bool BothArchAndOsOptionsSpecified(this ParseResult parseResult) =
 
     internal static string GetCommandLineRuntimeIdentifier(this ParseResult parseResult)
     {
-        string fromRuntimeOption = parseResult.GetValue<string>(CommonOptions.RuntimeOptionLongName) ??
-            parseResult.GetValue<string>(CommonOptions.RuntimeOptionShortName);
-
-        return fromRuntimeOption is not null ? fromRuntimeOption :
+        return parseResult.HasOption(CommonOptions.RuntimeOptionLongName) ?
+            parseResult.GetValue<string>(CommonOptions.RuntimeOptionLongName) :
+            parseResult.HasOption(CommonOptions.RuntimeOptionShortName) ?
+            parseResult.GetValue<string>(CommonOptions.RuntimeOptionShortName) :
             parseResult.HasOption(CommonOptions.OperatingSystemOption) ||
             parseResult.HasOption(CommonOptions.ArchitectureOption) ||
             parseResult.HasOption(CommonOptions.LongFormArchitectureOption) ?
@@ -273,4 +273,11 @@ public static T SafelyGetValueForOption<T>(this ParseResult parseResult, Option<
     /// This is useful for checking if the user has explicitly set an option, as opposed to it being set by default.
     /// </summary>
     public static bool HasOption(this ParseResult parseResult, Option option) => parseResult.GetResult(option) is OptionResult or && !or.Implicit;
+
+    /// <summary>
+    /// Checks if the option with given name/alias is present and not implicit (i.e. not set by default).
+    /// This is useful for checking if the user has explicitly set an option, as opposed to it being set by default.
+    /// </summary>
+    public static bool HasOption(this ParseResult parseResult, string nameOrAlias)
+        => parseResult.RootCommandResult.GetResult(nameOrAlias) is OptionResult or && !or.Implicit;
 }

src/Cli/dotnet/Parser.cs

@@ -254,7 +254,7 @@ internal static int ExceptionHandler(Exception exception, ParseResult parseResul
 
         return 1;
     }
-    
+
     internal class DotnetHelpBuilder : HelpBuilder
     {
         private DotnetHelpBuilder(int maxWidth = int.MaxValue) : base(maxWidth) { }