[release/7.0.3xx] Update dependencies from dotnet/command-line-api

eng/Version.Details.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22463.5">
-      <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>6e9ede1f2771f59d80a4050c02d051bbbd457c77</Sha>
-      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
-    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22408.1">
-      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>ddc5b4880b0bf18783fc6808c4d407214f7bdae1</Sha>
-      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
-    </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23152.1">
-      <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>d5b63a05d9f4619dea0be897d3acc0ad5272874e</Sha>
-    </Dependency>
-  </ProductDependencies>
-  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23122.4">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
-      <SourceBuild RepoName="arcade" ManagedOnly="true" />
-    </Dependency>
-  </ToolsetDependencies>
-</Dependencies>
+	<ProductDependencies>
+		<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22463.5">
+			<Uri>https://github.com/dotnet/source-build-externals</Uri>
+			<Sha>6e9ede1f2771f59d80a4050c02d051bbbd457c77</Sha>
+			<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
+		</Dependency>
+		<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22408.1">
+			<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
+			<Sha>ddc5b4880b0bf18783fc6808c4d407214f7bdae1</Sha>
+			<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
+		</Dependency>
+		<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23157.2">
+			<Uri>https://github.com/dotnet/command-line-api</Uri>
+			<Sha>c63e231c1e5102c51bd9247a4f3feec9175d601d</Sha>
+		</Dependency>
+	</ProductDependencies>
+	<ToolsetDependencies>
+		<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23122.4">
+			<Uri>https://github.com/dotnet/arcade</Uri>
+			<Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
+			<SourceBuild RepoName="arcade" ManagedOnly="true" />
+		</Dependency>
+	</ToolsetDependencies>
+</Dependencies>

eng/Versions.props

@@ -16,6 +16,6 @@
   <PropertyGroup>
     <!-- Maestro-managed Package Versions - Ordered by repo name -->
     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
-    <SystemCommandLinePackageVersion>2.0.0-beta4.23152.1</SystemCommandLinePackageVersion>
+    <SystemCommandLinePackageVersion>2.0.0-beta4.23157.2</SystemCommandLinePackageVersion>
   </PropertyGroup>
 </Project>

tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/Verify/VerifyCommand.cs

@@ -19,65 +19,65 @@ internal class VerifyCommand : ExecutableCommand<VerifyCommandArgs>
             Arity = new ArgumentArity(1, 1)
         };
 
-        private readonly Option<string> _remainingArguments = new Option<string>("--template-args")
+        private readonly Option<string> _remainingArguments = new Option<string>("template-args", new[] { "--template-args" })
         {
             Description = "Template specific arguments - all joined into single enquoted string. Any needed quotations of actual arguments has to be escaped.",
             Arity = new ArgumentArity(0, 1)
         };
 
-        private readonly Option<string> _templatePathOption = new(new[] { "-p", "--template-path" })
+        private readonly Option<string> _templatePathOption = new("template-path", new[] { "-p", "--template-path" })
         {
             Description = LocalizableStrings.command_verify_help_templatePath_description,
         };
 
-        private readonly Option<string> _templateOutputPathOption = new(new[] { "-o", "--output" })
+        private readonly Option<string> _templateOutputPathOption = new("output", new[] { "-o", "--output" })
         {
             Description = LocalizableStrings.command_verify_help_outputPath_description,
         };
 
-        private readonly Option<string> _snapshotsDirectoryOption = new(new[] { "-d", "--snapshots-directory" })
+        private readonly Option<string> _snapshotsDirectoryOption = new("snapshots-directory", new[] { "-d", "--snapshots-directory" })
         {
             Description = LocalizableStrings.command_verify_help_snapshotsDirPath_description,
         };
 
-        private readonly Option<string> _scenarioNameOption = new(new[] { "--scenario-name" })
+        private readonly Option<string> _scenarioNameOption = new("scenario-name", new[] { "--scenario-name" })
         {
             Description = LocalizableStrings.command_verify_help_scenarioName_description,
         };
 
-        private readonly Option<bool> _disableDiffToolOption = new("--disable-diff-tool")
+        private readonly Option<bool> _disableDiffToolOption = new("disable-diff-tool", new[] { "--disable-diff-tool" })
         {
             Description = LocalizableStrings.command_verify_help_disableDiffTool_description,
         };
 
