Upgrade dotnet-grpc dependencies (#1914)

JamesNK · web-flow · commit 947a24aefef5 · 2022-10-18T08:57:10.000+08:00
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -6,19 +6,18 @@
     <GrpcDotNetPackageVersion>2.47.0</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
     <GrpcPackageVersion>2.46.5</GrpcPackageVersion>
     <GrpcToolsPackageVersion>2.49.0</GrpcToolsPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>7.0.0-preview.6.22327.7</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>7.0.0-rc.2.22476.2</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftAspNetCoreApp6PackageVersion>6.0.0</MicrosoftAspNetCoreApp6PackageVersion>
     <MicrosoftAspNetCoreApp5PackageVersion>5.0.3</MicrosoftAspNetCoreApp5PackageVersion>
     <MicrosoftAspNetCoreApp31PackageVersion>3.1.3</MicrosoftAspNetCoreApp31PackageVersion>
-    <MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
-    <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>7.0.0-preview1.22310.1</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
+    <MicrosoftBuildLocatorPackageVersion>1.5.5</MicrosoftBuildLocatorPackageVersion>
+    <MicrosoftBuildPackageVersion>16.9.0</MicrosoftBuildPackageVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>7.0.0-preview1.22464.1</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
     <MicrosoftCrankEventSourcesPackageVersion>0.2.0-alpha.21255.1</MicrosoftCrankEventSourcesPackageVersion>
     <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
     <MicrosoftExtensionsPackageVersion>3.0.3</MicrosoftExtensionsPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>16.9.1</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
-    <MicrosoftTyePackageVersion>0.5.0-alpha.20555.1</MicrosoftTyePackageVersion>
     <MicrosoftWin32RegistryLinePackageVersion>4.6.0</MicrosoftWin32RegistryLinePackageVersion>
     <MoqPackageVersion>4.16.1</MoqPackageVersion>
     <NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
@@ -27,13 +26,13 @@
     <OpenTelemetryPackageVersion>1.3.0</OpenTelemetryPackageVersion>
     <OpenTelemetryIntergationPackageVersion>1.0.0-rc9.4</OpenTelemetryIntergationPackageVersion>
     <ProtobufNetGrpcPackageVersion>1.0.140</ProtobufNetGrpcPackageVersion>
-    <SystemCommandLinePackageVersion>2.0.0-beta3.22114.1</SystemCommandLinePackageVersion>
-    <SystemCommandLineRenderingPackageVersion>0.4.0-alpha.22114.1</SystemCommandLineRenderingPackageVersion>
+    <SystemCommandLinePackageVersion>2.0.0-beta4.22272.1</SystemCommandLinePackageVersion>
+    <SystemCommandLineRenderingPackageVersion>0.4.0-alpha.22272.1</SystemCommandLineRenderingPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
     <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>6.0.1</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>4.6.0</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>4.7.0</SystemSecurityPrincipalWindowsPackageVersion>
     <SystemThreadingChannelsPackageVersion>4.6.0</SystemThreadingChannelsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/dotnet-grpc/Commands/AddFileCommand.cs b/src/dotnet-grpc/Commands/AddFileCommand.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using Grpc.Dotnet.Cli.Internal;
@@ -53,23 +54,29 @@ public static Command Create(HttpClient httpClient)
         command.AddOption(additionalImportDirsOption);
         command.AddArgument(filesArgument);
 
-        command.SetHandler<string, Services, Access, string?, string[], InvocationContext, IConsole>(
-            async (project, services, access, additionalImportDirs, files, context, console) =>
+        command.SetHandler(
+            async (context) =>
             {
+                var project = context.ParseResult.GetValueForOption(projectOption);
+                var services = context.ParseResult.GetValueForOption(serviceOption);
+                var access = context.ParseResult.GetValueForOption(accessOption);
+                var additionalImportDirs = context.ParseResult.GetValueForOption(additionalImportDirsOption);
+                var files = context.ParseResult.GetValueForArgument(filesArgument);
+
                 try
                 {
-                    var command = new AddFileCommand(console, project, httpClient);
+                    var command = new AddFileCommand(context.Console, project, httpClient);
                     await command.AddFileAsync(services, access, additionalImportDirs, files);
 
                     context.ExitCode = 0;
                 }
                 catch (CLIToolException e)
                 {
-                    console.LogError(e);
+                    context.Console.LogError(e);
 
                     context.ExitCode = -1;
                 }
-            }, projectOption, serviceOption, accessOption, additionalImportDirsOption, filesArgument);
+            });
 
         return command;
     }
