From bbee38bd990c9c5951814475247280f091d3abe8 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Mon, 19 Jul 2021 13:31:46 -0700
Subject: [PATCH] Account for empty arch and os options

---
 src/Cli/dotnet/ParseResultExtensions.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Cli/dotnet/ParseResultExtensions.cs b/src/Cli/dotnet/ParseResultExtensions.cs
index ec18434a49a8..d6e854ed9def 100644
--- 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;
         }
     }
 }