Account for empty arch and os options

dotnet · Jul 19, 2021 · bbee38b · bbee38b
1 parent 2a2ff7a
commit bbee38b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Cli/dotnet/ParseResultExtensions.cs b/src/Cli/dotnet/ParseResultExtensions.cs
@@ -93,10 +93,12 @@ public static bool BothArchAndOsOptionsSpecified(this ParseResult parseResult) =
         internal static string GetCommandLineRuntimeIdentifier(this ParseResult parseResult)
         {
             return parseResult.HasOption(RunCommandParser.RuntimeOption) ?
-                    parseResult.ValueForOption<string>(RunCommandParser.RuntimeOption) :
-                    CommonOptions.ResolveRidShorthandOptionsToRuntimeIdentifier(
-                        parseResult.ValueForOption<string>(CommonOptions.OperatingSystemOption().Aliases.First()),
-                        parseResult.ValueForOption<string>(CommonOptions.ArchitectureOption().Aliases.First()));
+                parseResult.ValueForOption<string>(RunCommandParser.RuntimeOption) :
+                parseResult.HasOption(CommonOptions.OperatingSystemOption().Aliases.First()) || parseResult.HasOption(CommonOptions.ArchitectureOption().Aliases.First()) ?
+                CommonOptions.ResolveRidShorthandOptionsToRuntimeIdentifier(
+                    parseResult.ValueForOption<string>(CommonOptions.OperatingSystemOption().Aliases.First()),
+                    parseResult.ValueForOption<string>(CommonOptions.ArchitectureOption().Aliases.First())) :
+                null;
         }
     }
 }