Fixed issue in PublishCommand with non-Metalama products.

gfraiteur · gfraiteur · commit fa15c84ad931 · 2025-10-08T10:40:25.000+02:00
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs b/src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs
@@ -18,12 +18,12 @@ internal static class GitIntegrationHelper
 {
     public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings settings )
     {
-        if ( !AutoUpdatedVersionsFile.TryRead( context, out var releasedVersion, out _ ) )
+        if ( !VersionComponents.TryCompute( context, settings, out var version ) )
         {
             return false;
         }
 
-        var versionTag = $"release/{releasedVersion}";
+        var versionTag = $"release/{version.PackageVersion}";
 
         ToolInvocationHelper.InvokeTool(
             context.Console,
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Model/VersionComponents.cs b/src/PostSharp.Engineering.BuildTools/Build/Model/VersionComponents.cs
@@ -123,6 +123,28 @@ public static bool TryCompute(
         return TryCompute( context, configuration, mainVersionFile, inheritedMainVersion, versionSpec, settings.UserName, out version );
     }
 
+    public static bool TryCompute(
+        BuildContext context,
+        BuildSettings settings,
+        [NotNullWhen( true )] out VersionComponents? version )
+    {
+        if ( !MainVersionFile.TryRead( context, out var mainVersionFile ) )
+        {
+            version = null;
+
+            return false;
+        }
+
+        return TryCompute(
+            context,
+            settings.BuildConfiguration,
+            mainVersionFile,
+            null,
+            settings.GetVersionSpec( settings.BuildConfiguration ),
+            settings.UserName,
+            out version );
+    }
+
     public static bool TryCompute(
         BuildContext context,
         BuildConfiguration configuration,
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishCommand.cs b/src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishCommand.cs
@@ -129,8 +129,9 @@ private static bool Execute( BuildContext context, PublishSettings settings )
             return false;
         }
 
-        // For consolidated deployments, this is part of the post-deployment step.
-        if ( !product.ProductFamily.HasConsolidatedBuild && !settings.IsStandalone )
+        // Tag the commit in the release branch.
+        // For product families that have a consolidated product, this is not done, because this is part of the post-deployment step.
+        if ( product is { DependencyDefinition.IsVersioned: true, ProductFamily.HasConsolidatedProduct: false } && !settings.IsStandalone )
         {
             if ( !GitHelper.TryConfigureCredentials( context ) )
             {
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/Generation/TeamCitySettingsFile.cs
@@ -105,7 +105,7 @@ internal static bool TryWrite( BuildContext context, CommonCommandSettings setti
         }
 
         // Only versioned products that don't have consolidated version bump can be bumped individually.
-        if ( !product.ProductFamily.HasConsolidatedBuild && product.DependencyDefinition.IsVersioned )
+        if ( !product.ProductFamily.HasConsolidatedProduct && product.DependencyDefinition.IsVersioned )
         {
             var dependencies = product.ParametrizedDependencies;
 
@@ -212,7 +212,10 @@ private static TeamCityBuildConfiguration CreateDownstreamMergeConfiguration( Pr
                 product.ParametrizedDependencies
                     .Where( d => d.Definition.GenerateSnapshotDependency && d.Definition.ProductFamily.DownstreamProductFamily != null )
                     .Select( d => d.Definition )
-                    .Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.DownstreamMergeBuildType, true, FailureAction: FailureAction.AddProblem ) ) );
+                    .Select( d => new TeamCitySnapshotDependency(
+                                 d.CiConfiguration.DownstreamMergeBuildType,
+                                 true,
+                                 FailureAction: FailureAction.AddProblem ) ) );
 
         var downstreamMergeConfiguration = new TeamCityBuildConfiguration(
             "DownstreamMerge",
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_0.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_0.cs
@@ -54,6 +54,8 @@ public MetalamaDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2025.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_0.Family )
         {
+            ConsolidatedProjectName = "Metalama.Consolidated"
+
             // Downstream merge to 2025.1 is disabled because of repo merge.
             // UpstreamProductFamily = V2024_2.Family,
             // DownstreamProductFamily = V2025_1.Family
@@ -67,7 +69,7 @@ public MetalamaDependencyDefinition(
 
         public static DependencyDefinition Consolidated { get; } =
             new MetalamaDependencyDefinition(
-                ProductFamily.ConsolidatedProjectName,
+                "Metalama.Consolidated",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama,
                 false,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1.cs
@@ -56,7 +56,7 @@ public MetalamaDependencyDefinition(
         public static ProductFamily Family { get; } = new( _projectName, "2025.1", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
         {
             // UpstreamProductFamily = V2025_0.Family,
-            DownstreamProductFamily = V2025_2.Family
+            DownstreamProductFamily = V2025_2.Family, ConsolidatedProjectName = "Metalama.Consolidated"
         };
 
         // The release build is intentionally used for the debug configuration because we want dependencies to consume the release
@@ -213,7 +213,7 @@ public MetalamaDependencyDefinition(
 
         public static DependencyDefinition Consolidated { get; } =
             new MetalamaDependencyDefinition(
-                ProductFamily.ConsolidatedProjectName,
+                "Metalama.Consolidated",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama,
                 false,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_2.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_2.cs
@@ -55,7 +55,7 @@ public MetalamaDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2025.2", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
         {
-            UpstreamProductFamily = V2025_1.Family, DownstreamProductFamily = V2026_0.Family
+            UpstreamProductFamily = V2025_1.Family, DownstreamProductFamily = V2026_0.Family, ConsolidatedProjectName = "Metalama.Consolidated"
         };
 
         // The release build is intentionally used for the debug configuration because we want dependencies to consume the release
@@ -211,7 +211,7 @@ public MetalamaDependencyDefinition(
 
         public static DependencyDefinition Consolidated { get; } =
             new MetalamaDependencyDefinition(
-                ProductFamily.ConsolidatedProjectName,
+                "Metalama.Consolidated",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama,
                 false,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs
@@ -55,7 +55,7 @@ public MetalamaDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2026.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
         {
-            UpstreamProductFamily = V2025_2.Family
+            UpstreamProductFamily = V2025_2.Family, ConsolidatedProjectName = "Metalama.Consolidated"
 
             // DownstreamProductFamily = V2026_1.Family
         };
@@ -213,7 +213,7 @@ public MetalamaDependencyDefinition(
 
         public static DependencyDefinition Consolidated { get; } =
             new MetalamaDependencyDefinition(
-                ProductFamily.ConsolidatedProjectName,
+                "Metalama.Consolidated",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama,
                 false,
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_1.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_1.cs
@@ -36,10 +36,13 @@ public TestDependencyDefinition(
         }
 
         public static ProductFamily Family { get; } =
-            new( _projectName, "2023.1", DevelopmentDependencies.Family ) { DownstreamProductFamily = V2023_2.Family };
+            new( _projectName, "2023.1", DevelopmentDependencies.Family )
+            {
+                DownstreamProductFamily = V2023_2.Family, ConsolidatedProjectName = "Consolidated"
+            };
 
         public static DependencyDefinition Consolidated { get; } = new TestDependencyDefinition(
-            ProductFamily.ConsolidatedProjectName,
+            "Consolidated",
             VcsProvider.AzureDevOps,
             false,
             customRepositoryName: "PostSharp.Engineering.Test.Consolidated" );
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_2.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_2.cs
@@ -37,11 +37,11 @@ public TestDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2023.2", DevelopmentDependencies.Family )
         {
-            UpstreamProductFamily = V2023_1.Family, DownstreamProductFamily = V2023_3.Family
+            UpstreamProductFamily = V2023_1.Family, DownstreamProductFamily = V2023_3.Family, ConsolidatedProjectName = "Consolidated"
         };
 
         public static DependencyDefinition Consolidated { get; } = new TestDependencyDefinition(
-            ProductFamily.ConsolidatedProjectName,
+            "Consolidated",
             VcsProvider.AzureDevOps,
             false,
             customRepositoryName: "PostSharp.Engineering.Test.Consolidated" );
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_3.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TestDependencies.V2023_3.cs
@@ -37,13 +37,13 @@ public TestDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2023.3", DevelopmentDependencies.Family )
         {
-            UpstreamProductFamily = V2023_2.Family
+            UpstreamProductFamily = V2023_2.Family, ConsolidatedProjectName = "Consolidated"
 
             // DownstreamProductFamily = V2023_4.Family
         };
 
         public static DependencyDefinition Consolidated { get; } = new TestDependencyDefinition(
-            ProductFamily.ConsolidatedProjectName,
+            "Consolidated",
             VcsProvider.AzureDevOps,
             false,
             customRepositoryName: "PostSharp.Engineering.Test.Consolidated" );
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Model/DependencyDefinition.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Model/DependencyDefinition.cs
@@ -49,7 +49,7 @@ public class DependencyDefinition
 
         // If the product is part of a consolidated build, pre-publishing takes place and the deployment is preformed from the release branch.
         // If not, the deployment is performed from the default branch, and post-publishing is is part of the publishing step.
-        public string PublishingBranch => this.ReleaseBranch != null && this.ProductFamily.HasConsolidatedBuild ? this.ReleaseBranch : this.Branch;
+        public string PublishingBranch => this.ReleaseBranch != null && this.ProductFamily.HasConsolidatedProduct ? this.ReleaseBranch : this.Branch;
 
         public CiProjectConfiguration CiConfiguration { get; }
 
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Model/ProductFamily.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Model/ProductFamily.cs
@@ -19,7 +19,7 @@ public class ProductFamily
     private readonly Dictionary<string, DependencyDefinition> _dependencyDefinitionsByCiId = new();
     private readonly ProductFamily[] _relativeFamilies;
 
-    public static string ConsolidatedProjectName { get; } = "Metalama.Consolidated";
+    public string? ConsolidatedProjectName { get; init; }
 
     public string Name { get; set; }
 
@@ -33,7 +33,7 @@ public class ProductFamily
 
     public BuildAgentRequirements DefaultBuildAgentRequirements { get; init; } = BuildAgentRequirements.Default;
 
-    public bool HasConsolidatedBuild => this.TryGetDependencyDefinition( ConsolidatedProjectName, out _ );
+    public bool HasConsolidatedProduct => this.ConsolidatedProjectName != null;
 
     public ProductFamily( string name, string version, params ProductFamily[] relativeFamilies )
     {

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ internal static class GitIntegrationHelper`
`18`	`18`	`{`
`19`	`19`	`public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings settings )`
`20`	`20`	`{`
`21`		`- if ( !AutoUpdatedVersionsFile.TryRead( context, out var releasedVersion, out _ ) )`
	`21`	`+ if ( !VersionComponents.TryCompute( context, settings, out var version ) )`
`22`	`22`	`{`
`23`	`23`	`return false;`
`24`	`24`	`}`
`25`	`25`
`26`		`- var versionTag = $"release/{releasedVersion}";`
	`26`	`+ var versionTag = $"release/{version.PackageVersion}";`
`27`	`27`
`28`	`28`	`ToolInvocationHelper.InvokeTool(`
`29`	`29`	`context.Console,`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,9 @@ private static bool Execute( BuildContext context, PublishSettings settings )`
`129`	`129`	`return false;`
`130`	`130`	`}`
`131`	`131`
`132`		`- // For consolidated deployments, this is part of the post-deployment step.`
`133`		`- if ( !product.ProductFamily.HasConsolidatedBuild && !settings.IsStandalone )`
	`132`	`+ // Tag the commit in the release branch.`
	`133`	`+ // For product families that have a consolidated product, this is not done, because this is part of the post-deployment step.`
	`134`	`+ if ( product is { DependencyDefinition.IsVersioned: true, ProductFamily.HasConsolidatedProduct: false } && !settings.IsStandalone )`
`134`	`135`	`{`
`135`	`136`	`if ( !GitHelper.TryConfigureCredentials( context ) )`
`136`	`137`	`{`