From 528801e14ab2be8c4825b4e72b1f2c1195a7ec3e Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard@gibson.cx>
Date: Tue, 19 Nov 2024 22:10:16 +0000
Subject: [PATCH] Fixes release script with tagging

---
 .github/workflows/release.yml                |  3 +++
 Consolo/Writers/ProgramClassFileGenerator.cs | 20 +++++++++-----------
 release.ps1                                  | 20 ++++++++++++--------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7117a18..a0f5760 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,9 @@ jobs:
     
     steps:
       - uses: actions/checkout@v4
+        with:    
+          fetch-depth: 0
+          filter: tree:0
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
diff --git a/Consolo/Writers/ProgramClassFileGenerator.cs b/Consolo/Writers/ProgramClassFileGenerator.cs
index 93c4203..161cbf7 100644
--- a/Consolo/Writers/ProgramClassFileGenerator.cs
+++ b/Consolo/Writers/ProgramClassFileGenerator.cs
@@ -518,6 +518,7 @@ private void WriteHelp(
                     .Append(("-?, -h, --help", "Show help and usage information", None));
 
                 var longestParameter = helpNames.MaxOrDefault(x => x.Item1.Length);
+                var leadingWhitespace = new string(' ', longestParameter);
 
                 foreach (var (helpName, description, allowedValues) in helpNames)
                 {
@@ -531,17 +532,14 @@ private void WriteHelp(
                     {
                         var valueName = allowedValue.HelpName;
                         var valueDescription = allowedValue.Description;
-                        
-                        if (valueDescription.HasValue)
-                        {
-                            _codeBuilder.AppendLine(
-                                $"Console.WriteLine(\"      {new string(' ', longestParameter)}- {valueName}: {valueDescription}\");");
-                        }
-                        else
-                        {
-                            _codeBuilder.AppendLine(
-                            $"Console.WriteLine(\"      {new string(' ', longestParameter)}- {valueName}\");");
-                        }
+
+                        var valueHelpText =
+                            valueDescription.HasValue
+                                ? $"{valueName}: {valueDescription}"
+                                : $"{valueName}";
+
+                        _codeBuilder.AppendLine(
+                            $"Console.WriteLine(\"{leadingWhitespace}      - {valueHelpText}\");");
                     }
 
                     _codeBuilder.AppendLine("Console.ForegroundColor = consoleColor;");
diff --git a/release.ps1 b/release.ps1
index 45df105..0a648a3 100644
--- a/release.ps1
+++ b/release.ps1
@@ -4,8 +4,6 @@ dotnet build
 
 dotnet test
 
-dotnet pack Consolo -o .
-
 $projectXml = [xml](Get-Content .\Consolo\Consolo.csproj)
 
 $version = $projectXml.Project.PropertyGroup[1].version
@@ -19,6 +17,10 @@ Write-Host "Version: $version"
 
 $tagName = "release/$version"
 
+write-host "Debug: git tags"
+
+git tag -l
+
 $versionAlreadyTagged = git tag -l $tagName
 
 if ($versionAlreadyTagged) {
@@ -26,11 +28,7 @@ if ($versionAlreadyTagged) {
     exit 0
 }
 
-Write-Host "Creating tag $tagName"
-
-git tag $tagName
-
-git push origin tag $tagName
+dotnet pack Consolo -o .
 
 $nupkg = get-item Consolo.$version.nupkg
 
@@ -44,4 +42,10 @@ write-host $nupkg
 dotnet nuget push `
     $nupkg `
     --api-key $env:NUGET_API_KEY_CONSOLO_CI `
-    --source https://api.nuget.org/v3/index.json
\ No newline at end of file
+    --source https://api.nuget.org/v3/index.json
+
+Write-Host "Creating tag $tagName"
+
+git tag $tagName
+
+git push origin tag $tagName
\ No newline at end of file