Improve bump command and fix publisher error codes

- Update AutoUpdatedVersions.props even when version was already bumped
- Change SuccessCode.Fatal to SuccessCode.Error in publishers
- Rename RunClaude.g.ps1 to RunClaude.ps1

Author: gfraiteur

DockerBuild.ps1

@@ -559,13 +559,13 @@ if (-not $BuildImage)
         {
             # Non-interactive mode with prompt - no -it flags
             $dockerArgs = @()
-            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; ${copyClaudeJsonScript}cd '$SourceDirName'; & .\eng\RunClaude.g.ps1 -Prompt `"$ClaudePrompt`""
+            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; ${copyClaudeJsonScript}cd '$SourceDirName'; & .\eng\RunClaude.ps1 -Prompt `"$ClaudePrompt`""
         }
         else
         {
             # Interactive mode - requires TTY
             $dockerArgs = @("-it")
-            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; ${copyClaudeJsonScript}cd '$SourceDirName'; & .\eng\RunClaude.g.ps1"
+            $inlineScript = "${substCommandsInline}& c:\Init.g.ps1; ${copyClaudeJsonScript}cd '$SourceDirName'; & .\eng\RunClaude.ps1"
         }
 
         $dockerArgsAsString = $dockerArgs -join " "

eng/RunClaude.ps1

@@ -0,0 +1,30 @@
+# The original of this file is in the PostSharp.Engineering repo.
+# You can generate this file using `./Build.ps1 generate-scripts`.
+
+param(
+    [string]$Prompt
+)
+
+$ErrorActionPreference = "Stop"
+
+if ($env:RUNNING_IN_DOCKER -ne "true")
+{
+    Write-Error "This script must be run inside a Docker container. Set RUNNING_IN_DOCKER=true to override."
+    exit 1
+}
+
+Write-Host "Starting Claude CLI..." -ForegroundColor Green
+
+# Run Claude
+if ($Prompt)
+{
+    Write-Host "Running Claude with prompt: $Prompt" -ForegroundColor Cyan
+    claude --dangerously-skip-permissions -p $Prompt
+}
+else
+{
+    Write-Host "Running Claude in interactive mode" -ForegroundColor Cyan
+    claude --dangerously-skip-permissions
+}
+
+exit $LASTEXITCODE

src/PostSharp.Engineering.BuildTools/Build/Bumping/BumpCommand.cs

@@ -94,18 +94,44 @@ private static bool Execute( BuildContext context, BumpSettings settings )
             return false;
         }
 
