publish, cache, text fixes; rename ForwardAs and introduce ForwardAsMany

src/dotnet/ArgumentForwardingExtensions.cs

@@ -13,37 +13,36 @@ namespace Microsoft.DotNet.Cli
 
         public static ArgumentsRule ForwardAs(
             this ArgumentsRule rule,
-            string template) =>
+            string value) =>
-            rule.MaterializeAs(o => new ForwardedArgument(template));
+            rule.MaterializeAs(o => new ForwardedArgument(value));
 
-        public static ArgumentsRule ForwardAs(
+        public static ArgumentsRule ForwardAsSingle(
             this ArgumentsRule rule,
             Func<AppliedOption, string> format) =>
             rule.MaterializeAs(o =>
-                new ForwardedArgument(format(o)));
+                                   new ForwardedArgument(format(o)));
+
+        public static ArgumentsRule ForwardAsMany(
+            this ArgumentsRule rule,
+            Func<AppliedOption, IEnumerable<string>> format) =>
+            rule.MaterializeAs(o =>
+                                   new ForwardedArgument(format(o).ToArray()));
 
         public static IEnumerable<string> OptionValuesToBeForwarded(
             this AppliedOption command) =>
             command.AppliedOptions
                    .Select(o => o.Value())
                    .OfType<ForwardedArgument>()
-                   .Select(o => o.ToString());
+                   .SelectMany(o => o.Values);
 
         private class ForwardedArgument
         {
-            private readonly string _value;
+            public ForwardedArgument(params string[] values)
-
-            public ForwardedArgument(string value)
             {
-                _value = value;
+                Values = values;
             }
 
-            public override string ToString() => _value;  
+            public string[] Values { get; }
-            
-            public static explicit operator string(ForwardedArgument argument)
-            {
-                return argument.ToString();
-            }
         }
     }
-}
+}

src/dotnet/CommonOptions.cs

@@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli
                           "n", "normal",
                           "d", "detailed",
                           "diag", "diagnostic")
-                      .ForwardAs(o => $"/verbosity:{o.Arguments.Single()}"));
+                      .ForwardAsSingle(o => $"/verbosity:{o.Arguments.Single()}"));
         
         public static Option FrameworkOption() =>
             Create.Option(
@@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Cli
                 Accept.ExactlyOneArgument()
                     .WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
                     .With(name: "FRAMEWORK")
-                    .ForwardAs(o => $"/p:TargetFramework={o.Arguments.Single()}"));
+                    .ForwardAsSingle(o => $"/p:TargetFramework={o.Arguments.Single()}"));
         
         public static Option RuntimeOption() =>
             Create.Option(
@@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Cli
                 Accept.ExactlyOneArgument()
                     .WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
                     .With(name: "RUNTIME_IDENTIFIER")
-                    .ForwardAs(o => $"/p:RuntimeIdentifier={o.Arguments.Single()}"));
+                    .ForwardAsSingle(o => $"/p:RuntimeIdentifier={o.Arguments.Single()}"));
                 
         public static Option ConfigurationOption() =>
             Create.Option(
@@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Cli
                 Accept.ExactlyOneArgument()
                     .With(name: "CONFIGURATION")
                     .WithSuggestionsFrom("DEBUG", "RELEASE")
-                    .ForwardAs(o => $"/p:Configuration={o.Arguments.Single()}"));
+                    .ForwardAsSingle(o => $"/p:Configuration={o.Arguments.Single()}"));
 
         public static Option VersionSuffixOption() =>
             Create.Option(
@@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli
                 "Defines the value for the $(VersionSuffix) property in the project.",
                 Accept.ExactlyOneArgument()
                     .With(name: "VERSION_SUFFIX")
-                    .ForwardAs(o => $"/p:VersionSuffix={o.Arguments.Single()}"));
+                    .ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}"));
 
         public static ArgumentsRule DefaultToCurrentDirectory(this ArgumentsRule rule) =>
             rule.With(defaultValue: () => PathUtility.EnsureTrailingSlash(Directory.GetCurrentDirectory()));

src/dotnet/commands/dotnet-add/AddCommandParser.cs

@@ -34,24 +34,24 @@ namespace Microsoft.DotNet.Cli
                                   "Version for the package to be added.",
                                   Accept.ExactlyOneArgument()
                                         .With(name: "VERSION")
