Nits in previous commit. Fix issue when downloading artifacts when build configuration of dependency does not match the one of the main product.

Author: gfraiteur

src/PostSharp.Engineering.BuildTools/Build/Files/TeamCitySettingsFile.cs

@@ -396,7 +396,6 @@ private static TeamCityBuildConfiguration CreateBuildConfiguration(
         TeamCitySourceDependency[] sourceDependencies,
         bool isRepoRemoteSsh )
     {
-        List<TeamCityBuildConfiguration> teamCityBuildConfigurations;
         var teamCityBuildSteps = new List<TeamCityBuildStep>();
 
         if ( !product.UseDocker )

src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs

@@ -250,8 +250,8 @@ public DockerSpec? DockerSpec
         /// MSBuild cannot be used.
         /// </summary>
         public Version? MSBuildVersion { get; init; }
-        
-        public string[] ExternalTeamCityBuildTypes { get; init; }
+
+        public string[] ExternalTeamCityBuildTypes { get; init; } = [];
 
         public bool TryGetDependency( string name, [NotNullWhen( true )] out ParametrizedDependency? dependency )
         {

src/PostSharp.Engineering.BuildTools/Dependencies/DependenciesHelper.cs

@@ -421,7 +421,7 @@ private static bool DownloadArtifacts(
                 return false;
             }
 
-            var artifactsDirectory = dependency.Dependency.GetPrivateArtifactsDirectory( configuration );
+            var artifactsDirectory = dependency.Dependency.GetPrivateArtifactsDirectory( buildId.BuildConfiguration );
 
             if ( !DownloadDependency(
                     context,
@@ -506,7 +506,7 @@ private static bool DownloadBuild(
         string dependencyName,
         string ciBuildTypeId,
         int buildNumber,
-        string artifactsDirectory,
+        string artifactsPath,
         out string restoreDirectory )
     {
         restoreDirectory = Path.Combine(
@@ -528,7 +528,7 @@ private static bool DownloadBuild(
             Directory.CreateDirectory( restoreDirectory );
             context.Console.WriteMessage( $"Downloading {dependencyName} build #{buildNumber} of {ciBuildTypeId}" );
 
-            if ( !teamCity.TryDownloadArtifacts( context.Console, ciBuildTypeId, buildNumber, artifactsDirectory, restoreDirectory ) )
+            if ( !teamCity.TryDownloadArtifacts( context.Console, ciBuildTypeId, buildNumber, artifactsPath, restoreDirectory ) )
             {
                 return false;
             }
@@ -550,9 +550,9 @@ private static bool DownloadDependency(
         string dependencyName,
         string ciBuildTypeId,
         int buildNumber,
-        string artifactsDirectory )
+        string artifactsPath )
     {
-        if ( !DownloadBuild( context, teamCity, dependencyName, ciBuildTypeId, buildNumber, artifactsDirectory, out var restoreDirectory ) )
+        if ( !DownloadBuild( context, teamCity, dependencyName, ciBuildTypeId, buildNumber, artifactsPath, out var restoreDirectory ) )
         {
             return false;
         }

src/PostSharp.Engineering.BuildTools/Dependencies/Model/CiBuildId.cs

@@ -1,8 +1,34 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
+using PostSharp.Engineering.BuildTools.Build;
+using System;
+using System.Text.RegularExpressions;
+
 namespace PostSharp.Engineering.BuildTools.Dependencies.Model;
 
 public record CiBuildId( int BuildNumber, string? BuildTypeId ) : ICiBuildSpec
 {
+    // This is a hack to guess the build configuration from the BuildTypeId because this information is not available
+    // when we restore artifacts.
+    public BuildConfiguration BuildConfiguration
+    {
+        get
+        {
+            if ( this.BuildTypeId == null )
+            {
+                throw new InvalidOperationException( "BuildTypeId is null." );
+            }
+
+            var match = Regex.Match( this.BuildTypeId, "_([A-Z][a-z]+)Build$" );
+
+            if ( !match.Success )
+            {
+                throw new InvalidOperationException( $"BuildTypeId '{this.BuildTypeId}' cannot be parsed." );
+            }
+
+            return Enum.Parse<BuildConfiguration>( match.Groups[1].Value );
+        }
+    }
+
     public override string ToString() => $"{this.BuildTypeId}:{this.BuildNumber}";
 }

src/PostSharp.Engineering.BuildTools/Tools/TeamCity/TeamCityClient.cs

@@ -128,7 +128,7 @@ public bool TryGetBranchFromBuildNumber( ConsoleHelper console, CiBuildId buildI
             }
         }
 
-        public bool TryDownloadArtifacts( ConsoleHelper console, string buildTypeId, int buildNumber, string artifactsPath, string artifactsDirectory )
+        public bool TryDownloadArtifacts( ConsoleHelper console, string buildTypeId, int buildNumber, string artifactsPath, string restoreDirectory )
         {
             IEnumerable<DownloadedFile> GetFiles( string urlOrPath, string targetDirectory )
             {
@@ -178,7 +178,7 @@ IEnumerable<DownloadedFile> GetFiles( string urlOrPath, string targetDirectory )
             var basePath =
                 $"/app/rest/builds/defaultFilter:false,buildType:{buildTypeId},number:{buildNumber}/artifacts/children/{artifactsPath.Replace( '\\', '/' )}";
 
-            var baseTargetDirectory = Path.Combine( artifactsDirectory, artifactsPath.Replace( '/', Path.DirectorySeparatorChar ) );
+            var baseTargetDirectory = Path.Combine( restoreDirectory, artifactsPath.Replace( '/', Path.DirectorySeparatorChar ) );
 
             var files = GetFiles( basePath, baseTargetDirectory );