Update System.CommandLine package (#889)

Author: JamesNK

build/dependencies.props

@@ -20,7 +20,8 @@
     <NunitPackageVersion>3.12.0</NunitPackageVersion>
     <Nunit3TestAdapterPackageVersion>3.13.0</Nunit3TestAdapterPackageVersion>
     <OpenTelemetryPackageVersion>0.2.0-alpha.100</OpenTelemetryPackageVersion>
-    <SystemCommandLinePackageVersion>0.3.0-alpha.19405.1</SystemCommandLinePackageVersion>
+    <SystemCommandLinePackageVersion>2.0.0-beta1.20214.1</SystemCommandLinePackageVersion>
+    <SystemCommandLineRenderingPackageVersion>0.3.0-alpha.20214.1</SystemCommandLineRenderingPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>4.6.0</SystemSecurityPrincipalWindowsPackageVersion>
   </PropertyGroup>

src/dotnet-grpc/Commands/ListCommand.cs

@@ -67,6 +67,12 @@ public void List()
         {
             var consoleRenderer = new ConsoleRenderer(Console);
             var protobufElements = Project.GetItems(ProtobufElement).ToList();
+            if (protobufElements.Count == 0)
+            {
+                Console.Log(CoreStrings.LogNoReferences);
+                return;
+            }
+
             var table = new TableView<ProjectItem> { Items = protobufElements};
 
             // Required columns (always displayed)

src/dotnet-grpc/Commands/RefreshCommand.cs

@@ -48,7 +48,7 @@ public static Command Create()
             {
                 Name = "references",
                 Description = CoreStrings.RefreshCommandArgumentDescription,
-                Arity = ArgumentArity.ZeroOrMore
+                Arity = ArgumentArity.OneOrMore
             });
             command.AddOption(CommonOptions.ProjectOption());
             command.AddOption(new Option(

src/dotnet-grpc/Internal/ConsoleExtensions.cs

@@ -26,17 +26,17 @@ internal static class ConsoleExtensions
     {
         public static void Log(this IConsole console, string formatString, params string[] args)
         {
-            console.Out.WriteLine(string.Format(CultureInfo.CurrentCulture, formatString, args));
+            console.Out.Write(string.Format(CultureInfo.CurrentCulture, formatString, args) + Environment.NewLine);
         }
 
         public static void LogWarning(this IConsole console, string formatString, params string[] args)
         {
-            console.Out.WriteLine(string.Format(CultureInfo.CurrentCulture, $"Warning: {formatString}", args));
+            console.Out.Write(string.Format(CultureInfo.CurrentCulture, $"Warning: {formatString}", args) + Environment.NewLine);
         }
 
         public static void LogError(this IConsole console, Exception e)
         {
-            console.Error.WriteLine($"Error: {e.Message}");
+            console.Error.Write($"Error: {e.Message}" + Environment.NewLine);
         }
     }
 }

src/dotnet-grpc/Program.cs

@@ -17,7 +17,8 @@
 #endregion
 
 using System.CommandLine.Builder;
-using System.CommandLine.Invocation;
+using System.CommandLine.IO;
+using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using Grpc.Dotnet.Cli.Commands;
 using Microsoft.Build.Locator;
@@ -39,7 +40,9 @@ public static Task<int> Main(string[] args)
                 .UseDefaults()
                 .Build();
 
-            return parser.InvokeAsync(args);
+            var result = parser.Parse(args);
+
+            return result.InvokeAsync(new SystemConsole());
         }
     }
 }

src/dotnet-grpc/Properties/CoreStrings.Designer.cs

@@ -211,7 +211,7 @@
     <value>No file found matching file argument `{0}`. File reference not added.</value>
   </data>
   <data name="ListCommandDescription" xml:space="preserve">
-    <value>List the protobuf reference(s) of the gRPC project.</value>
+    <value>List the protobuf references of the gRPC project.</value>
   </data>
   <data name="TableColumnAccess" xml:space="preserve">
     <value>Access</value>
@@ -228,4 +228,7 @@
   <data name="TableColumnSourceUrl" xml:space="preserve">
     <value>Source URL</value>
   </data>
+  <data name="LogNoReferences" xml:space="preserve">
+    <value>No protobuf references in the gRPC project.</value>
+  </data>
 </root>

src/dotnet-grpc/Properties/CoreStrings.resx

@@ -21,8 +21,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
-    <PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLinePackageVersion)" />
-    <PackageReference Include="System.CommandLine.Rendering" Version="$(SystemCommandLinePackageVersion)" />
+    <PackageReference Include="System.CommandLine" Version="$(SystemCommandLinePackageVersion)" />
+    <PackageReference Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingPackageVersion)" />
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryLinePackageVersion)" />
   </ItemGroup>

src/dotnet-grpc/dotnet-grpc.csproj

@@ -17,7 +17,7 @@
 #endregion
 
 using System;
-using System.CommandLine;
+using System.CommandLine.IO;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

test/dotnet-grpc.Tests/AddFileCommandTests.cs

@@ -17,10 +17,9 @@
 #endregion
 
 using System;
-using System.CommandLine;
+using System.CommandLine.IO;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Grpc.Dotnet.Cli.Commands;
 using Grpc.Dotnet.Cli.Internal;