Merge remote-tracking branch 'origin/develop/2023.2' into develop/2023.2

Author: gfraiteur

eng/MainVersion.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <MainVersion>2023.2.165</MainVersion>
+        <MainVersion>2023.2.167</MainVersion>
         <PackageVersionSuffix></PackageVersionSuffix>
     </PropertyGroup>
 </Project>

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCityHelper.cs

@@ -812,7 +812,7 @@ bool TryPopulateBuildConfigurations(
                     ];
 
                     var artifactRules = string.Join( "\\n", rules );
-
+                    
                     nuGetDependencies.Add(
                         new(
                             buildConfiguration.BuildConfigurationId,
@@ -998,7 +998,7 @@ bool TryPopulateBuildConfigurations(
         TeamCitySourceDependency CreateSourceDependency( string vcsProjectRootId, string projectName )
             => new( vcsProjectRootId, true, $"+:. => {context.Product.SourceDependenciesDirectory}/{projectName}" );
 
-        TeamCitySourceDependency CreateSourceDependencyFromDefintion( DependencyDefinition dependencyDefinition )
+        TeamCitySourceDependency CreateSourceDependencyFromDefinition( DependencyDefinition dependencyDefinition )
             => CreateSourceDependency( GetVcsRootId( dependencyDefinition ), dependencyDefinition.Name );
 
         foreach ( var buildConfiguration in buildConfigurationsByKind[publicBuildObjectName] )
@@ -1031,9 +1031,13 @@ TeamCitySourceDependency CreateSourceDependencyFromDefintion( DependencyDefiniti
                 new TeamCityEngineeringCommandBuildStep(
                     $"Bump{bumpedProjectId.Split( '_' ).Last()}",
                     $"Bump version of {bumpedProjectName}",
-                    "bump" ) { WorkingDirectory = $"source-dependencies/{bumpedProjectName}" } );
+                    "bump",
+                    areCustomArgumentsAllowed: true )
+                {
+                    WorkingDirectory = $"source-dependencies/{bumpedProjectName}"
+                } );
 
-            consolidatedVersionBumpSourceDependencies.Add( CreateSourceDependencyFromDefintion( dependencyDefinition ) );
+            consolidatedVersionBumpSourceDependencies.Add( CreateSourceDependencyFromDefinition( dependencyDefinition ) );
 
             if ( dependencyDefinition.VcsRepository.DefaultBranchParameter != VcsRepository.DefaultDefaultBranchParameter )
             {
@@ -1104,7 +1108,7 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
                     continue;
                 }
 
-                sourceDependencies.Add( CreateSourceDependencyFromDefintion( projectDependencyDefinition ) );
+                sourceDependencies.Add( CreateSourceDependencyFromDefinition( projectDependencyDefinition ) );
 
                 if ( projectDependencyDefinition.VcsRepository.DefaultBranchParameter != VcsRepository.DefaultDefaultBranchParameter )
                 {
@@ -1132,7 +1136,8 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
                         $"{objectName}_{projectRelativeId}",
                         $"{commandName} deployment of {project.Name}",
                         command,
-                        "--configuration Public --buildNumber %build.number% --buildType %system.teamcity.buildType.id% --use-local-dependencies" )
+                        "--configuration Public --buildNumber %build.number% --buildType %system.teamcity.buildType.id% --use-local-dependencies",
+                        areCustomArgumentsAllowed: true )
                     {
                         WorkingDirectory = $"source-dependencies/{project.Name}"
                     } );
@@ -1173,7 +1178,7 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
                 }
             }
 
-            sourceDependencies.Add( CreateSourceDependencyFromDefintion( context.Product.DependencyDefinition ) );
+            sourceDependencies.Add( CreateSourceDependencyFromDefinition( context.Product.DependencyDefinition ) );
 
             steps.Add(
                 new TeamCityEngineeringCommandBuildStep(
@@ -1234,13 +1239,16 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
         var publicNuGetDeploymentCiId = $"{consolidatedProjectIdPrefix}{MarkNuGetObjectId( publicDeploymentObjectName )}";
 
         var nuGetPublicDeploymentSteps = new TeamCityBuildStep[] { new TeamCityEngineeringPublishBuildStep( publicConfiguration ) };
-
+
+        // TODO: Only Public builds of dependencies that define version need to be included.
+        //       Here we include all Public builds which will cause download of all artifacts.
         var nuGetPublicDeploymentDependencies =
             nuGetPublicBuildDependencies
                 .Select(
                     d => new TeamCitySnapshotDependency(
                         d.ObjectId.Replace( $"_{publicBuildObjectName}", $"_{publicDeploymentObjectName}", StringComparison.Ordinal ),
-                        true ) )
+                        true ) )
+                .Concat( nuGetPublicBuildDependencies )
                 .Append( new( publicNuGetBuildCiId, true, nuGetBuildArtifactRules ) );
 
         nuGetConfigurations.Add(