diff --git a/src/dotnet-grpc/Commands/AddUrlCommand.cs b/src/dotnet-grpc/Commands/AddUrlCommand.cs
@@ -60,28 +60,35 @@ public static Command Create(HttpClient httpClient)
         command.AddOption(accessOption);
         command.AddArgument(urlArgument);
 
-        command.SetHandler<string, Services, Access, string?, string, string, InvocationContext, IConsole>(
-            async (project, services, access, additionalImportDirs, url, output, context, console) =>
+        command.SetHandler(
+            async (context) =>
             {
+                var project = context.ParseResult.GetValueForOption(projectOption);
+                var services = context.ParseResult.GetValueForOption(serviceOption);
+                var access = context.ParseResult.GetValueForOption(accessOption);
+                var additionalImportDirs = context.ParseResult.GetValueForOption(additionalImportDirsOption);
+                var output = context.ParseResult.GetValueForOption(outputOption);
+                var url = context.ParseResult.GetValueForArgument(urlArgument);
+
                 try
                 {
                     if (string.IsNullOrEmpty(output))
                     {
                         throw new CLIToolException(CoreStrings.ErrorNoOutputProvided);
                     }
 
-                    var command = new AddUrlCommand(console, project, httpClient);
+                    var command = new AddUrlCommand(context.Console, project, httpClient);
                     await command.AddUrlAsync(services, access, additionalImportDirs, url, output);
 
                     context.ExitCode = 0;
                 }
                 catch (CLIToolException e)
                 {
-                    console.LogError(e);
+                    context.Console.LogError(e);
 
                     context.ExitCode = -1;
                 }
-            }, projectOption, serviceOption, accessOption, additionalImportDirsOption, urlArgument, outputOption);
+            });
 
         return command;
     }
diff --git a/src/dotnet-grpc/Commands/ListCommand.cs b/src/dotnet-grpc/Commands/ListCommand.cs
@@ -41,23 +41,24 @@ public static Command Create(HttpClient httpClient)
 
         command.AddOption(projectOption);
 
-        command.SetHandler<string, InvocationContext, IConsole>(
-            (project, context, console) =>
+        command.SetHandler(
+            (context) =>
             {
+                var project = context.ParseResult.GetValueForOption(projectOption);
                 try
                 {
-                    var command = new ListCommand(console, project, httpClient);
+                    var command = new ListCommand(context.Console, project, httpClient);
                     command.List();
 
                     context.ExitCode = 0;
                 }
                 catch (CLIToolException e)
                 {
-                    console.LogError(e);
+                    context.Console.LogError(e);
 
                     context.ExitCode = -1;
                 }
-            }, projectOption);
+            });
 
         return command;
     }
diff --git a/src/dotnet-grpc/Commands/RefreshCommand.cs b/src/dotnet-grpc/Commands/RefreshCommand.cs
@@ -56,23 +56,27 @@ public static Command Create(HttpClient httpClient)
         command.AddOption(dryRunOption);
         command.AddArgument(referencesArgument);
 
-        command.SetHandler<string, bool, string[], InvocationContext, IConsole>(
-            async (project, dryRun, references, context, console) =>
+        command.SetHandler(
+            async (context) =>
             {
+                var project = context.ParseResult.GetValueForOption(projectOption);
+                var dryRun = context.ParseResult.GetValueForOption(dryRunOption);
+                var references = context.ParseResult.GetValueForArgument(referencesArgument);
+                
                 try
                 {
-                    var command = new RefreshCommand(console, project, httpClient);
+                    var command = new RefreshCommand(context.Console, project, httpClient);
                     await command.RefreshAsync(dryRun, references);
 
                     context.ExitCode = 0;
                 }
                 catch (CLIToolException e)
                 {
-                    console.LogError(e);
+                    context.Console.LogError(e);
 
                     context.ExitCode = -1;
                 }
-            }, projectOption, dryRunOption, referencesArgument);
+            });
 
         return command;
     }
