CLT-33159 - Fixing enum value case sensitivity (commandlineparser#198) and help text formatting (commandlineparser#236) bugs.

-----
1. Added ignoreValueCase param to methods in InstanceChooser.cs.  Passed this arg through call stack.
2. Modified Parser.cs to use settings.CaseInsensitiveEnumValues.
3. Added NewLine before UsageHeadingText in HelpText.cs.
4. Commented-out Trim method call in HelpText.cs.

Author: DwayneNickels-tyler

src/CommandLine/CommandLine.nuspec

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>commandlineparser</id>
+    <version>2.2.1</version>
+    <title>bug fix version of commandlineparser</title>
+    <authors>
+    </authors>
+    <owners>
+    </owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Temporary bug fix fork of commandlineparser.</description>
+    <releaseNotes>Fixed enum case sensitivity bug (#198) and help text formatting bug (#236).</releaseNotes>
+    <copyright>
+    </copyright>
+    <tags>commandlineparser</tags>
+  </metadata>
+</package>

src/CommandLine/Core/InstanceChooser.cs

@@ -17,6 +17,7 @@ public static ParserResult<object> Choose(
             IEnumerable<Type> types,
             IEnumerable<string> arguments,
             StringComparer nameComparer,
+            bool ignoreValueCase,
             CultureInfo parsingCulture,
             IEnumerable<ErrorType> nonFatalErrors)
         {
@@ -36,7 +37,7 @@ public static ParserResult<object> Choose(
                             arguments.Skip(1).FirstOrDefault() ?? string.Empty, nameComparer))
                     : preprocCompare("version")
                         ? MakeNotParsed(types, new VersionRequestedError())
-                        : MatchVerb(tokenizer, verbs, arguments, nameComparer, parsingCulture, nonFatalErrors);
+                        : MatchVerb(tokenizer, verbs, arguments, nameComparer, ignoreValueCase, parsingCulture, nonFatalErrors);
             };
 
             return arguments.Any()
@@ -49,6 +50,7 @@ private static ParserResult<object> MatchVerb(
             IEnumerable<Tuple<Verb, Type>> verbs,
             IEnumerable<string> arguments,
             StringComparer nameComparer,
+            bool ignoreValueCase,
             CultureInfo parsingCulture,
             IEnumerable<ErrorType> nonFatalErrors)
         {
@@ -60,7 +62,7 @@ private static ParserResult<object> MatchVerb(
                     tokenizer,
                     arguments.Skip(1),
                     nameComparer,
-                    false,
+                    ignoreValueCase,
                     parsingCulture,
                     nonFatalErrors)
                 : MakeNotParsed(verbs.Select(v => v.Item2), new BadVerbSelectedError(arguments.First()));

src/CommandLine/Parser.cs

@@ -156,6 +156,7 @@ public ParserResult<object> ParseArguments(IEnumerable<string> args, params Type
                     types,
                     args,
                     settings.NameComparer,
+                    settings.CaseInsensitiveEnumValues,
                     settings.ParsingCulture,
                     HandleUnknownArguments(settings.IgnoreUnknownArguments)),
                 settings);

src/CommandLine/Publish-NuGet.ps1

@@ -0,0 +1,54 @@
+$projectName = "CommandLine"
+
+if (!(Test-Path (".\" + $projectName + ".nuspec")))
+{
+    Write-Host "Nuspec file not found." -foregroundcolor "red"
+    Write-Host ("Please run 'nuget spec " + $projectName + ".csproj' to generate nuspec file.") -foregroundcolor "yellow"
+    Exit
+}
+
+[xml]$xml = Get-Content (".\" + $projectName + ".nuspec")
+
+$version = $xml.package.metadata.version
+$releaseNotes = $xml.package.metadata.releaseNotes
+$id = $xml.package.metadata.id
+
+Write-Host ("Current package version: " + $version) -foregroundcolor "green"
+$newVersion = Read-Host "What is the new package version? "
+
+if ([string]::IsNullOrEmpty($newVersion))
+{
+    $newVersion = $version
+}
+
+Write-Host ("Current package release notes: " + $releaseNotes) -foregroundcolor "green"
+$newReleaseNotes = Read-Host "What are the new release notes? "
+
+if ([string]::IsNullOrEmpty($newReleaseNotes))
+{
+    $newReleaseNotes = $releaseNotes
+}
+
+$xml.package.metadata.version = [string]$newVersion
+$xml.package.metadata.releaseNotes = [string]$newReleaseNotes
+
+$saveDir = Resolve-Path(".\" + $projectName + ".nuspec")
+$xml.Save($saveDir)
+
+Write-Host ("Nuspec file updated.") -foregroundcolor "green"
+Write-Host ("Remember to check-in new version of nuspec file to source control.") -foregroundcolor "yellow"
+
+Write-Host ("Building project in release mode") -foregroundcolor "green"
+&"C:/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe" $projectName.csproj /p:Configuration=Release
+
+Write-Host ("Creating new NuGet package.") -foregroundcolor "green"
+nuget pack $projectName.csproj -Prop Configuration=Release
+
+$nuGetPkgName = ($projectName + "." + $newVersion + ".nupkg")
+
+$nugetUrl = Read-Host "What is the NuGet server URL? "
+$nugetKey = Read-Host "What is the NuGet server key? "
+
+Write-Host ("Pushing new NuGet package to NuGet server") -foregroundcolor "green"
+nuget push $nuGetPkgName -Source $nugetUrl $nugetKey
+

src/CommandLine/Text/HelpText.cs

@@ -247,7 +247,7 @@ public static HelpText AutoBuild<T>(
 
             if (usageAttr.IsJust() || usageLines.IsJust())
             {
-                var heading = auto.SentenceBuilder.UsageHeadingText();
+                var heading = string.Concat(Environment.NewLine, auto.SentenceBuilder.UsageHeadingText());
                 if (heading.Length > 0)
                     auto.AddPreOptionsLine(heading);
             }
@@ -636,7 +636,7 @@ internal static void AddLine(StringBuilder builder, string value, int maximumLen
                 throw new ArgumentOutOfRangeException(nameof(value));
             }
 
-            value = value.Trim();
+            //value = value.Trim();
 
             builder.AppendWhen(builder.Length > 0, Environment.NewLine);
             do

src/SharedAssemblyInfo.cs

@@ -8,6 +8,6 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // versions are replaced during CI build
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
-[assembly: AssemblyInformationalVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
+[assembly: AssemblyInformationalVersion("2.2.1.0")]

tests/CommandLine.Tests/Unit/Core/InstanceChooserTests.cs

@@ -22,6 +22,7 @@ private static ParserResult<object> InvokeChoose(
                 types,
                 arguments,
                 StringComparer.Ordinal,
+                false,
                 CultureInfo.InvariantCulture,
                 Enumerable.Empty<ErrorType>());
         }