restore:captures arguments for forwarding to MSBuild

src/dotnet/Parser.cs

@@ -2,36 +2,37 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
 
 namespace Microsoft.DotNet.Cli
 {
     public static class Parser
     {
-        public static Command DotnetCommand { get; } =
+        public static CommandLine.Parser Instance { get; } = new CommandLine.Parser(
-            Create.Command("dotnet",
+            delimiters: Array.Empty<char>(),
-                           ".NET Command Line Tools",
+            options: Create.Command("dotnet",
-                           Accept.NoArguments,
+                                    ".NET Command Line Tools",
-                           NewCommandParser.New(),
+                                    Accept.NoArguments,
-                           RestoreCommandParser.Restore(),
+                                    NewCommandParser.New(),
-                           BuildCommandParser.Build(),
+                                    RestoreCommandParser.Restore(),
-                           PublishCommandParser.Publish(),
+                                    BuildCommandParser.Build(),
-                           RunCommandParser.Run(),
+                                    PublishCommandParser.Publish(),
-                           TestCommandParser.Test(),
+                                    RunCommandParser.Run(),
-                           PackCommandParser.Pack(),
+                                    TestCommandParser.Test(),
-                           MigrateCommandParser.Migrate(),
+                                    PackCommandParser.Pack(),
-                           CleanCommandParser.Clean(),
+                                    MigrateCommandParser.Migrate(),
-                           SlnCommandParser.Sln(),
+                                    CleanCommandParser.Clean(),
-                           AddCommandParser.Add(),
+                                    SlnCommandParser.Sln(),
-                           RemoveCommandParser.Remove(),
+                                    AddCommandParser.Add(),
-                           ListCommandParser.List(),
+                                    RemoveCommandParser.Remove(),
-                           NuGetCommandParser.NuGet(),
+                                    ListCommandParser.List(),
-                           Create.Command("msbuild", ""),
+                                    NuGetCommandParser.NuGet(),
-                           Create.Command("vstest", ""), CompleteCommandParser.Complete(),
+                                    Create.Command("msbuild", ""),
-                           CommonOptions.HelpOption(),
+                                    Create.Command("vstest", ""), 
-                           Create.Option("--info", ""),
+                                    CompleteCommandParser.Complete(),
-                           CommonOptions.VerbosityOption(),
+                                    CommonOptions.HelpOption(),
-                           Create.Option("-d", ""));
+                                    Create.Option("--info", ""),
+                                    CommonOptions.VerbosityOption(),
+                                    Create.Option("-d", "")));
     }
 }

src/dotnet/commands/dotnet-complete/CompleteCommand.cs

@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli
                 DebugHelper.HandleDebugSwitch(ref args);
 
                 // get the parser for the current subcommand
-                var parser = Parser.DotnetCommand["complete"];
+                var parser = Parser.Instance["dotnet"]["complete"];
 
                 // parse the arguments
                 var result = parser.Parse(args);
@@ -62,7 +62,7 @@ namespace Microsoft.DotNet.Cli
                 }
             }
 
-            var result = Parser.DotnetCommand.Parse(input);
+            var result = Parser.Instance.Parse(input);
 
             return result.Suggestions()
                          .ToArray();

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

@@ -22,9 +22,7 @@ namespace Microsoft.DotNet.Tools.Restore
         {
             DebugHelper.HandleDebugSwitch(ref args);
 
-            var parser = new Cli.CommandLine.Parser(
+            var parser = Parser.Instance["dotnet"];
-                delimiters: Array.Empty<char>(),
-                options: Parser.DotnetCommand["restore"]);
 
             var result = parser.Parse(args);
 
@@ -40,8 +38,9 @@ namespace Microsoft.DotNet.Tools.Restore
             };
 
             msbuildArgs.AddRange(restore.ArgsToBeForwarded());
-            msbuildArgs.AddRange(restore.Arguments);
 
+            msbuildArgs.AddRange(restore.Arguments);
+            
             return new RestoreCommand(msbuildArgs, msbuildPath);
         }
 

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

@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli
             Create.Command(
                 "restore",
                 ".NET dependency restorer",
-                Accept.ExactlyOneArgument,
+                Accept.ZeroOrMoreArguments,
                 CommonOptions.HelpOption(),
                 Create.Option(
                     "-s|--source",

src/dotnet/dotnet.csproj

@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
     <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-78" />
+    <PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-80" />
     <PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />

test/dotnet.Tests/ParserTests/AddReferenceParserTests.cs

@@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void AddReferenceHasDefaultArgumentSetToCurrentDirectory()
         {
-            var command = Parser.DotnetCommand;
+            var command = Parser.Instance;
 
             var result = command.Parse("dotnet add reference my.csproj");
 
@@ -41,7 +41,7 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void AddReferenceWithoutArgumentResultsInAnError()
         {
-            var command = Parser.DotnetCommand;
+            var command = Parser.Instance;
 
             var result = command.Parse("dotnet add reference");
 

test/dotnet.Tests/ParserTests/RestoreParserTests.cs

@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using FluentAssertions;
+using Microsoft.DotNet.Cli.CommandLine;
+using Xunit;
+using Xunit.Abstractions;
+using Parser = Microsoft.DotNet.Cli.Parser;
+
+namespace Microsoft.DotNet.Tests.ParserTests
+{
+    public class RestoreParserTests
+    {
+        private readonly ITestOutputHelper output;
+
+        public RestoreParserTests(ITestOutputHelper output)
+        {
+            this.output = output;
+        }
+
+        [Fact]
+        public void RestoreCapturesArgumentsToForwardToMSBuildWhenTargetIsSpecified()
+        {
+            var parser = Parser.Instance["dotnet"];
+
+            var result = parser.Parse(@"restore .\some.csproj --packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
+
+            output.WriteLine(result.Diagram());
+
+            result["restore"]
+                .Arguments
+                .Should()
+                .BeEquivalentTo(@".\some.csproj", @"/p:SkipInvalidConfigurations=true");
+        }
+
+        [Fact]
+        public void RestoreCapturesArgumentsToForwardToMSBuildWhenTargetIsNotSpecified()
+        {
+            var parser = Parser.Instance["dotnet"];
+
+            var result = parser.Parse(@"restore --packages c:\.nuget\packages /p:SkipInvalidConfigurations=true");
+
+            output.WriteLine(result.Diagram());
+
+            result["restore"]
+                .Arguments
+                .Should()
+                .BeEquivalentTo(@"/p:SkipInvalidConfigurations=true");
+        }
+    }
+}

test/dotnet.Tests/dotnet.Tests.csproj

@@ -42,6 +42,6 @@
     <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
     <PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-78" />
+    <PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="0.1.0-alpha-80" />
   </ItemGroup>
 </Project>