diff --git a/src/dotnet-grpc/Commands/RemoveCommand.cs b/src/dotnet-grpc/Commands/RemoveCommand.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using Grpc.Dotnet.Cli.Internal;
@@ -47,23 +48,27 @@ public static Command Create(HttpClient httpClient)
         command.AddOption(projectOption);
         command.AddArgument(referencesArgument);
 
-        command.SetHandler<string, string[], InvocationContext, IConsole>(
-            (project, references, context, console) =>
+        command.SetHandler(
+            (context) =>
             {
+                var project = context.ParseResult.GetValueForOption(projectOption);
+                var references = context.ParseResult.GetValueForArgument(referencesArgument);
                 try
                 {
-                    var command = new RemoveCommand(console, project, httpClient);
+                    var command = new RemoveCommand(context.Console, project, httpClient);
                     command.Remove(references);
 
                     context.ExitCode = 0;
                 }
                 catch (CLIToolException e)
                 {
-                    console.LogError(e);
+                    context.Console.LogError(e);
 
                     context.ExitCode = -1;
                 }
-            }, projectOption, referencesArgument);
+
+                return Task.CompletedTask;
+            });
 
         return command;
     }
diff --git a/src/dotnet-grpc/Options/CommonOptions.cs b/src/dotnet-grpc/Options/CommonOptions.cs
@@ -23,31 +23,31 @@ namespace Grpc.Dotnet.Cli.Options;
 
 internal static class CommonOptions
 {
-    public static Option ProjectOption()
+    public static Option<string> ProjectOption()
     {
         var o = new Option<string>(
             aliases: new[] { "-p", "--project" },
             description: CoreStrings.ProjectOptionDescription);
         return o;
     }
 
-    public static Option ServiceOption()
+    public static Option<Services> ServiceOption()
     {
         var o = new Option<Services>(
             aliases: new[] { "-s", "--services" },
             description: CoreStrings.ServiceOptionDescription);
         return o;
     }
 
-    public static Option AccessOption()
+    public static Option<Access> AccessOption()
     {
         var o = new Option<Access>(
             aliases: new[] { "--access" },
             description: CoreStrings.AccessOptionDescription);
         return o;
     }
 
-    public static Option AdditionalImportDirsOption()
+    public static Option<string> AdditionalImportDirsOption()
     {
         var o = new Option<string>(
             aliases: new[] { "-i", "--additional-import-dirs" },
diff --git a/src/dotnet-grpc/dotnet-grpc.csproj b/src/dotnet-grpc/dotnet-grpc.csproj
@@ -4,7 +4,7 @@
     <PackageTags>gRPC RPC CLI</PackageTags>
 
     <IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <OutputType>exe</OutputType>
     <PackAsTool>true</PackAsTool>
@@ -15,7 +15,7 @@
     <NoWarn>$(NoWarn);CA2007</NoWarn>
 
     <!-- The roll forward policy is set to LatestMajor to allow rolling forward to latest major and minor
-      version of the runtime even if requested major (netcoreapp3.0) is present. This ensures that the runtime
+      version of the runtime even if requested major (netcoreapp3.1) is present. This ensures that the runtime
       contains assemblies that are equal or newer than neede by the SDK assemblies resolved by the MSBuild locator.
       See https://github.com/dotnet/designs/blob/main/accepted/2019/runtime-binding.md#rollforward for details-->
     <RollForward>LatestMajor</RollForward>

Original file line number	Diff line number	Diff line change
`@@ -60,28 +60,35 @@ public static Command Create(HttpClient httpClient)`
`60`	`60`	`command.AddOption(accessOption);`
`61`	`61`	`command.AddArgument(urlArgument);`
`62`	`62`
`63`		`- command.SetHandler<string, Services, Access, string?, string, string, InvocationContext, IConsole>(`
`64`		`- async (project, services, access, additionalImportDirs, url, output, context, console) =>`
	`63`	`+ command.SetHandler(`
	`64`	`+ async (context) =>`
`65`	`65`	`{`
	`66`	`+ var project = context.ParseResult.GetValueForOption(projectOption);`
	`67`	`+ var services = context.ParseResult.GetValueForOption(serviceOption);`
	`68`	`+ var access = context.ParseResult.GetValueForOption(accessOption);`
	`69`	`+ var additionalImportDirs = context.ParseResult.GetValueForOption(additionalImportDirsOption);`
	`70`	`+ var output = context.ParseResult.GetValueForOption(outputOption);`
	`71`	`+ var url = context.ParseResult.GetValueForArgument(urlArgument);`
	`72`	`+`
`66`	`73`	`try`
`67`	`74`	`{`
`68`	`75`	`if (string.IsNullOrEmpty(output))`
`69`	`76`	`{`
`70`	`77`	`throw new CLIToolException(CoreStrings.ErrorNoOutputProvided);`
`71`	`78`	`}`
`72`	`79`
`73`		`- var command = new AddUrlCommand(console, project, httpClient);`
	`80`	`+ var command = new AddUrlCommand(context.Console, project, httpClient);`
`74`	`81`	`await command.AddUrlAsync(services, access, additionalImportDirs, url, output);`
`75`	`82`
`76`	`83`	`context.ExitCode = 0;`
`77`	`84`	`}`
`78`	`85`	`catch (CLIToolException e)`
`79`	`86`	`{`
`80`		`- console.LogError(e);`
	`87`	`+ context.Console.LogError(e);`
`81`	`88`
`82`	`89`	`context.ExitCode = -1;`
`83`	`90`	`}`
`84`		`- }, projectOption, serviceOption, accessOption, additionalImportDirsOption, urlArgument, outputOption);`
	`91`	`+ });`
`85`	`92`
`86`	`93`	`return command;`
`87`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,23 +41,24 @@ public static Command Create(HttpClient httpClient)`
`41`	`41`
`42`	`42`	`command.AddOption(projectOption);`
`43`	`43`
`44`		`- command.SetHandler<string, InvocationContext, IConsole>(`
`45`		`- (project, context, console) =>`
	`44`	`+ command.SetHandler(`
	`45`	`+ (context) =>`
`46`	`46`	`{`
	`47`	`+ var project = context.ParseResult.GetValueForOption(projectOption);`
`47`	`48`	`try`
`48`	`49`	`{`
`49`		`- var command = new ListCommand(console, project, httpClient);`
	`50`	`+ var command = new ListCommand(context.Console, project, httpClient);`
`50`	`51`	`command.List();`
`51`	`52`
`52`	`53`	`context.ExitCode = 0;`
`53`	`54`	`}`
`54`	`55`	`catch (CLIToolException e)`
`55`	`56`	`{`
`56`		`- console.LogError(e);`
	`57`	`+ context.Console.LogError(e);`
`57`	`58`
`58`	`59`	`context.ExitCode = -1;`
`59`	`60`	`}`
`60`		`- }, projectOption);`
	`61`	`+ });`
`61`	`62`
`62`	`63`	`return command;`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,23 +56,27 @@ public static Command Create(HttpClient httpClient)`
`56`	`56`	`command.AddOption(dryRunOption);`
`57`	`57`	`command.AddArgument(referencesArgument);`
`58`	`58`
`59`		`- command.SetHandler<string, bool, string[], InvocationContext, IConsole>(`
`60`		`- async (project, dryRun, references, context, console) =>`
	`59`	`+ command.SetHandler(`
	`60`	`+ async (context) =>`
`61`	`61`	`{`
	`62`	`+ var project = context.ParseResult.GetValueForOption(projectOption);`
	`63`	`+ var dryRun = context.ParseResult.GetValueForOption(dryRunOption);`
	`64`	`+ var references = context.ParseResult.GetValueForArgument(referencesArgument);`
	`65`	`+`
`62`	`66`	`try`
`63`	`67`	`{`
`64`		`- var command = new RefreshCommand(console, project, httpClient);`
	`68`	`+ var command = new RefreshCommand(context.Console, project, httpClient);`
`65`	`69`	`await command.RefreshAsync(dryRun, references);`
`66`	`70`
`67`	`71`	`context.ExitCode = 0;`
`68`	`72`	`}`
`69`	`73`	`catch (CLIToolException e)`
`70`	`74`	`{`
`71`		`- console.LogError(e);`
	`75`	`+ context.Console.LogError(e);`
`72`	`76`
`73`	`77`	`context.ExitCode = -1;`
`74`	`78`	`}`
`75`		`- }, projectOption, dryRunOption, referencesArgument);`
	`79`	`+ });`
`76`	`80`
`77`	`81`	`return command;`
`78`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#endregion`
`18`	`18`
	`19`	`+using System;`
`19`	`20`	`using System.CommandLine;`
`20`	`21`	`using System.CommandLine.Invocation;`
`21`	`22`	`using Grpc.Dotnet.Cli.Internal;`
`@@ -47,23 +48,27 @@ public static Command Create(HttpClient httpClient)`
`47`	`48`	`command.AddOption(projectOption);`
`48`	`49`	`command.AddArgument(referencesArgument);`
`49`	`50`
`50`		`- command.SetHandler<string, string[], InvocationContext, IConsole>(`
`51`		`- (project, references, context, console) =>`
	`51`	`+ command.SetHandler(`
	`52`	`+ (context) =>`
`52`	`53`	`{`
	`54`	`+ var project = context.ParseResult.GetValueForOption(projectOption);`
	`55`	`+ var references = context.ParseResult.GetValueForArgument(referencesArgument);`
`53`	`56`	`try`
`54`	`57`	`{`
`55`		`- var command = new RemoveCommand(console, project, httpClient);`
	`58`	`+ var command = new RemoveCommand(context.Console, project, httpClient);`
`56`	`59`	`command.Remove(references);`
`57`	`60`
`58`	`61`	`context.ExitCode = 0;`
`59`	`62`	`}`
`60`	`63`	`catch (CLIToolException e)`
`61`	`64`	`{`
`62`		`- console.LogError(e);`
	`65`	`+ context.Console.LogError(e);`
`63`	`66`
`64`	`67`	`context.ExitCode = -1;`
`65`	`68`	`}`
`66`		`- }, projectOption, referencesArgument);`
	`69`	`+`
	`70`	`+ return Task.CompletedTask;`
	`71`	`+ });`
`67`	`72`
`68`	`73`	`return command;`
`69`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,31 +23,31 @@ namespace Grpc.Dotnet.Cli.Options;`
`23`	`23`
`24`	`24`	`internal static class CommonOptions`
`25`	`25`	`{`
`26`		`- public static Option ProjectOption()`
	`26`	`+ public static Option<string> ProjectOption()`
`27`	`27`	`{`
`28`	`28`	`var o = new Option<string>(`
`29`	`29`	`aliases: new[] { "-p", "--project" },`
`30`	`30`	`description: CoreStrings.ProjectOptionDescription);`
`31`	`31`	`return o;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static Option ServiceOption()`
	`34`	`+ public static Option<Services> ServiceOption()`
`35`	`35`	`{`
`36`	`36`	`var o = new Option<Services>(`
`37`	`37`	`aliases: new[] { "-s", "--services" },`
`38`	`38`	`description: CoreStrings.ServiceOptionDescription);`
`39`	`39`	`return o;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static Option AccessOption()`
	`42`	`+ public static Option<Access> AccessOption()`
`43`	`43`	`{`
`44`	`44`	`var o = new Option<Access>(`
`45`	`45`	`aliases: new[] { "--access" },`
`46`	`46`	`description: CoreStrings.AccessOptionDescription);`
`47`	`47`	`return o;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public static Option AdditionalImportDirsOption()`
	`50`	`+ public static Option<string> AdditionalImportDirsOption()`
`51`	`51`	`{`
`52`	`52`	`var o = new Option<string>(`
`53`	`53`	`aliases: new[] { "-i", "--additional-import-dirs" },`