Merge pull request #90 from ProfessionalCSharp/commandlinebeta2

christiannagel · web-flow · commit 37c4f46594d2 · 2022-01-27T18:24:33.000+01:00
command line beta 2 updates #89
diff --git a/1_CS/LINQ/EnumerableSample/EnumerableSample.csproj b/1_CS/LINQ/EnumerableSample/EnumerableSample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/1_CS/LINQ/EnumerableSample/RegisterCommands.cs b/1_CS/LINQ/EnumerableSample/RegisterCommands.cs
@@ -15,14 +15,13 @@ public static void Register(RootCommand rootCommand, string commandText, string
 
         foreach (var method in methods)
         {
-            command.AddCommand(new(method.Name.ToLower())
+            Command featureCommand = new(method.Name.ToLower());
+            featureCommand.SetHandler(() =>
             {
-                Handler = CommandHandler.Create(() =>
-                {
-                    MethodInfo m = method;
-                    m.Invoke(null, null);
-                })
+                MethodInfo m = method;
+                m.Invoke(null, null);
             });
+            command.AddCommand(featureCommand);
         }
 
         rootCommand.AddCommand(command);
diff --git a/2_Libs/FilesAndStreams/FilesAndFolders/FilesAndFolders.csproj b/2_Libs/FilesAndStreams/FilesAndFolders/FilesAndFolders.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
   </ItemGroup>
 
 </Project>
diff --git a/2_Libs/FilesAndStreams/FilesAndFolders/Program.cs b/2_Libs/FilesAndStreams/FilesAndFolders/Program.cs
@@ -15,29 +15,34 @@ CommandLineBuilder BuildCommandLine()
         IsRequired = true
     };
     RootCommand rootCommand = new("FilesAndFolders");
-    Command showDrivesCommand = new("showdrives") { Handler = CommandHandler.Create(ShowDrivesInformation) };
-    Command specialFoldersCommand = new("specialfolders") { Handler = CommandHandler.Create(ShowSpecialFolders) };
+    Command showDrivesCommand = new("showdrives");
+    showDrivesCommand.SetHandler(ShowDrivesInformation);
+    Command specialFoldersCommand = new("specialfolders");
+    specialFoldersCommand.SetHandler(ShowSpecialFolders);
     Command createFileCommand = new("createfile") { fileOption };
-    createFileCommand.Handler = CommandHandler.Create<string>(CreateFile);
+    createFileCommand.SetHandler<string>(CreateFile, fileOption);
     Command fileInfoCommand = new("fileinfo") { fileOption };
-    fileInfoCommand.Handler = CommandHandler.Create<string>(FileInformation);
+    fileInfoCommand.SetHandler<string>(FileInformation, fileOption);
     Command changePropertiesCommand = new("changeprops") { fileOption };
-    changePropertiesCommand.Handler = CommandHandler.Create<string>(ChangeFileProperties);
+    changePropertiesCommand.SetHandler<string>(ChangeFileProperties, fileOption);
     Command readLinesCommand = new("readlines") { fileOption };
-    readLinesCommand.Handler = CommandHandler.Create<string>(ReadLineByLine);
-    Command writeFileCommand = new("writefile") { Handler = CommandHandler.Create(WriteAFile) };
+    readLinesCommand.SetHandler<string>(ReadLineByLine, fileOption);
+    Command writeFileCommand = new("writefile");
+    writeFileCommand.SetHandler(WriteAFile);
+    Option<string> directoryOption = new("--dir")
+    {
+        IsRequired = true
+    };
+    Option<bool> checkOnlyOption = new("--checkOnly")
+    {
+        IsRequired = false
+    };
     Command deleteDuplicateFilesCommand = new("deleteduplicate")
     {
-        new Option<string>("--dir")
-        {
-            IsRequired = true
-        },
-        new Option<bool>("--checkOnly")
-        {
-            IsRequired = false
-        }
+        directoryOption,
+        checkOnlyOption
     };
-    deleteDuplicateFilesCommand.Handler = CommandHandler.Create<string, bool?>((dir, checkOnly) => DeleteDuplicateFiles(dir, checkOnly ?? true));
+    deleteDuplicateFilesCommand.SetHandler<string, bool?>((dir, checkOnly) => DeleteDuplicateFiles(dir, checkOnly ?? true), directoryOption, checkOnlyOption);
 
     rootCommand.AddCommand(showDrivesCommand);
     rootCommand.AddCommand(specialFoldersCommand);
diff --git a/2_Libs/FilesAndStreams/StreamSamples/Program.cs b/2_Libs/FilesAndStreams/StreamSamples/Program.cs
@@ -24,21 +24,24 @@ CommandLineBuilder BuildCommandLine()
     outputFileOption.AddAlias("-o");
     RootCommand rootCommand = new("WorkingWithFilesAndDirectories");
     Command readWithStreamCommand = new("readwithstream") { fileOption };
-    readWithStreamCommand.Handler = CommandHandler.Create<string>(ReadUsingFileStream);
-    Command writeTextFileCommand = new("writetext") { Handler = CommandHandler.Create(WriteTextFile) };
+    readWithStreamCommand.SetHandler<string>(file => ReadUsingFileStream(file), inputFileOption);
+    Command writeTextFileCommand = new("writetext");
+    writeTextFileCommand.SetHandler(WriteTextFile);
     Command copyCommand = new("copy") { inputFileOption, outputFileOption };
-    copyCommand.Handler = CommandHandler.Create<string, string>(CopyUsingStreams);
+    copyCommand.SetHandler<string, string>((inputFile, ouptutFile) => CopyUsingStreams(inputFile, ouptutFile), inputFileOption, outputFileOption);
     Command copy2Command = new("copy2") { inputFileOption, outputFileOption };
-    copy2Command.Handler = CommandHandler.Create<string, string>(CopyUsingStreams2);
+    copy2Command.SetHandler<string, string>((inputFile, outputFile) => CopyUsingStreams2(inputFile, outputFile), inputFileOption, outputFileOption);
+    Option<int> countOption = new("--count")
+    {
+        IsRequired = true
+    };
     Command createSampleFile = new("samplefile")
     {
-        new Option<int>("--count")
-        {
-            IsRequired = true
-        }
+        countOption
     };
-    createSampleFile.Handler = CommandHandler.Create<int>(CreateSampleFileAsync);
-    Command randomAccessCommand = new("random") { Handler = CommandHandler.Create(RandomAccessSampleAsync) };
+    createSampleFile.SetHandler<int>(async count => await CreateSampleFileAsync(count), countOption); ;
+    Command randomAccessCommand = new("random");
+    randomAccessCommand.SetHandler(RandomAccessSampleAsync);
 
     rootCommand.AddCommand(readWithStreamCommand);
     rootCommand.AddCommand(writeTextFileCommand);
diff --git a/2_Libs/FilesAndStreams/StreamSamples/StreamSamples.csproj b/2_Libs/FilesAndStreams/StreamSamples/StreamSamples.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.21617.1" />
   </ItemGroup>
 
 </Project>
diff --git a/2_Libs/Networking/HttpClientSample/HttpClientSample.csproj b/2_Libs/Networking/HttpClientSample/HttpClientSample.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0-rc.2.21480.10" />
-    <PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.21617.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/2_Libs/Networking/HttpClientSample/Program.cs b/2_Libs/Networking/HttpClientSample/Program.cs
@@ -59,67 +59,66 @@ CommandLineBuilder BuildCommandLine()
 {
     RootCommand rootCommand = new("HttpClientSample");
     Command simpleCommand = new("simple");
-    simpleCommand.Handler = CommandHandler.Create<IHost>(async (host) =>
+    simpleCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSamples>();
         await service.SimpleGetRequestAsync();
     });
     rootCommand.AddCommand(simpleCommand);
 
     Command httpRequestMessageCommand = new("httprequest");
-    httpRequestMessageCommand.Handler = CommandHandler.Create<IHost>(async (host) =>
+    httpRequestMessageCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSamples>();
         await service.UseHttpRequestMessageAsync();
     });
     rootCommand.AddCommand(httpRequestMessageCommand);
 
     Command exceptionCommand = new("exception");
