Fix System.CommandLine regression when creating repro packages (#78924)

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com> Fixes #78921
dotnet · Dec 1, 2022 · 39b6e5e · 39b6e5e
1 parent 067e43a
commit 39b6e5e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/coreclr/tools/Common/CommandLineHelpers.cs b/src/coreclr/tools/Common/CommandLineHelpers.cs
@@ -182,8 +182,11 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
                     object val = res.CommandResult.GetValue(option);
                     if (val is not null && !(descriptor.HasDefaultValue && descriptor.GetDefaultValue().Equals(val)))
                     {
-                        if (val is IEnumerable<string> values)
+                        if (val is IEnumerable<string> || val is IDictionary<string, string>)
                         {
+                            if (val is not IEnumerable<string> values)
+                                values = ((IDictionary<string, string>)val).Values;
+
                             if (inputOptionNames.Contains(option.Name))
                             {
                                 Dictionary<string, string> dictionary = new();
@@ -214,8 +217,11 @@ public static void MakeReproPackage(string makeReproPath, string outputFilePath,
                 foreach (var argument in res.CommandResult.Command.Arguments)
                 {
                     object val = res.CommandResult.GetValue(argument);
-                    if (val is IEnumerable<string> values)
+                    if (val is IEnumerable<string> || val is IDictionary<string, string>)
                     {
+                        if (val is not IEnumerable<string> values)
+                            values = ((IDictionary<string, string>)val).Values;
+
                         foreach (string optInList in values)
                         {
                             rspFile.Add($"{ConvertFromInputPathToReproPackagePath((string)optInList)}");