Improved downstream merge generation.

gfraiteur · gfraiteur · commit cd8f5b4a6791 · 2025-09-27T22:02:03.000+02:00
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs b/src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs
@@ -277,6 +277,8 @@ public bool TryGetDependencyDefinition( string name, [NotNullWhen( true )] out D
 
         public ProductExtension[] Extensions { get; init; } = [];
 
+        public bool BuildRequiresSourceDependencies { get; init; } = true;
+        
         internal string GetPrivateArtifactsAbsoluteDirectory( BuildContext context, BuildConfiguration configuration )
             => Path.Combine(
                 context.RepoDirectory,
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/AdditionalCiBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/AdditionalCiBuildConfiguration.cs
@@ -13,8 +13,8 @@ public abstract class AdditionalCiBuildConfiguration
 
     public string Branch { get; }
 
-    public bool AddSourceDependencies { get; init; }
-
+    public bool RequiresSourceDependencies { get; init; }
+    
     protected AdditionalCiBuildConfiguration( string id, string name, string branch )
     {
         this.Id = id;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/PowershellAdditionalCiBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/PowershellAdditionalCiBuildConfiguration.cs
@@ -41,7 +41,7 @@ internal override TeamCityBuildConfiguration TeamCityBuildConfiguration( Product
                     product.DockerSpec )
             ],
             IsSshAgentRequired = productProperties.IsRepoRemoteSsh,
-            SourceDependencies = this.AddSourceDependencies ? productProperties.SourceDependencies : []
+            SourceDependencies = this.RequiresSourceDependencies ? productProperties.SourceDependencies : []
         };
 
         return downstreamMergeConfiguration;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/ConfigurationProperties.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/ConfigurationProperties.cs
@@ -15,7 +15,7 @@ internal class ConfigurationProperties
 
     public BuildConfiguration Configuration { get; }
 
-    public TeamCitySnapshotDependency[] BuildDependencies { get; }
+    public TeamCitySnapshotDependency[] SnapshotDependenciesForBuildConfiguration { get; }
 
     public string PrivateArtifactsDirectory { get; }
 
@@ -43,6 +43,6 @@ public ConfigurationProperties( Product product, BuildConfiguration configuratio
         var sourceSnapshotDependencies = product.SourceDependencies.Where( d => d.GenerateSnapshotDependency )
             .Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.BuildTypes[configuration], true ) );
 
-        this.BuildDependencies = snapshotDependencies.Concat( sourceSnapshotDependencies ).OrderBy( d => d.ObjectId ).ToArray();
+        this.SnapshotDependenciesForBuildConfiguration = snapshotDependencies.Concat( sourceSnapshotDependencies ).OrderBy( d => d.ObjectId ).ToArray();
     }
 }
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs
@@ -3,7 +3,6 @@
 using PostSharp.Engineering.BuildTools.Build;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity.BuildSteps;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.Triggers;
-using PostSharp.Engineering.BuildTools.Dependencies.Model;
 using PostSharp.Engineering.BuildTools.Utilities;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -169,7 +168,7 @@ private static TeamCityBuildConfiguration CreateDeployConfiguration(
                 product.DockerSpec,
                 configurationProperties.BuildConfigurationInfo.DeploymentTimeout ?? product.DeploymentTimeout );
 
-        var snapshotDependencies = configurationProperties.BuildDependencies.Where( d => d.ArtifactRules != null )
+        var snapshotDependencies = configurationProperties.SnapshotDependenciesForBuildConfiguration.Where( d => d.ArtifactRules != null )
             .Concat( [new TeamCitySnapshotDependency( teamCityBuildConfiguration.ObjectName, false, deployedArtifactRules )] );
 
         if ( !isStandalone )