-    exceptionCommand.Handler = CommandHandler.Create<IHost>(async (host) =>
+    exceptionCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSamples>();
         await service.ThrowExceptionAsync();
     });
     rootCommand.AddCommand(exceptionCommand);
 
     Command headerCommand = new("headers");
-    headerCommand.Handler = CommandHandler.Create<IHost>(async (host) =>
+    headerCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSamples>();
         await service.AddHttpHeadersAsync();
     });
     rootCommand.AddCommand(headerCommand);
 
     Command http2Command = new("http2");
-    http2Command.Handler = CommandHandler.Create<IHost>(async (host) =>
+    http2Command.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSamples>();
         await service.UseHttp2();
     });
     rootCommand.AddCommand(http2Command);
 
     Command messageHandlerCommand = new("messagehandler");
-    messageHandlerCommand.Handler = CommandHandler.Create<IHost>(async (host) =>
+    messageHandlerCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<HttpClientSampleWithMessageHandler>();
         for (int i = 0; i < 10; i++)
         {
             await service.UseMessageHandlerAsync();
         }
-
     });
     rootCommand.AddCommand(messageHandlerCommand);
 
     Command namedClientCommand = new("named");
-    namedClientCommand.Handler = CommandHandler.Create<IHost>(async host =>
+    namedClientCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<NamedClientSample>();
         await service.RunAsync();
     });
     rootCommand.AddCommand(namedClientCommand);
 
     Command pollyCommand = new("retry");
