Custom TC configs: add build parameter. Linked Metalama 2026.0 to PostSharp 2025.1.

Author: gfraiteur

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/PowershellAdditionalCiBuildConfiguration.cs

@@ -39,7 +39,8 @@ internal override TeamCityBuildConfiguration TeamCityBuildConfiguration( Product
                     $"Execute {this.Script}",
                     this.Script,
                     this.Arguments,
-                    product.DockerSpec )
+                    product.DockerSpec,
+                    true )
             ],
             IsSshAgentRequired = productProperties.IsRepoRemoteSsh,
             SourceDependencies = this.SourceDependenciesRequirements switch

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/BuildSteps/EngineeringCommandBuildStep.cs

@@ -9,8 +9,6 @@ namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity.BuildS
 
 internal class EngineeringCommandBuildStep : PowerShellBuildStep
 {
-    private static string GetCustomArgumentsParameterName( string id ) => $"{id}.Arguments";
-
     private static string GetTimeoutParameterName( string id ) => $"{id}.Timeout";
 
     public EngineeringCommandBuildStep(
@@ -24,19 +22,10 @@ public EngineeringCommandBuildStep(
         id,
         name,
         "Build.ps1",
-        GetScriptArguments( id, command, arguments, areCustomArgumentsAllowed, timeout ),
-        dockerSpec )
+        GetScriptArguments( id, command, arguments, timeout ),
+        dockerSpec,
+        areCustomArgumentsAllowed )
     {
-        if ( areCustomArgumentsAllowed )
-        {
-            this.AddParameter(
-                new TextBuildConfigurationParameter(
-                    GetCustomArgumentsParameterName( id ),
-                    $"{this.ScriptPath} Arguments",
-                    $"Arguments to append to the '{name}' build step.",
-                    allowEmpty: true ) );
-        }
-
         if ( timeout != null )
         {
             this.AddParameter(
@@ -50,10 +39,9 @@ private static string GetScriptArguments(
         string id,
         string command,
         string? arguments,
-        bool areCustomArgumentsAllowed,
         TimeSpan? timeout )
     {
-        var args = $"{command}{(arguments == null ? "" : $" {arguments}")}{(!areCustomArgumentsAllowed ? "" : $" %{GetCustomArgumentsParameterName( id )}%")}";
+        var args = $"{command}{(arguments == null ? "" : $" {arguments}")}";
 
         if ( timeout != null )
         {

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/BuildSteps/PowerShellBuildStep.cs

@@ -1,5 +1,6 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
+using PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity.Arguments;
 using PostSharp.Engineering.BuildTools.Docker;
 using System.IO;
 
@@ -17,23 +18,43 @@ internal class PowerShellBuildStep : BuildStep
 
     public string? WorkingDirectory { get; init; }
 
-    public PowerShellBuildStep( string id, string name, string scriptPath, string scriptArguments, DockerSpec? dockerSpec ) : base( dockerSpec )
+    public PowerShellBuildStep(
+        string id,
+        string name,
+        string scriptPath,
+        string scriptArguments,
+        DockerSpec? dockerSpec,
+        bool areCustomArgumentsAllowed = false ) : base( dockerSpec )
     {
         this.Id = id;
         this.Name = name;
 
+        var buildParameterValue = areCustomArgumentsAllowed ? $"%{GetCustomArgumentsParameterName( id )}%" : "";
+
         if ( dockerSpec == null )
         {
             this.ScriptPath = scriptPath;
-            this.ScriptArguments = scriptArguments;
+            this.ScriptArguments = $"{scriptArguments} {buildParameterValue}";
         }
         else
         {
             this.ScriptPath = "DockerBuild.ps1";
-            this.ScriptArguments = $"-Script {scriptPath} -ImageName {dockerSpec.ImageName} -NoBuildImage {scriptArguments}";
+            this.ScriptArguments = $"-Script {scriptPath} -ImageName {dockerSpec.ImageName} -NoBuildImage {scriptArguments} {buildParameterValue}";
+        }
+
+        if ( areCustomArgumentsAllowed )
+        {
+            this.AddParameter(
+                new TextBuildConfigurationParameter(
+                    GetCustomArgumentsParameterName( id ),
+                    $"{this.ScriptPath} Arguments",
+                    $"Arguments to append to the '{name}' build step.",
+                    allowEmpty: true ) );
         }
     }
 
+    private static string GetCustomArgumentsParameterName( string id ) => $"{id}.Arguments";
+
     public override string GenerateTeamCityCode()
     {
         return $@"        powerShell {{

src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs

@@ -53,7 +53,7 @@ public MetalamaDependencyDefinition(
                     isVersioned ) { }
         }
 
-        public static ProductFamily Family { get; } = new( _projectName, "2026.0", DevelopmentDependencies.Family, PostSharpDependencies.V2026_0.Family )
+        public static ProductFamily Family { get; } = new( _projectName, "2026.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
         {
             UpstreamProductFamily = V2025_2.Family