@@ -204,9 +203,16 @@ private static TeamCityBuildConfiguration CreateDownstreamMergeConfiguration( Pr
     {
         var product = productProperties.Product;
 
-        var snapshotDependencies = product.Configurations[BuildConfiguration.Debug].ExportsToTeamCityBuild
+        IEnumerable<TeamCitySnapshotDependency> snapshotDependencies = product.Configurations[BuildConfiguration.Debug].ExportsToTeamCityBuild
             ? new[] { new TeamCitySnapshotDependency( "DebugBuild", false ) }
-            : null;
+            : [];
+
+        snapshotDependencies =
+            snapshotDependencies.Concat(
+                product.ParametrizedDependencies
+                    .Where( d => d.Definition.GenerateSnapshotDependency )
+                    .Select( d => d.Definition )
+                    .Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.DownstreamMergeBuildType, true, FailureAction: FailureAction.AddProblem ) ) );
 
         var downstreamMergeConfiguration = new TeamCityBuildConfiguration(
             "DownstreamMerge",
@@ -225,7 +231,7 @@ private static TeamCityBuildConfiguration CreateDownstreamMergeConfiguration( Pr
                     dockerSpec: product.DockerSpec,
                     timeout: product.DownstreamMergeTimeout )
             ],
-            SnapshotDependencies = snapshotDependencies,
+            SnapshotDependencies = snapshotDependencies.ToArray(),
             BuildTriggers = [new SourceBuildTrigger()],
             IsSshAgentRequired = productProperties.IsRepoRemoteSsh
         };
