Merge branch 'main' of https://github.com/KathleenDollard/command-line-api

Author: KathleenDollard

System.CommandLine.sln

@@ -23,10 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Build.targets = src\Directory.Build.targets
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine", "src\System.CommandLine\System.CommandLine.csproj", "{0BE8E56E-7580-4526-BE24-D304E1779724}"
 EndProject

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23316.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23371.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>3e92e7cead1e08476973f637007bb22cde7843ca</Sha>
+      <Sha>c418ea641dfded915409e09387985fba7bccc781</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>

eng/Versions.props

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <!-- Package versions -->
   <PropertyGroup>
-    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23316.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23371.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
     <MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
     <MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
   </PropertyGroup>

src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt

@@ -184,26 +184,26 @@ System.CommandLine.Help
   public class HelpBuilder
     .ctor(System.Int32 maxWidth = 2147483647)
     public System.Int32 MaxWidth { get; }
-    public System.Void CustomizeLayout(System.Func<HelpContext,System.Collections.Generic.IEnumerable<System.Action<HelpContext>>> getLayout)
+    public System.Void CustomizeLayout(System.Func<HelpContext,System.Collections.Generic.IEnumerable<System.Func<HelpContext,System.Boolean>>> getLayout)
     public System.Void CustomizeSymbol(System.CommandLine.CliSymbol symbol, System.Func<HelpContext,System.String> firstColumnText = null, System.Func<HelpContext,System.String> secondColumnText = null, System.Func<HelpContext,System.String> defaultValue = null)
     public System.Void CustomizeSymbol(System.CommandLine.CliSymbol symbol, System.String firstColumnText = null, System.String secondColumnText = null, System.String defaultValue = null)
     public TwoColumnHelpRow GetTwoColumnRow(System.CommandLine.CliSymbol symbol, HelpContext context)
     public System.Void Write(HelpContext context)
     public System.Void Write(System.CommandLine.CliCommand command, System.IO.TextWriter writer)
     public System.Void WriteColumns(System.Collections.Generic.IReadOnlyList<TwoColumnHelpRow> items, HelpContext context)
    static class Default
-    public static System.Action<HelpContext> AdditionalArgumentsSection()
-    public static System.Action<HelpContext> CommandArgumentsSection()
-    public static System.Action<HelpContext> CommandUsageSection()
+    public static System.Func<HelpContext,System.Boolean> AdditionalArgumentsSection()
+    public static System.Func<HelpContext,System.Boolean> CommandArgumentsSection()
+    public static System.Func<HelpContext,System.Boolean> CommandUsageSection()
     public static System.String GetArgumentDefaultValue(System.CommandLine.CliArgument argument)
     public static System.String GetArgumentDescription(System.CommandLine.CliArgument argument)
     public static System.String GetArgumentUsageLabel(System.CommandLine.CliArgument argument)
     public static System.String GetCommandUsageLabel(System.CommandLine.CliCommand symbol)
-    public static System.Collections.Generic.IEnumerable<System.Action<HelpContext>> GetLayout()
+    public static System.Collections.Generic.IEnumerable<System.Func<HelpContext,System.Boolean>> GetLayout()
     public static System.String GetOptionUsageLabel(System.CommandLine.CliOption symbol)
-    public static System.Action<HelpContext> OptionsSection()
-    public static System.Action<HelpContext> SubcommandsSection()
-    public static System.Action<HelpContext> SynopsisSection()
+    public static System.Func<HelpContext,System.Boolean> OptionsSection()
+    public static System.Func<HelpContext,System.Boolean> SubcommandsSection()
+    public static System.Func<HelpContext,System.Boolean> SynopsisSection()
   public class HelpContext
     .ctor(HelpBuilder helpBuilder, System.CommandLine.CliCommand command, System.IO.TextWriter output, System.CommandLine.ParseResult parseResult = null)
     public System.CommandLine.CliCommand Command { get; }

src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs

@@ -2,7 +2,6 @@
 using System.CommandLine.Invocation;
 using FluentAssertions;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 
 using Xunit;

src/System.CommandLine.Tests/Help/Approvals/HelpBuilderTests.Help_layout_has_not_changed.approved.txt

@@ -22,5 +22,3 @@ Options:
                                                                                              multi-line
                                                                                              description
 
-
-