+        // Doing a dry run of AutoUpdatedVersionsFile both gets the versions of all dependencies and gets the current version.
+        // Do not write the AutoUpdatedVersions.props file yet - we will do it after we set our own version.
+        if ( !AutoUpdatedVersionsFile.TryWrite( context, true, out var hasChangesInDependencies, out var hasChangesInAutoUpdatedVersionsFile, out _, out var currentVersion ) )
+        {
+            return false;
+        }
+
         if ( hasBumpSinceLastDeployment && !settings.OverridePreviousBump )
         {
             console.WriteWarning( "Version has already been bumped since the last deployment." );
 
-            return true;
-        }
+            // Even though the version has been bumped, we still need to verify that AutoUpdatedVersions.props is correct.
+            if ( hasChangesInAutoUpdatedVersionsFile )
+            {
+                console.WriteWarning( "AutoUpdatedVersions.props needs to be updated. Updating now." );
 
-        // Doing a dry run of AutoUpdatedVersionsFile both gets the versions of all dependencies and gets the current version.
-        // Do not write the AutoUpdatedVersions.props file yet - we will do it after we set our own version.
-        if ( !AutoUpdatedVersionsFile.TryWrite( context, true, out var hasChangesInDependencies, out _, out _, out var currentVersion ) )
-        {
-            return false;
+                if ( !AutoUpdatedVersionsFile.TryWrite( context, false, out _, out _, out _, out _ ) )
+                {
+                    return false;
+                }
+
+                // Commit the changes.
+                if ( !GitIntegrationHelper.TryCommitAutoUpdatedVersions( context ) )
+                {
+                    return false;
+                }
+
+                // If we are running in TeamCity, push.
+                if ( context.IsContinuousIntegrationBuild )
+                {
+                    if ( !GitHelper.TryPush( context ) )
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
         }
 
         if ( !hasChangesInDependencies && !hasChangesSinceLastDeployment )

src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs

@@ -119,6 +119,42 @@ public static bool TryCommitVersionBump( BuildContext context, Version? currentV
         return true;
     }
 
+    /// <summary>
+    /// Commits only the AutoUpdatedVersions.props file without bumping the main version.
+    /// Used when the version has already been bumped but AutoUpdatedVersions.props needs updating.
+    /// </summary>
+    public static bool TryCommitAutoUpdatedVersions( BuildContext context )
+    {
+        var product = context.Product;
+
+        // Adds updated AutoUpdatedVersions.props to Git staging area.
+        if ( !ToolInvocationHelper.InvokeTool(
+                context.Console,
+                "git",
+                $"add {product.AutoUpdatedVersionsFilePath}",
+                context.RepoDirectory ) )
+        {
+            return false;
+        }
+
+        // Gets the remote origin.
+        if ( !GitHelper.TryGetRemoteUrl( context, out var gitOrigin ) )
+        {
+            return false;
+        }
+
+        if ( !ToolInvocationHelper.InvokeTool(
+                context.Console,
+                "git",
+                "commit -m \"<<AUTO_UPDATED_VERSIONS>>\"",
+                context.RepoDirectory ) )
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     internal static bool TryAnalyzeGitHistory(
         BuildContext context,
         MainVersionFile mainVersionFile,

src/PostSharp.Engineering.BuildTools/Build/Publishing/GitRepoPublisher.cs

@@ -72,7 +72,7 @@ public override SuccessCode PublishFile(
             {
                 console.WriteError( "Failed to clone the repository." );
 
-                return SuccessCode.Fatal;
+                return SuccessCode.Error;
             }
 
             // Delete all files in the repo except .git directory.
@@ -113,7 +113,7 @@ public override SuccessCode PublishFile(
             {
                 console.WriteError( "Failed to get git status." );
 
-                return SuccessCode.Fatal;
+                return SuccessCode.Error;
             }
 
             var changes = statusOutput.Split( '\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries );
@@ -136,7 +136,7 @@ public override SuccessCode PublishFile(
             {
                 console.WriteError( "Failed to stage changes." );
 
-                return SuccessCode.Fatal;
+                return SuccessCode.Error;
             }
 
             // Commit the changes.
@@ -151,7 +151,7 @@ public override SuccessCode PublishFile(
             {
                 console.WriteError( "Failed to commit changes." );
 
-                return SuccessCode.Fatal;
+                return SuccessCode.Error;
             }
 
             // Push to remote (skip in dry mode).
@@ -172,7 +172,7 @@ public override SuccessCode PublishFile(
                 {
                     console.WriteError( "Failed to push changes to remote repository." );
 
-                    return SuccessCode.Fatal;
+                    return SuccessCode.Error;
                 }
 
                 console.WriteSuccess( $"Successfully published '{file}' to '{gitHubUrl}'." );
@@ -184,7 +184,7 @@ public override SuccessCode PublishFile(
         {
             console.WriteError( $"Error publishing to git repository: {e.Message}" );
 
-            return SuccessCode.Fatal;
+            return SuccessCode.Error;
         }
         finally
         {

src/PostSharp.Engineering.BuildTools/Build/Publishing/S3Publisher.cs

@@ -80,7 +80,7 @@ public override SuccessCode PublishFile(
                     {
                         context.Console.WriteError( "AmazonS3Client failed to publish the file." );
 
-                        return SuccessCode.Fatal;
+                        return SuccessCode.Error;
                     }
 
                     return SuccessCode.Success;
@@ -91,15 +91,15 @@ public override SuccessCode PublishFile(
                         "AWS S3 error encountered. Message:'{0}' when writing an object",
                         e.Message );
 
-                    return SuccessCode.Fatal;
+                    return SuccessCode.Error;
                 }
                 catch ( Exception e )
                 {
                     context.Console.WriteError(
                         "Unknown error encountered. Message:'{0}' when writing an object",
                         e.Message );
 
-                    return SuccessCode.Fatal;
+                    return SuccessCode.Error;
                 }
             }
         }

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GenerateScriptsCommand.cs

@@ -32,7 +32,7 @@ public static bool Execute( BuildContext context, CommonCommandSettings settings
         if ( product.UseDocker )
         {
             EmbeddedResourceHelper.ExtractScript( context, "DockerBuild.ps1", "" );
-            EmbeddedResourceHelper.ExtractScript( context, "RunClaude.g.ps1", "eng" );
+            EmbeddedResourceHelper.ExtractScript( context, "RunClaude.ps1", "eng" );
             var image = (ContainerRequirements) product.OverriddenBuildAgentRequirements!;
 
             if ( !image.WriteDockerfile( context ) )