Updated commands to use new System.Commandline

Author: pjoiner

NuGet.config

@@ -4,7 +4,7 @@
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
   <packageSources>
-    <clear />
+   
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

src/DwC-A_dotnet.Interactive/Commands/DwcaCodegenCommand.cs

@@ -9,30 +9,29 @@
 using Microsoft.DotNet.Interactive.ValueSharing;
 using System;
 using System.CommandLine;
-using System.CommandLine.NamingConventionBinder;
 using System.IO;
 using System.Threading.Tasks;
 
 namespace DwC_A.Interactive.Commands
 {
-    internal class DwcaCodegenCommand : Command
+    internal static class DwcaCodegenCommandFactory
     {
-        public DwcaCodegenCommand()
-            : base("#!dwca-codegen", "Generate strongly typed class files for Darwin Core Archive")
+        public static Command Create()
         {
-            AddArgument(new Argument<string>()
+            var command = new Command("#!dwca-codegen", "Generate strongly typed class files for Darwin Core Archive");
+            command.AddArgument(new Argument<string>()
             {
                 Name = "archivePath",
                 Description = "Path to archive folder or zip file"
             });
 
-            AddOption(new Option<string>(
+            command.AddOption(new Option<string>(
                 aliases: new[] {"-c", "--configName"},
                 description: "Name of configuration variable",
                 getDefaultValue: () => ""
             ));
 
-            Handler = CommandHandler.Create<KernelInvocationContext, string, string>((Func<KernelInvocationContext, string, string, Task>)(async (context, archivePath, configName) =>
+            command.SetHandler((Func<KernelInvocationContext, string, string, Task>)(async (context, archivePath, configName) =>
             {
                 var archive = new ArchiveReader(archivePath);
 
@@ -44,12 +43,14 @@ public DwcaCodegenCommand()
                 context.Display($"Opening archive {archive.FileName} using configuration", new[] { "text/html" });
                 context.Display(config, new[] { "text/html" });
 
-                await GenerateClass(context, archive.CoreFile, config);
+                await DwcaCodegenCommandFactory.GenerateClass(context, archive.CoreFile, config);
                 foreach(var extension in archive.Extensions.GetFileReaders())
                 {
-                    await GenerateClass(context, extension, config);
+                    await DwcaCodegenCommandFactory.GenerateClass(context, extension, config);
                 }
             }));
+
+            return command;
         }
 
         private static async Task GenerateClass(KernelInvocationContext context, 

src/DwC-A_dotnet.Interactive/Commands/TermsCommand.cs

@@ -1,19 +1,20 @@
 using Microsoft.DotNet.Interactive;
 using System;
 using System.CommandLine;
-using System.CommandLine.NamingConventionBinder;
 
 namespace DwC_A.Interactive.Commands
 {
-    internal class TermsCommand : Command
+    internal static class TermsCommandFactory
     {
-        public TermsCommand() : base("#!terms", "Display Darwin Core standard terms")
+        public static Command Create()
         {
-            Handler = CommandHandler.Create((KernelInvocationContext invocationContext) =>
+            var termsCmd = new Command("#!terms", "Display Darwin Core standard terms");
+            termsCmd.SetHandler((KernelInvocationContext invocationContext) =>
             {
                 var defaultTerms = new DefaultTerms();
                 invocationContext.Display(defaultTerms);
             });
+            return termsCmd;
         }
     }
 }

src/DwC-A_dotnet.Interactive/DwC-A_dotnet.Interactive.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>DwC_A.Interactive</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>Copyright © Paul Joiner 2021</Copyright>
@@ -11,10 +11,10 @@
     <PackageTags>DwC-A darwin-core Biodiversity</PackageTags>
     <Authors>Paul Joiner</Authors>
     <Company>Paul Joiner</Company>
-    <Version>0.1.10-Pre</Version>
+    <Version>0.1.20-Pre</Version>
     <Description>.NET Interactive Extensions for Darwin Core Archive file reader</Description>
-    <AssemblyVersion>0.1.10.0</AssemblyVersion>
-    <FileVersion>0.1.10.0</FileVersion>
+    <AssemblyVersion>0.1.20.0</AssemblyVersion>
+    <FileVersion>0.1.20.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
@@ -24,9 +24,8 @@
       <Aliases>Core</Aliases>
     </PackageReference>
     <PackageReference Include="DwC-A_dotnet.Mapping" Version="0.6.3" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-*" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.22071.1" />
     <PackageReference Include="microsoft.dotnet.interactive" Version="1.0.0-beta.22070.1" />
-    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta2.22071.1" />
   </ItemGroup>
 
   <ItemGroup>

src/DwC-A_dotnet.Interactive/DwCKernelExtension.cs

@@ -5,8 +5,6 @@
 using Core.DwC_A;
 using Core.DwC_A.Meta;
 using DwC_A.Interactive.Formatters;
-using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.Collections.Generic;
 using DwC_A.Interactive.Commands;
 using DwC_A.Config;
@@ -24,8 +22,8 @@ public Task OnLoadAsync(Kernel kernel)
             Formatter.Register<IEnumerable<IRow>>(RowFormatter.Register, "text/html");
             Formatter.Register<IGeneratorConfiguration>(GeneratorConfigFormatter.Register, "text/html");
 
-            kernel.AddDirective(new TermsCommand());
-            kernel.AddDirective(new DwcaCodegenCommand());
+            kernel.AddDirective(TermsCommandFactory.Create());
+            kernel.AddDirective(DwcaCodegenCommandFactory.Create());
 
             return Task.CompletedTask;
         }