-        private readonly Option<bool> _disableDefaultExcludePatternsOption = new("--disable-default-exclude-patterns")
+        private readonly Option<bool> _disableDefaultExcludePatternsOption = new("disable-default-exclude-patterns", new[] { "--disable-default-exclude-patterns" })
         {
             Description = LocalizableStrings.command_verify_help_disableDefaultExcludes_description,
         };
 
-        private readonly Option<IEnumerable<string>> _excludePatternOption = new("--exclude-pattern")
+        private readonly Option<IEnumerable<string>> _excludePatternOption = new("exclude-pattern", new[] { "--exclude-pattern" })
         {
             Description = LocalizableStrings.command_verify_help_customExcludes_description,
             Arity = new ArgumentArity(0, 999)
         };
 
-        private readonly Option<IEnumerable<string>> _includePatternOption = new("--include-pattern")
+        private readonly Option<IEnumerable<string>> _includePatternOption = new("include-pattern", new[] { "--include-pattern" })
         {
             Description = LocalizableStrings.command_verify_help_customIncludes_description,
             Arity = new ArgumentArity(0, 999)
         };
 
-        private readonly Option<bool> _verifyCommandOutputOption = new("--verify-std")
+        private readonly Option<bool> _verifyCommandOutputOption = new("verify-std", new[] { "--verify-std" })
         {
             Description = LocalizableStrings.command_verify_help_verifyOutputs_description,
         };
 
-        private readonly Option<bool> _isCommandExpectedToFailOption = new("--fail-expected")
+        private readonly Option<bool> _isCommandExpectedToFailOption = new("fail-expected", new[] { "--fail-expected" })
         {
             Description = LocalizableStrings.command_verify_help_expectFailure_description,
         };
 
-        private readonly Option<IEnumerable<UniqueForOption>> _uniqueForOption = new("--unique-for")
+        private readonly Option<IEnumerable<UniqueForOption>> _uniqueForOption = new("unique-for", new[] { "--unique-for" })
         {
             Description = LocalizableStrings.command_verify_help_uniqueFor_description,
             Arity = new ArgumentArity(0, 999),

tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/localize/export/ExportCommand.cs

@@ -17,23 +17,20 @@ internal sealed class ExportCommand : ExecutableCommand<ExportCommandArgs>
             Description = LocalizableStrings.command_export_help_templatePath_description,
         };
 
-        private readonly Option<IEnumerable<string>> _languageOption = new("-l")
+        private readonly Option<IEnumerable<string>> _languageOption = new("language", new[] { "--language", "-l" })
         {
-            Name = "--language",
             Description = LocalizableStrings.command_export_help_language_description,
             Arity = ArgumentArity.OneOrMore,
             AllowMultipleArgumentsPerToken = true,
         };
 
-        private readonly Option<bool> _recursiveOption = new("-r")
+        private readonly Option<bool> _recursiveOption = new("recursive", new[] { "--recursive", "-r" })
         {
-            Name = "--recursive",
             Description = LocalizableStrings.command_export_help_recursive_description,
         };
 
-        private readonly Option<bool> _dryRunOption = new("-d")
+        private readonly Option<bool> _dryRunOption = new("dry-run", new[] { "--dry-run", "-d" })
         {
-            Name = "--dry-run",
             Description = LocalizableStrings.command_export_help_dryrun_description,
         };
 

tools/Microsoft.TemplateSearch.TemplateDiscovery/TemplateDiscoveryCommand.cs