-                                        .ForwardAs(o => $"--version {o.Arguments.Single()}")),
+                                        .ForwardAsSingle(o => $"--version {o.Arguments.Single()}")),
                     Create.Option("-f|--framework",
                                   LocalizableStrings.CmdFrameworkDescription,
                                   Accept.ExactlyOneArgument()
                                         .With(name: "FRAMEWORK")
-                                        .ForwardAs(o => $"--framework {o.Arguments.Single()}")),
+                                        .ForwardAsSingle(o => $"--framework {o.Arguments.Single()}")),
                     Create.Option("-n|--no-restore ",
                                   "Add reference without performing restore preview and compatibility check."),
                     Create.Option("-s|--source",
                                   "Use specific NuGet package sources to use during the restore.",
                                   Accept.ExactlyOneArgument()
                                         .With(name: "SOURCE")
-                                        .ForwardAs(o => $"--source {o.Arguments.Single()}")),
+                                        .ForwardAsSingle(o => $"--source {o.Arguments.Single()}")),
                     Create.Option("--package-directory",
                                   "Restore the packages to this Directory .",
                                   Accept.ExactlyOneArgument()
                                         .With(name: "PACKAGE_DIRECTORY")
-                                        .ForwardAs(o => $"--package-directory {o.Arguments.Single()}"))),
+                                        .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}"))),
                 Create.Command(
                     "reference",
                     Tools.Add.ProjectToProjectReference.LocalizableStrings.AppFullName,

src/dotnet/commands/dotnet-build/BuildCommandParser.cs

@@ -23,7 +23,7 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.OutputOptionDescription,
                     Accept.ExactlyOneArgument()
                           .With(name: LocalizableStrings.OutputOptionName)
-                          .ForwardAs(o => $"/p:OutputPath={o.Arguments.Single()}")),
+                          .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
                 CommonOptions.FrameworkOption(),
                 CommonOptions.RuntimeOption(),
                 CommonOptions.ConfigurationOption(),

src/dotnet/commands/dotnet-cache/CacheCommandParser.cs

@@ -19,24 +19,34 @@ namespace Microsoft.DotNet.Cli
                     "-e|--entries",
                     LocalizableStrings.ProjectEntryDescription,
                     Accept.OneOrMoreArguments()
-                        .With(name: LocalizableStrings.ProjectEntries)
+                          .With(name: LocalizableStrings.ProjectEntries)
-                        .ForwardAs(o => 
+                          .ForwardAsMany(o =>
-                        {
+                          {
-                            var materializedString = $"{o.Arguments.First()}";
+                              var materializedString = $"{o.Arguments.First()}";
 
-                            if (o.Arguments.Count() == 1) return materializedString;
+                              if (o.Arguments.Count == 1)
-
+                              {
-                            var additionalProjects = string.Join("%3B", o.Arguments.Skip(1));
+                                  return new[]
-
+                                  {
-                            return $"{materializedString} /p:AdditionalProjects={additionalProjects}";
+                                      materializedString
-                        })),
+                                  };
+                              }
+                              else
+                              {
+                                  return new[]
+                                  {
+                                      materializedString,
+                                      $"/p:AdditionalProjects={string.Join("%3B", o.Arguments.Skip(1))}"
+                                  };
+                              }
+                          })),
                 CommonOptions.FrameworkOption(),
                 Create.Option(
                     "--framework-version",
                     LocalizableStrings.FrameworkVersionOptionDescription,
                     Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.FrameworkVersionOption)
-                        .ForwardAs(o => $"/p:FX_Version={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:FX_Version={o.Arguments.Single()}")),
                 CommonOptions.RuntimeOption(),
                 CommonOptions.ConfigurationOption(),
                 Create.Option(
@@ -44,18 +54,18 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.OutputOptionDescription,
                     Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.OutputOption)
-                        .ForwardAs(o => $"/p:ComposeDir={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:ComposeDir={o.Arguments.Single()}")),
                 Create.Option(
                     "-w|--working-dir",
                     LocalizableStrings.IntermediateWorkingDirOptionDescription,
                     Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.IntermediateWorkingDirOption)
-                        .ForwardAs(o => $"/p:ComposeWorkingDir={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:ComposeWorkingDir={o.Arguments.Single()}")),
                 Create.Option(
                     "--preserve-working-dir",
                     LocalizableStrings.PreserveIntermediateWorkingDirOptionDescription,
                     Accept.NoArguments()
-                        .ForwardAs(o => $"/p:PreserveComposeWorkingDir=true")),
+                        .ForwardAsSingle(o => $"/p:PreserveComposeWorkingDir=true")),
                 Create.Option(
                     "--skip-optimization",
                     LocalizableStrings.SkipOptimizationOptionDescription,

src/dotnet/commands/dotnet-clean/CleanCommandParser.cs

@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli
                               LocalizableStrings.CmdOutputDirDescription,
                                          Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.CmdOutputDir)
-                        .ForwardAs(o => $"/p:OutputPath={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
                 CommonOptions.FrameworkOption(),
                 CommonOptions.ConfigurationOption(),
                 CommonOptions.VerbosityOption());

src/dotnet/commands/dotnet-pack/PackCommandParser.cs

@@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.CmdOutputDirDescription,
                     Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.CmdOutputDir)