@@ -360,8 +366,8 @@ private static TeamCityBuildConfiguration CreateBuildConfiguration(
             ArtifactRules = publishedArtifactRules,
             AdditionalArtifactRules = additionalArtifactRules.ToArray(),
             BuildTriggers = configurationProperties.BuildConfigurationInfo.BuildTriggers,
-            SnapshotDependencies = configurationProperties.BuildDependencies,
-            SourceDependencies = productProperties.SourceDependencies,
+            SnapshotDependencies = configurationProperties.SnapshotDependenciesForBuildConfiguration,
+            SourceDependencies = product.BuildRequiresSourceDependencies ? productProperties.SourceDependencies : [],
             IsSshAgentRequired = requiresUpstreamCheck && productProperties.IsRepoRemoteSsh
         };
 
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs
@@ -251,10 +251,17 @@ void AddBuildStep( BuildStep newStep )
                 {
                     var objectName = dependency.IsAbsoluteId ? @$"AbsoluteId(""{dependency.ObjectId}"")" : dependency.ObjectId;
 
+                    var failureAction = dependency.FailureAction switch
+                    {
+                        FailureAction.FailToStart => "FAIL_TO_START",
+                        FailureAction.AddProblem => "ADD_PROBLEM",
+                        _ => throw new ArgumentOutOfRangeException()
+                    };
+
                     writer.WriteLine(
                         $@"        dependency({objectName}) {{
             snapshot {{
-                     onDependencyFailure = FailureAction.FAIL_TO_START
+                     onDependencyFailure = FailureAction.{failureAction}
             }}" );
 
                     if ( dependency.ArtifactRules != null )
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCitySnapshotDependency.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCitySnapshotDependency.cs
@@ -2,4 +2,10 @@
 
 namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.TeamCity;
 
-internal record TeamCitySnapshotDependency( string ObjectId, bool IsAbsoluteId, string? ArtifactRules = null );
+internal record TeamCitySnapshotDependency( string ObjectId, bool IsAbsoluteId, string? ArtifactRules = null, FailureAction FailureAction = FailureAction.FailToStart);
+
+internal enum FailureAction
+{
+    FailToStart,
+    AddProblem
+}
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1.cs
@@ -141,10 +141,11 @@ public MetalamaDependencyDefinition(
                 Dependencies =
                 [
                     DevelopmentDependencies.PostSharpEngineering, Metalama,
-                    PostSharpDependencies.V2025_1.PostSharp.ToDependency( new ConfigurationSpecific<BuildConfiguration>(
-                                                                              BuildConfiguration.Release,
-                                                                              BuildConfiguration.Release,
-                                                                              BuildConfiguration.Release ) )
+                    PostSharpDependencies.V2025_1.PostSharp.ToDependency(
+                        new ConfigurationSpecific<BuildConfiguration>(
+                            BuildConfiguration.Release,
+                            BuildConfiguration.Release,
+                            BuildConfiguration.Release ) )
                 ]
             };
 
@@ -221,7 +222,8 @@ public MetalamaDependencyDefinition(
                 Dependencies =
                 [
                     DevelopmentDependencies.PostSharpEngineering,
-                    MetalamaCompiler,
+                    MetalamaCompiler.ToDependency(
+                        new ConfigurationSpecific<BuildConfiguration>( BuildConfiguration.Release, BuildConfiguration.Release, BuildConfiguration.Public ) ),
                     Metalama,
                     MetalamaCommunity,
                     MetalamaPremium,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_2.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_2.cs
@@ -220,7 +220,9 @@ public MetalamaDependencyDefinition(
                 Dependencies =
                 [
                     DevelopmentDependencies.PostSharpEngineering,
-                    MetalamaCompiler,
+                    MetalamaCompiler.ToDependency(
+                        new ConfigurationSpecific<BuildConfiguration>( BuildConfiguration.Release, BuildConfiguration.Release, BuildConfiguration.Public ) ),
+
                     Metalama,
                     MetalamaCommunity,
                     MetalamaPremium,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs
@@ -222,7 +222,8 @@ public MetalamaDependencyDefinition(
                 Dependencies =
                 [
                     DevelopmentDependencies.PostSharpEngineering,
-                    MetalamaCompiler,
+                    MetalamaCompiler.ToDependency(
+                        new ConfigurationSpecific<BuildConfiguration>( BuildConfiguration.Release, BuildConfiguration.Release, BuildConfiguration.Public ) ),
                     Metalama,
                     MetalamaCommunity,
                     MetalamaPremium,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Model/CiProjectConfiguration.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Model/CiProjectConfiguration.cs
@@ -26,8 +26,10 @@ public class CiProjectConfiguration
 
     public string BaseUrl { get; }
 
+    public string DownstreamMergeBuildType => $"{this.ProjectId.Id}_DownstreamMerge";
+
     public CiProjectConfiguration(
-        TeamCityProjectId projectProjectId,
+        TeamCityProjectId projectId,
         ConfigurationSpecific<string> buildTypes,
         string? deploymentBuildType,
         string? versionBumpBuildType,
@@ -37,8 +39,8 @@ public CiProjectConfiguration(
         string? pullRequestStatusCheckBuildType = null,
         string? vcsRootProjectId = null )
     {
-        this.ProjectId = projectProjectId;
-        this.VcsRootProjectId = vcsRootProjectId ?? projectProjectId.ParentId;
+        this.ProjectId = projectId;
+        this.VcsRootProjectId = vcsRootProjectId ?? projectId.ParentId;
         this.BuildTypes = buildTypes;
         this.PullRequestStatusCheckBuildType = pullRequestRequiresStatusCheck ? pullRequestStatusCheckBuildType ?? $"{this.ProjectId}_DebugBuild" : null;
         this.DeploymentBuildType = deploymentBuildType;

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public abstract class AdditionalCiBuildConfiguration`
`13`	`13`
`14`	`14`	`public string Branch { get; }`
`15`	`15`
`16`		`- public bool AddSourceDependencies { get; init; }`
`17`		`-`
	`16`	`+ public bool RequiresSourceDependencies { get; init; }`
	`17`	`+`
`18`	`18`	`protected AdditionalCiBuildConfiguration( string id, string name, string branch )`
`19`	`19`	`{`
`20`	`20`	`this.Id = id;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ internal class ConfigurationProperties`
`15`	`15`
`16`	`16`	`public BuildConfiguration Configuration { get; }`
`17`	`17`
`18`		`- public TeamCitySnapshotDependency[] BuildDependencies { get; }`
	`18`	`+ public TeamCitySnapshotDependency[] SnapshotDependenciesForBuildConfiguration { get; }`
`19`	`19`
`20`	`20`	`public string PrivateArtifactsDirectory { get; }`
`21`	`21`
`@@ -43,6 +43,6 @@ public ConfigurationProperties( Product product, BuildConfiguration configuratio`
`43`	`43`	`var sourceSnapshotDependencies = product.SourceDependencies.Where( d => d.GenerateSnapshotDependency )`
`44`	`44`	`.Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.BuildTypes[configuration], true ) );`
`45`	`45`
`46`		`- this.BuildDependencies = snapshotDependencies.Concat( sourceSnapshotDependencies ).OrderBy( d => d.ObjectId ).ToArray();`
	`46`	`+ this.SnapshotDependenciesForBuildConfiguration = snapshotDependencies.Concat( sourceSnapshotDependencies ).OrderBy( d => d.ObjectId ).ToArray();`
`47`	`47`	`}`
`48`	`48`	`}`