-    pollyCommand.Handler = CommandHandler.Create<IHost>(async host =>
+    pollyCommand.SetHandler<IHost>(async host =>
     {
         var service = host.Services.GetRequiredService<FaultHandlingSample>();
         await service.RunAsync();
diff --git a/2_Libs/Networking/HttpClientSample/appsettings.json b/2_Libs/Networking/HttpClientSample/appsettings.json
@@ -1,7 +1,7 @@
 {
   "HttpClient": {
-    "Url": "https://localhost:5021",
-    "InvalidUrl": "https://localhost1:5021"
+    "Url": "https://localhost:5001",
+    "InvalidUrl": "https://localhost1:5001"
   },
   "RateLimit": {
     "LimitCalls": 5
diff --git a/2_Libs/Networking/Utilities/Program.cs b/2_Libs/Networking/Utilities/Program.cs
@@ -12,26 +12,28 @@ await BuildCommandLine()
 CommandLineBuilder BuildCommandLine()
 {
     RootCommand rootCommand = new("Utilities");
+    Option<string> uriOption = new("--uri")
+    {
+        IsRequired = true
+    };
     Command uriCommand = new("uri", "Show the parts of the URI, e.g. www.wrox.com")
     {
-        new Option<string>("--uri")
-        {
-            IsRequired = true
-        }
+        uriOption
     };
-    uriCommand.Handler = CommandHandler.Create<string>(UriSample);
-    Command ipCommand = new("ip", "Show the part of the IP address, e.g. ipaddress 234.56.78.9")
+    uriCommand.SetHandler<string>(UriSample, uriOption);
+
+    Option<string> ipOption = new("--ip")
     {
-        new Option<string>("--ip")
-        {
-            IsRequired = true
-        }
+        IsRequired = true
     };
-    ipCommand.Handler = CommandHandler.Create<string>(ip => IPAddressSample(ip));
-    Command buildUriCommand = new("builduri", "Build an URI using the UriBuilder")
+    Command ipCommand = new("ip", "Show the part of the IP address, e.g. ipaddress 234.56.78.9")
     {
-        Handler = CommandHandler.Create(BuildUri)
+        ipOption
     };
+    ipCommand.SetHandler<string>(ip => IPAddressSample(ip), ipOption);
+
+    Command buildUriCommand = new("builduri", "Build an URI using the UriBuilder");
+    buildUriCommand.SetHandler(BuildUri);
 
     rootCommand.AddCommand(uriCommand);
     rootCommand.AddCommand(ipCommand);
diff --git a/2_Libs/Networking/Utilities/Utilities.csproj b/2_Libs/Networking/Utilities/Utilities.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.21617.1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,13 @@ public static void Register(RootCommand rootCommand, string commandText, string`
`15`	`15`
`16`	`16`	`foreach (var method in methods)`
`17`	`17`	`{`
`18`		`- command.AddCommand(new(method.Name.ToLower())`
	`18`	`+ Command featureCommand = new(method.Name.ToLower());`
	`19`	`+ featureCommand.SetHandler(() =>`
`19`	`20`	`{`
`20`		`- Handler = CommandHandler.Create(() =>`
`21`		`- {`
`22`		`- MethodInfo m = method;`
`23`		`- m.Invoke(null, null);`
`24`		`- })`
	`21`	`+ MethodInfo m = method;`
	`22`	`+ m.Invoke(null, null);`
`25`	`23`	`});`
	`24`	`+ command.AddCommand(featureCommand);`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`rootCommand.AddCommand(command);`