-                        .ForwardAs(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
                 Create.Option(
                     "--no-build",
                     LocalizableStrings.CmdNoBuildOptionDescription,

src/dotnet/commands/dotnet-publish/PublishCommandParser.cs

@@ -22,15 +22,15 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.OutputOptionDescription,
                               Accept.ExactlyOneArgument()
                         .With(name: LocalizableStrings.OutputOption)
-                        .ForwardAs(o => $"/p:PublishDir={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:PublishDir={o.Arguments.Single()}")),
                 CommonOptions.ConfigurationOption(),
                 CommonOptions.VersionSuffixOption(),
                 Create.Option(
                     "--filter", 
                     LocalizableStrings.FilterProjOptionDescription,
-                              Accept.ExactlyOneArgument()
+                              Accept.OneOrMoreArguments()
                         .With(name: LocalizableStrings.FilterProjOption)
-                        .ForwardAs(o => $"/p:FilterProjectFiles={o.Arguments.Single()}")),
+                        .ForwardAsSingle(o => $"/p:FilterProjectFiles={string.Join("%3B", o.Arguments)}")),
                 CommonOptions.VerbosityOption());
     }
 }

src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs

@@ -20,20 +20,20 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.CmdSourceOptionDescription,
                     Accept.OneOrMoreArguments()
                           .With(name: LocalizableStrings.CmdSourceOption)
-                          .ForwardAs(o => $"/p:RestoreSources={string.Join("%3B", o.Arguments)}")),
+                          .ForwardAsSingle(o => $"/p:RestoreSources={string.Join("%3B", o.Arguments)}")),
                 Create.Option(
                     "-r|--runtime",
                     LocalizableStrings.CmdRuntimeOptionDescription,
                     Accept.OneOrMoreArguments()
                           .WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
                           .With(name: LocalizableStrings.CmdRuntimeOption)
-                          .ForwardAs(o => $"/p:RuntimeIdentifiers={string.Join("%3B", o.Arguments)}")),
+                          .ForwardAsSingle(o => $"/p:RuntimeIdentifiers={string.Join("%3B", o.Arguments)}")),
                 Create.Option(
                     "--packages",
                     LocalizableStrings.CmdPackagesOptionDescription,
                     Accept.ExactlyOneArgument()
                           .With(name: LocalizableStrings.CmdPackagesOption)
-                          .ForwardAs(o => $"/p:RestorePackagesPath={o.Arguments.Single()}")),
+                          .ForwardAsSingle(o => $"/p:RestorePackagesPath={o.Arguments.Single()}")),
                 Create.Option(
                     "--disable-parallel",
                     LocalizableStrings.CmdDisableParallelOptionDescription,
@@ -44,7 +44,7 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.CmdConfigFileOptionDescription,
                     Accept.ExactlyOneArgument()
                           .With(name: LocalizableStrings.CmdConfigFileOption)
-                          .ForwardAs(o => $"/p:RestoreConfigFile={o.Arguments.Single()}")),
+                          .ForwardAsSingle(o => $"/p:RestoreConfigFile={o.Arguments.Single()}")),
                 Create.Option(
                     "--no-cache",
                     LocalizableStrings.CmdNoCacheOptionDescription,

src/dotnet/commands/dotnet-test/TestCommandParser.cs

@@ -20,30 +20,30 @@ namespace Microsoft.DotNet.Cli
                         LocalizableStrings.CmdSettingsDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdSettingsFile)
-                              .ForwardAs(o => $"/p:VSTestSetting={o.Arguments.Single()}")),
+                              .ForwardAsSingle(o => $"/p:VSTestSetting={o.Arguments.Single()}")),
                   Create.Option(
                         "-t|--list-tests",
                         LocalizableStrings.CmdListTestsDescription,
                         Accept.NoArguments()
-                              .ForwardAs(o => "/p:VSTestListTests=true")),
+                              .ForwardAsSingle(o => "/p:VSTestListTests=true")),
                   Create.Option(
                         "--filter",
                         LocalizableStrings.CmdTestCaseFilterDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdTestCaseFilterExpression)
-                              .ForwardAs(o => $"/p:VSTestTestCaseFilter={o.Arguments.Single()}")),
+                              .ForwardAsSingle(o => $"/p:VSTestTestCaseFilter={o.Arguments.Single()}")),
                   Create.Option(
                         "-a|--test-adapter-path",
                         LocalizableStrings.CmdTestAdapterPathDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdTestAdapterPath)
-                              .ForwardAs(o => $"/p:VSTestTestAdapterPath={o.Arguments.Single()}")),
+                              .ForwardAsSingle(o => $"/p:VSTestTestAdapterPath={o.Arguments.Single()}")),
                   Create.Option(
                         "-l|--logger",
                         LocalizableStrings.CmdLoggerDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdLoggerOption)
