Fixing the build. Enabling upstream/dowmstream merges.

Author: gfraiteur

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

@@ -50,18 +50,12 @@ public MetalamaDependencyDefinition(
                         isVersioned,
                         pullRequestRequiresStatusCheck: pullRequestRequiresStatusCheck,
                         vcsRootProjectId: vcsRootProjectId ),
-                    isVersioned )
-            { }
+                    isVersioned ) { }
         }
 
         public static ProductFamily Family { get; } = new( _projectName, "2025.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_0_GitHub.Family )
         {
-            DockerBaseImage = DockerImages.WindowsServerCore,
-            UpstreamProductFamily = V2024_2.Family,
-
-            // Downstream merge is explicitly disabled for because of repo merge.
-            // TODO: Implement SuppressDownstream for DependencyDefinition.
-            // DownstreamProductFamily = V2025_1.Family
+            DockerBaseImage = DockerImages.WindowsServerCore, DownstreamProductFamily = V2025_1.Family
         };
 
         public static DependencyDefinition MetalamaBackstage { get; } =
@@ -107,7 +101,8 @@ public MetalamaDependencyDefinition(
                 isVersioned: false,
                 pullRequestRequiresStatusCheck: false )
             {
-                GenerateSnapshotDependency = false,
+                GenerateSnapshotDependency = false
+
                 // SuppressDownstream = true
             };
 
@@ -118,7 +113,8 @@ public MetalamaDependencyDefinition(
                 MetalamaGitHubOrganization.PostSharp,
                 customRepositoryName: "Metalama.Framework" )
             {
-                GenerateSnapshotDependency = false,
+                GenerateSnapshotDependency = false
+
                 // SuppressDownstream = true
             };
 
@@ -141,19 +137,13 @@ public MetalamaDependencyDefinition(
             new MetalamaDependencyDefinition(
                 "Metalama.Samples",
                 VcsProvider.GitHub,
-                MetalamaGitHubOrganization.Metalama )
-            {
-                CodeStyle = "Metalama.Samples"
-            };
+                MetalamaGitHubOrganization.Metalama ) { CodeStyle = "Metalama.Samples" };
 
         public static DependencyDefinition TimelessDotNetEngineer { get; } =
             new MetalamaDependencyDefinition(
                 "TimelessDotNetEngineer",
                 VcsProvider.GitHub,
-                MetalamaGitHubOrganization.PostSharp )
-            {
-                CodeStyle = "Metalama.Samples"
-            };
+                MetalamaGitHubOrganization.PostSharp ) { CodeStyle = "Metalama.Samples" };
 
         public static DependencyDefinition MetalamaMigration { get; } =
             new MetalamaDependencyDefinition(

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

@@ -56,16 +56,12 @@ public MetalamaDependencyDefinition(
 
         public static ProductFamily Family { get; } = new( _projectName, "2025.1", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1_GitHub.Family )
         {
-            DockerBaseImage = DockerImages.WindowsServerCore,
-
-            // Upstream is explicitly disabled for because of repo merge.
-            // TODO: Implement SuppressUpstream for DependencyDefinition.
-            // UpstreamProductFamily = V2025_0.Family,
+            DockerBaseImage = DockerImages.WindowsServerCore, UpstreamProductFamily = V2025_0.Family
 
             // DownstreamProductFamily = V2025_2.Family
         };
 
-        public static DependencyDefinition Consolidated { get; } = 
+        public static DependencyDefinition Consolidated { get; } =
             new MetalamaDependencyDefinition(
                 ProductFamily.ConsolidatedProjectName,
                 VcsProvider.AzureDevOps,
@@ -75,17 +71,17 @@ public MetalamaDependencyDefinition(
 
         // The release build is intentionally used for the debug configuration because we want dependencies to consume the release
         // build, for performance reasons. The debug build will be used only locally, and for this we don't need a configuration here.
-        public static DependencyDefinition MetalamaCompiler { get; } = 
+        public static DependencyDefinition MetalamaCompiler { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Compiler",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama )
             {
-                EngineeringDirectory = "eng-Metalama", 
+                EngineeringDirectory = "eng-Metalama",
                 PrivateArtifactsDirectory = Path.Combine( "artifacts", "packages", "$(MSSBuildConfiguration)", "Shipping" )
             };
 
-        public static DependencyDefinition Metalama { get; } = 
+        public static DependencyDefinition Metalama { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama",
                 VcsProvider.GitHub,
@@ -103,44 +99,38 @@ public MetalamaDependencyDefinition(
                 // SuppressUpstream = true
             };
 
-        public static DependencyDefinition MetalamaVsx { get; } = 
-            new MetalamaDependencyDefinition( 
-                "Metalama.Vsx", 
+        public static DependencyDefinition MetalamaVsx { get; } =
+            new MetalamaDependencyDefinition(
+                "Metalama.Vsx",
                 VcsProvider.AzureDevOps,
                 null );
 
         public static DependencyDefinition MetalamaSamples { get; } =
-            new MetalamaDependencyDefinition( 
-                "Metalama.Samples", 
+            new MetalamaDependencyDefinition(
+                "Metalama.Samples",
                 VcsProvider.GitHub,
-                MetalamaGitHubOrganization.Metalama ) 
-            { 
-                CodeStyle = "Metalama.Samples" 
-            };
+                MetalamaGitHubOrganization.Metalama ) { CodeStyle = "Metalama.Samples" };
 
         public static DependencyDefinition TimelessDotNetEngineer { get; } =
-            new MetalamaDependencyDefinition( 
-                "TimelessDotNetEngineer", 
+            new MetalamaDependencyDefinition(
+                "TimelessDotNetEngineer",
                 VcsProvider.GitHub,
-                MetalamaGitHubOrganization.PostSharp ) 
-            { 
-                CodeStyle = "Metalama.Samples" 
-            };
+                MetalamaGitHubOrganization.PostSharp ) { CodeStyle = "Metalama.Samples" };
 
-        public static DependencyDefinition MetalamaCommunity { get; } = 
-            new MetalamaDependencyDefinition( 
-                "Metalama.Community", 
+        public static DependencyDefinition MetalamaCommunity { get; } =
+            new MetalamaDependencyDefinition(
+                "Metalama.Community",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.PostSharp );
 
-        public static DependencyDefinition MetalamaDocumentation { get; } = 
+        public static DependencyDefinition MetalamaDocumentation { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Documentation",
                 VcsProvider.GitHub,
                 MetalamaGitHubOrganization.Metalama,
                 false );
 
-        public static DependencyDefinition NopCommerce { get; } = 
+        public static DependencyDefinition NopCommerce { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Tests.NopCommerce",
                 VcsProvider.GitHub,
@@ -150,16 +140,16 @@ public MetalamaDependencyDefinition(
                 vcsRootProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}",
                 customBranch: $"dev/{Family.Version}" );
 
-        public static DependencyDefinition CargoSupport { get; } = 
+        public static DependencyDefinition CargoSupport { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Tests.CargoSupport",
                 VcsProvider.AzureDevOps,
                 null,
                 false,
                 parentCiProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}_MetalamaTests",
                 vcsRootProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}" );
-        
-        public static DependencyDefinition DotNetSdkTests { get; } = 
+
+        public static DependencyDefinition DotNetSdkTests { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Tests.DotNetSdk",
                 VcsProvider.GitHub,
@@ -168,7 +158,7 @@ public MetalamaDependencyDefinition(
                 parentCiProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}_MetalamaTests",
                 vcsRootProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}" );
 
-        public static DependencyDefinition MetalamaPerformance { get; } = 
+        public static DependencyDefinition MetalamaPerformance { get; } =
             new MetalamaDependencyDefinition(
                 "Metalama.Performance",
                 VcsProvider.GitHub,

src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/TemplateDependencies.cs

@@ -27,7 +27,7 @@ public TemplateDependencyDefinition(
                 isVersioned ) { }
     }
 
-    public static ProductFamily Family { get; } = new( "Template", "2023.0", DevelopmentDependencies.Family, MetalamaDependencies.V2024_2.Family );
+    public static ProductFamily Family { get; } = new( "Template", "2023.0", DevelopmentDependencies.Family, MetalamaDependencies.V2025_1.Family );
 
     // This is only used from the project template.
     public static DependencyDefinition MyProduct { get; } =