Fixed DockerBuild.ps1 and TC generation.

gfraiteur · gfraiteur · commit c7a78f012dda · 2025-09-27T19:12:29.000+02:00
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/AzureDevOpsRepository.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/AzureDevOpsRepository.cs
@@ -52,7 +52,6 @@ public AzureDevOpsRepository(
         string organisation = "postsharp",
         string domain = "dev.azure.com",
         string? defaultBranchParameter = null )
-        : base( defaultBranchParameter )
     {
         this.Name = name;
         this.Domain = domain;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GitHubRepository.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GitHubRepository.cs
@@ -35,7 +35,6 @@ public class GitHubRepository : VcsRepository
     public override string TokenEnvironmentVariableName => EnvironmentVariableNames.GitHubToken;
 
     public GitHubRepository( string name, string owner, string? defaultBranchParameter = null )
-        : base( defaultBranchParameter )
     {
         this.Name = name;
         this.Owner = owner;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/PowershellAdditionalCiBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/PowershellAdditionalCiBuildConfiguration.cs
@@ -1,4 +1,6 @@
-﻿using JetBrains.Annotations;
+﻿// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using JetBrains.Annotations;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity.BuildSteps;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity.Generation;
@@ -26,8 +28,7 @@ internal override TeamCityBuildConfiguration TeamCityBuildConfiguration( Product
             this.Id,
             this.Name,
             this.Branch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             product.ResolvedBuildAgentRequirements )
         {
             BuildSteps =
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/ProductProperties.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/ProductProperties.cs
@@ -17,11 +17,9 @@ internal class ProductProperties
 
     public string DefaultBranch => this.Product.DependencyDefinition.Branch;
 
-    public string DefaultBranchParameter => this.Product.DependencyDefinition.VcsRepository.DefaultBranchParameter;
-
     public bool IsRepoRemoteSsh => this.Product.DependencyDefinition.VcsRepository.IsSshAgentRequired;
 
-    public string VcsRootId => TeamCityHelper.GetVcsRootId( this.Product.DependencyDefinition );
+    public string VcsId => TeamCityHelper.GetVcsId( this.Product.DependencyDefinition );
 
     public string PublicArtifactsDirectory { get; }
 
@@ -42,9 +40,10 @@ public ProductProperties( Product product )
         this.TestResultsDirectory = product.TestResultsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
         this.LogsDirectory = product.LogsDirectory.Replace( "\\", "/", StringComparison.Ordinal );
         this.DumpsDirectory = product.DumpDirectory.Replace( "\\", "/", StringComparison.Ordinal );
-        
+
         this.SourceDependencies = product.SourceDependencies.Select( d => new TeamCitySourceDependency(
                                                                          d.CiConfiguration.ProjectId.ToString(),
+                                                                         TeamCityHelper.GetVcsId( d ),
                                                                          true,
                                                                          $"+:. => {product.SourceDependenciesDirectory}/{d.Name}" ) )
             .ToArray();
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs
@@ -188,8 +188,7 @@ private static TeamCityBuildConfiguration CreateDeployConfiguration(
             name: (isStandalone ? "Standalone " : "") + (configurationProperties.BuildConfigurationInfo.TeamCityDeploymentName
                                                          ?? $"Deploy [{configurationProperties.Configuration}]"),
             productProperties.DefaultBranch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             buildAgentRequirements: product.ResolvedBuildAgentRequirements )
         {
             BuildSteps = [step],
@@ -213,8 +212,7 @@ private static TeamCityBuildConfiguration CreateDownstreamMergeConfiguration( Pr
             "DownstreamMerge",
             "Downstream Merge",
             productProperties.DefaultBranch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             product.ResolvedBuildAgentRequirements )
         {
             BuildSteps =
@@ -241,8 +239,7 @@ private static TeamCityBuildConfiguration CreateBumpConfiguration( ProductProper
             objectName: "VersionBump",
             name: $"Version Bump",
             productProperties.DefaultBranch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             buildAgentRequirements: productProperties.Product.ResolvedBuildAgentRequirements )
         {
             BuildSteps =
@@ -279,8 +276,7 @@ private static TeamCityBuildConfiguration CreateSwapConfiguration(
             objectName: $"{configurationProperties.Configuration}Swap",
             name: configurationProperties.BuildConfigurationInfo.TeamCitySwapName ?? $"Swap [{configurationProperties.Configuration}]",
             productProperties.DeploymentBranch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             buildAgentRequirements: productProperties.Product.ResolvedBuildAgentRequirements )
         {
             BuildSteps =
@@ -357,8 +353,7 @@ private static TeamCityBuildConfiguration CreateBuildConfiguration(
             $"{configurationProperties.Configuration}Build",
             configurationProperties.BuildConfigurationInfo.TeamCityBuildName ?? $"Build [{configurationProperties.Configuration}]",
             productProperties.DefaultBranch,
-            productProperties.DefaultBranchParameter,
-            productProperties.VcsRootId,
+            productProperties.VcsId,
             product.ResolvedBuildAgentRequirements )
         {
             BuildSteps = teamCityBuildSteps.ToArray(),
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs
@@ -6,6 +6,7 @@
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.Triggers;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
@@ -19,9 +20,7 @@ internal class TeamCityBuildConfiguration
 
         public string DefaultBranch { get; }
 
-        public string DefaultBranchParameter { get; }
-
-        public string VcsRootId { get; }
+        public string VcsId { get; }
 
         public BuildAgentRequirements? BuildAgentRequirements { get; }
 
@@ -51,15 +50,13 @@ public TeamCityBuildConfiguration(
             string objectName,
             string name,
             string defaultBranch,
-            string defaultBranchParameter,
-            string vcsRootId,
+            string vcsId,
             BuildAgentRequirements? buildAgentRequirements = null )
         {
             this.ObjectName = objectName;
             this.Name = name;
             this.DefaultBranch = defaultBranch;
-            this.DefaultBranchParameter = defaultBranchParameter;
-            this.VcsRootId = vcsRootId;
+            this.VcsId = vcsId;
             this.BuildAgentRequirements = buildAgentRequirements;
         }
 
@@ -119,13 +116,6 @@ void AddBuildStep( BuildStep newStep )
 
             buildParameters.AddRange( allBuildSteps.SelectMany( s => s.BuildConfigurationParameters ) );
 
-            buildParameters.Add(
-                new TextBuildConfigurationParameter(
-                    this.DefaultBranchParameter,
-                    "Default Branch",
-                    "The default branch of this build configuration.",
-                    this.DefaultBranch ) );
-
             if ( this.Parameters != null )
             {
                 buildParameters.AddRange( this.Parameters );
@@ -145,7 +135,7 @@ void AddBuildStep( BuildStep newStep )
             if ( this.IsDefaultVcsRootUsed )
             {
                 // We set the VCS root explicitly for consolidated as well builds to enable the DefaultBranch paramater.
-                writer.WriteLine( @$"        root(AbsoluteId(""{this.VcsRootId}""))" );
+                writer.WriteLine( @$"        root(AbsoluteId(""{this.VcsId}""))" );
 
                 if ( allBuildSteps.Count == 0 )
                 {
@@ -160,7 +150,7 @@ void AddBuildStep( BuildStep newStep )
             {
                 foreach ( var sourceDependency in this.SourceDependencies! )
                 {
-                    var objectName = sourceDependency.IsAbsoluteId ? @$"AbsoluteId(""{sourceDependency.ObjectId}"")" : sourceDependency.ObjectId;
+                    var objectName = sourceDependency.IsAbsoluteId ? @$"AbsoluteId(""{sourceDependency.VcsId}"")" : sourceDependency.VcsId;
 
                     writer.WriteLine( $@"        root({objectName}, ""{sourceDependency.ArtifactRules}"")" );
                 }
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCitySourceDependency.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCitySourceDependency.cs
@@ -2,4 +2,4 @@
 
 namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity;
 
-internal record TeamCitySourceDependency( string ObjectId, bool IsAbsoluteId, string ArtifactRules );
+internal record TeamCitySourceDependency( string ObjectId, string VcsId, bool IsAbsoluteId, string ArtifactRules );
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/VcsRepository.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/VcsRepository.cs
@@ -13,20 +13,8 @@ namespace PostSharp.Engineering.BuildTools.ContinuousIntegration;
 [PublicAPI]
 public abstract class VcsRepository
 {
-    public const string DefaultDefaultBranchParameter = "DefaultBranch";
-
-    protected VcsRepository( string? defaultBranchParameter )
-    {
-        this.DefaultBranchParameter = defaultBranchParameter ?? DefaultDefaultBranchParameter;
-    }
-
     public abstract string Name { get; }
 
-    /// <summary>
-    /// Parameter name used to specify the default branch in TeamCity build configurations.
-    /// </summary>
-    public string DefaultBranchParameter { get; }
-
     public abstract VcsProvider Provider { get; }
 
     public abstract string SshUrl { get; }
diff --git a/src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1 b/src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1
@@ -13,7 +13,7 @@ param(
     [string]$BuildAgentPath = 'C:\BuildAgent',
     [switch]$LoadEnvFromKeyVault, # Forces loading environment variables form the key vault.
     [switch]$StartVsmon, # Enable the remote debugger.
-    [switch]$Script = 'Build.ps1', # The build script to be executed inside Docker.
+    [string]$Script = 'Build.ps1', # The build script to be executed inside Docker.
     [Parameter(ValueFromRemainingArguments)]
     [string[]]$BuildArgs   # Arguments passed to `Build.ps1` within the container.
 )
diff --git a/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs b/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs
@@ -100,14 +100,13 @@ BuildStep CreateBuildStep()
                 : null;
 
             var buildTriggers = this.BuildTriggers?[configuration];
-            var vcsRootId = TeamCityHelper.GetVcsRootId( context.Product.DependencyDefinition );
+            var vcsRootId = TeamCityHelper.GetVcsId( context.Product.DependencyDefinition );
             var buildAgentRequirements = context.Product.ResolvedBuildAgentRequirements;
 
             var teamCityUpdateSearchConfiguration = new TeamCityBuildConfiguration(
                 $"{configuration}UpdateSearch",
                 name,
                 context.Product.DependencyDefinition.PublishingBranch,
-                context.Product.DependencyDefinition.VcsRepository.DefaultBranchParameter,
                 vcsRootId,
                 buildAgentRequirements )
             {
@@ -122,7 +121,6 @@ BuildStep CreateBuildStep()
                     $"{configuration}UpdateSearchNoDependency",
                     $"Standalone {name}",
                     context.Product.DependencyDefinition.Branch,
-                    context.Product.DependencyDefinition.VcsRepository.DefaultBranchParameter,
                     vcsRootId,
                     buildAgentRequirements ) { BuildSteps = [CreateBuildStep()], IsDeployment = true };
 
diff --git a/src/PostSharp.Engineering.BuildTools/Tools/TeamCity/TeamCityHelper.cs b/src/PostSharp.Engineering.BuildTools/Tools/TeamCity/TeamCityHelper.cs
@@ -375,16 +375,16 @@ public static bool TryCreateProject( BuildContext context, string name, string i
         return TryCreateProject( tc, context, name, id, parentId, vcsRootId );
     }
 
-    public static string GetVcsRootId( DependencyDefinition dependencyDefinition, bool parameterizedDefaultBranch = true )
-        => GetVcsRootId( dependencyDefinition.VcsRepository, dependencyDefinition.CiConfiguration.VcsRootProjectId, parameterizedDefaultBranch );
+    public static string GetVcsId( DependencyDefinition dependencyDefinition )
+        => GetVcsId( dependencyDefinition.VcsRepository, dependencyDefinition.CiConfiguration.VcsRootProjectId );
 
-    private static string GetVcsRootId( VcsRepository repository, string? projectId, bool parameterizedDefaultBranch )
-        => $"{projectId ?? "Root"}_{repository.Name.Replace( ".", "", StringComparison.Ordinal )}{(parameterizedDefaultBranch ? "" : "_Default")}";
+    private static string GetVcsId( VcsRepository repository, string? projectId )
+        => $"{projectId ?? "Root"}_{repository.Name.Replace( ".", "", StringComparison.Ordinal )}";
 
-    private static bool TryCreateVcsRoot( TeamCityClient tc, BuildContext context, string? projectId, bool parameterizedDefaultBranch, out string vcsRootId )
+    private static bool TryCreateVcsRoot( TeamCityClient tc, BuildContext context, string? projectId, out string vcsRootId )
     {
         var repository = context.Product.DependencyDefinition.VcsRepository;
-        vcsRootId = GetVcsRootId( repository, projectId, parameterizedDefaultBranch );
+        vcsRootId = GetVcsId( repository, projectId );
 
         context.Console.WriteMessage( $"Retrieving VCS roots of '{projectId}' project." );
 
@@ -400,9 +400,9 @@ private static bool TryCreateVcsRoot( TeamCityClient tc, BuildContext context, s
             return true;
         }
 
-        var vcsRootName = parameterizedDefaultBranch ? repository.Name : $"{repository.Name}_Default";
+        var vcsRootName = repository.Name;
         var familyVersion = context.Product.ProductFamily.Version;
-        var defaultBranch = parameterizedDefaultBranch ? $"%{repository.DefaultBranchParameter}%" : context.Product.DependencyDefinition.Branch;
+        var defaultBranch = context.Product.DependencyDefinition.Branch;
 
         var branchSpecification = new List<string>
         {
@@ -438,12 +438,12 @@ public static bool TryCreateVcsRoot( BuildContext context, string? projectId )
             return false;
         }
 
-        if ( !TryCreateVcsRoot( tc, context, projectId, true, out _ ) )
+        if ( !TryCreateVcsRoot( tc, context, projectId, out _ ) )
         {
             return false;
         }
 
-        if ( !TryCreateVcsRoot( tc, context, projectId, false, out _ ) )
+        if ( !TryCreateVcsRoot( tc, context, projectId, out _ ) )
         {
             return false;
         }
@@ -463,12 +463,12 @@ public static bool TryCreateProject( BuildContext context )
         var vcsRootProjectId = context.Product.DependencyDefinition.CiConfiguration.VcsRootProjectId;
         var projectName = context.Product.DependencyDefinition.Name;
 
-        if ( !TryCreateVcsRoot( tc, context, vcsRootProjectId, true, out _ ) )
+        if ( !TryCreateVcsRoot( tc, context, vcsRootProjectId, out _ ) )
         {
             return false;
         }
 
-        if ( !TryCreateVcsRoot( tc, context, vcsRootProjectId, false, out var vcsRootId ) )
+        if ( !TryCreateVcsRoot( tc, context, vcsRootProjectId, out var vcsRootId ) )
         {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public AzureDevOpsRepository(`
`52`	`52`	`string organisation = "postsharp",`
`53`	`53`	`string domain = "dev.azure.com",`
`54`	`54`	`string? defaultBranchParameter = null )`
`55`		`- : base( defaultBranchParameter )`
`56`	`55`	`{`
`57`	`56`	`this.Name = name;`
`58`	`57`	`this.Domain = domain;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public class GitHubRepository : VcsRepository`
`35`	`35`	`public override string TokenEnvironmentVariableName => EnvironmentVariableNames.GitHubToken;`
`36`	`36`
`37`	`37`	`public GitHubRepository( string name, string owner, string? defaultBranchParameter = null )`
`38`		`- : base( defaultBranchParameter )`
`39`	`38`	`{`
`40`	`39`	`this.Name = name;`
`41`	`40`	`this.Owner = owner;`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity;`
`4`	`4`
`5`		`-internal record TeamCitySourceDependency( string ObjectId, bool IsAbsoluteId, string ArtifactRules );`
	`5`	`+internal record TeamCitySourceDependency( string ObjectId, string VcsId, bool IsAbsoluteId, string ArtifactRules );`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ param(`
`13`	`13`	`[string]$BuildAgentPath = 'C:\BuildAgent',`
`14`	`14`	`[switch]$LoadEnvFromKeyVault, # Forces loading environment variables form the key vault.`
`15`	`15`	`[switch]$StartVsmon, # Enable the remote debugger.`
`16`		`- [switch]$Script = 'Build.ps1', # The build script to be executed inside Docker.`
	`16`	`+ [string]$Script = 'Build.ps1', # The build script to be executed inside Docker.`
`17`	`17`	`[Parameter(ValueFromRemainingArguments)]`
`18`	`18`	[string[]]$BuildArgs # Arguments passed to `Build.ps1` within the container.
`19`	`19`	`)`