-                              .ForwardAs(o => 
+                              .ForwardAsSingle(o => 
                                     {
                                           var loggersString = string.Join(";", GetSemiColonEscapedArgs(o.Arguments)); 
                                           
@@ -56,18 +56,18 @@ namespace Microsoft.DotNet.Cli
                         LocalizableStrings.CmdOutputDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdOutputDir)
-                              .ForwardAs(o => $"/p:OutputPath={o.Arguments.Single()}")),
+                              .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
                   Create.Option(
                         "-d|--diag",
                         LocalizableStrings.CmdPathTologFileDescription,
                         Accept.ExactlyOneArgument()
                               .With(name: LocalizableStrings.CmdPathToLogFile)
-                              .ForwardAs(o => $"/p:VSTestDiag={o.Arguments.Single()}")),
+                              .ForwardAsSingle(o => $"/p:VSTestDiag={o.Arguments.Single()}")),
                   Create.Option(
                         "--no-build",
                         LocalizableStrings.CmdNoBuildDescription,
                         Accept.NoArguments()
-                              .ForwardAs(o => "/p:VSTestNoBuild=true")),
+                              .ForwardAsSingle(o => "/p:VSTestNoBuild=true")),
                   CommonOptions.VerbosityOption());
 
         private static string GetSemiColonEsacpedstring(string arg)

test/dotnet-list-reference.Tests/GivenDotnetListReference.cs

@@ -58,7 +58,7 @@ Options:
                     .Execute("proj.csproj");
             cmd.ExitCode.Should().NotBe(0);
             cmd.StdErr.Should().BeVisuallyEquivalentTo(
-                "Unrecognized command or argument 'one'\r\nUnrecognized command or argument 'two'\r\nUnrecognized command or argument 'three'");
+                "Unrecognized command or argument 'two'\r\nUnrecognized command or argument 'three'");
         }
 
         [Theory]

test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs

@@ -31,6 +31,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
         [InlineData(new string[] { "--framework", "<tfm>" }, @"/p:TargetFramework=<tfm>")]
         [InlineData(new string[] { "-r", "<rid>" }, @"/p:RuntimeIdentifier=<rid>")]
         [InlineData(new string[] { "--runtime", "<rid>" }, @"/p:RuntimeIdentifier=<rid>")]
+        [InlineData(new string[] { "--entries", "one.xml", "--entries", "two.xml", "--entries", "three.xml" }, @"/p:AdditionalProjects=one.xml%3Btwo.xml%3Bthree.xml")]
         public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
         {
             args = ArgsPrefix.Concat(args).ToArray();

test/dotnet-sln-list.Tests/GivenDotnetSlnList.cs

@@ -52,7 +52,7 @@ Options:
             var cmd = new DotnetCommand()
                 .ExecuteWithCapturedOutput("sln one.sln two.sln three.sln list");
             cmd.Should().Fail();
-            cmd.StdErr.Should().Be("Unrecognized command or argument 'two.sln'");
+            cmd.StdErr.Should().BeVisuallyEquivalentTo("Unrecognized command or argument 'two.sln'\r\nUnrecognized command or argument 'three.sln'");
         }
 
         [Theory]

test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs

@@ -175,8 +175,7 @@ EndGlobal
             var cmd = new DotnetCommand()
                 .ExecuteWithCapturedOutput("sln one.sln two.sln three.sln remove");
             cmd.Should().Fail();
-            cmd.StdErr.Should().Be("Unrecognized command or argument 'two.sln'");
+            cmd.StdErr.Should().BeVisuallyEquivalentTo("Unrecognized command or argument 'two.sln'\r\nUnrecognized command or argument 'three.sln'\r\nYou must specify at least one project to remove.");
-            cmd.StdOut.Should().Be("Specify --help for a list of available options and commands.");
         }
 
         [Theory]

test/dotnet.Tests/ParserTests/ArgumentForwardingExtensionsTests.cs

@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.ParserTests
             var command = Command("the-command", "",
                                   Option("-o|--one", "",
                                          ZeroOrOneArgument()
-                                             .ForwardAs(o => $"/i:{o.Arguments.Single()}")),
+                                             .ForwardAsSingle(o => $"/i:{o.Arguments.Single()}")),
                                   Option("-t|--two", "",
                                          NoArguments()
                                              .ForwardAs("/s:true")));
@@ -38,7 +38,7 @@ namespace Microsoft.DotNet.Tests.ParserTests
             var command = Command("the-command", "",
                                   Option("-x", "",
                                          ZeroOrMoreArguments()
-                                             .ForwardAs(o => $"/x:{string.Join("&", o.Arguments)}")));
+                                             .ForwardAsSingle(o => $"/x:{string.Join("&", o.Arguments)}")));
 
             var result = command.Parse("the-command -x one -x two");