@@ -14,71 +14,73 @@ internal class TemplateDiscoveryCommand : Command
     {
         private const int DefaultPageSize = 100;
 
-        private readonly Option<DirectoryInfo> _basePathOption = new Option<DirectoryInfo>("--basePath")
+        private readonly Option<DirectoryInfo> _basePathOption = new Option<DirectoryInfo>("basePath", new[] { "--basePath" })
         {
             Arity = ArgumentArity.ExactlyOne,
             Description = "The root dir for output for this run.",
             IsRequired = true
         };
 
-        private readonly Option<bool> _allowPreviewPacksOption = new Option<bool>("--allowPreviewPacks")
+        private readonly Option<bool> _allowPreviewPacksOption = new Option<bool>("allowPreviewPacks", new[] { "--allowPreviewPacks" })
         {
             Description = "Include preview packs in the results (by default, preview packs are ignored and the latest stable pack is used.",
         };
 
-        private readonly Option<int> _pageSizeOption = new Option<int>("--pageSize", defaultValueFactory: () => DefaultPageSize)
+        private readonly Option<int> _pageSizeOption = new Option<int>("pageSize", new[] { "--pageSize" })
         {
             Description = "(debugging) The chunk size for interactions with the source.",
+            DefaultValueFactory = (r) => DefaultPageSize,
         };
 
-        private readonly Option<bool> _onePageOption = new Option<bool>("--onePage")
+        private readonly Option<bool> _onePageOption = new Option<bool>("onePage", new[] { "--onePage" })
         {
             Description = "(debugging) Only process one page of template packs.",
         };
 
-        private readonly Option<bool> _savePacksOption = new Option<bool>("--savePacks")
+        private readonly Option<bool> _savePacksOption = new Option<bool>("savePacks", new[] { "--savePacks" })
         {
             Description = "Don't delete downloaded candidate packs (by default, they're deleted at the end of a run).",
         };
 
-        private readonly Option<bool> _noTemplateJsonFilterOption = new Option<bool>("--noTemplateJsonFilter")
+        private readonly Option<bool> _noTemplateJsonFilterOption = new Option<bool>("noTemplateJsonFilter", new[] { "--noTemplateJsonFilter" })
         {
             Description = "Don't prefilter packs that don't contain any template.json files (this filter is applied by default).",
         };
 
-        private readonly Option<bool> _verboseOption = new Option<bool>(new[] { "-v", "--verbose" })
+        private readonly Option<bool> _verboseOption = new Option<bool>("verbose", new[] { "-v", "--verbose" })
         {
             Description = "Verbose output for template processing.",
         };
 
-        private readonly Option<bool> _testOption = new Option<bool>(new[] { "-t", "--test" })
+        private readonly Option<bool> _testOption = new Option<bool>("test", new[] { "-t", "--test" })
         {
             Description = "Run tests on generated metadata files.",
         };
 
-        private readonly Option<SupportedQueries[]> _queriesOption = new Option<SupportedQueries[]>("--queries")
+        private readonly Option<SupportedQueries[]> _queriesOption = new Option<SupportedQueries[]>("queries", new[] { "--queries" })
         {
             Arity = ArgumentArity.OneOrMore,
             Description = $"The list of providers to run. Supported providers: {string.Join(",", Enum.GetValues<SupportedQueries>())}.",
             AllowMultipleArgumentsPerToken = true,
         };
 
-        private readonly Option<DirectoryInfo> _packagesPathOption = new Option<DirectoryInfo>("--packagesPath")
+        private readonly Option<DirectoryInfo> _packagesPathOption = new Option<DirectoryInfo>("packagesPath", new[] { "--packagesPath" })
         {
             Description = $"Path to pre-downloaded packages. If specified, the packages won't be downloaded from NuGet.org.",
         }.AcceptExistingOnly();
 
-        private readonly Option<bool> _diffOption = new Option<bool>("--diff", defaultValueFactory: () => true)
+        private readonly Option<bool> _diffOption = new Option<bool>("diff", new[] { "--diff" })
         {
             Description = $"The list of packages will be compared with previous run, and if package version is not changed, the package won't be rescanned.",
+            DefaultValueFactory = (r) => true,
         };
 
-        private readonly Option<FileInfo> _diffOverrideCacheOption = new Option<FileInfo>("--diff-override-cache")
+        private readonly Option<FileInfo> _diffOverrideCacheOption = new Option<FileInfo>("diff-override-cache", new[] { "--diff-override-cache" })
         {
             Description = $"Location of current search cache (local path only).",
         }.AcceptExistingOnly();
 
-        private readonly Option<FileInfo> _diffOverrideNonPackagesOption = new Option<FileInfo>("--diff-override-non-packages")
+        private readonly Option<FileInfo> _diffOverrideNonPackagesOption = new Option<FileInfo>("diff-override-non-packages", new[] { "--diff-override-non-packages" })
         {
             Description = $"Location of the list of packages known not to be a valid package (local path only).",
         }.AcceptExistingOnly();