Add NuGet config generation for TeamCity restored artifacts and PowerShell build step improvements.

- Refactor NuGet config generation using inheritance pattern (NuGetConfigGenerator base class with Standard, WSL, and RestoredArtifacts generators)
- Add nuget.restored.config generation for TeamCity artifact restoration scenario with relative paths and dependency filtering
- Move NuGet-related files to Build/Files/NuGet/ subdirectory
- Create PowerShellCommandBuildStep for executing commands directly
- Rename PowerShellBuildStep to PowerShellScriptBuildStep
- Enhance PowershellAdditionalCiBuildConfiguration to automatically copy nuget.restored.config when BuildSnapshotDependency is set

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: gfraiteur

src/PostSharp.Engineering.BuildTools/Build/BuildCommand.cs

@@ -1,10 +1,9 @@
 // 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.Files.NuGet;
 using PostSharp.Engineering.BuildTools.Build.Model;
-using PostSharp.Engineering.BuildTools.Dependencies.Model;
 using PostSharp.Engineering.BuildTools.Utilities;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
 
 namespace PostSharp.Engineering.BuildTools.Build.Files;
 

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

@@ -0,0 +1,60 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+namespace PostSharp.Engineering.BuildTools.Build.Files.NuGet;
+
+/// <summary>
+/// Writes <c>nuget.config</c>.
+/// </summary>
+internal static class NuGetConfigFile
+{
+    internal static bool TryWrite( BuildContext context, DependenciesConfigurationFile dependenciesConfigurationFile, BuildConfiguration configuration )
+    {
+        var product = context.Product;
+
+        if ( !product.GenerateNuGetConfig )
+        {
+            return true;
+        }
+
+        // Fetch to resolve the VersionFile properties.
+        if ( !dependenciesConfigurationFile.Fetch( context ) )
+        {
+            return false;
+        }
+
+        // Generate standard nuget.config
+        var standardGenerator = new StandardNuGetConfigGenerator();
+
+        if ( !standardGenerator.TryGenerate( context, dependenciesConfigurationFile, configuration ) )
+        {
+            return false;
+        }
+
+        // Generate WSL version if AddWslSupport is enabled
+        if ( product.AddWslSupport )
+        {
+            var wslGenerator = new WslNuGetConfigGenerator();
+
+            if ( !wslGenerator.TryGenerate( context, dependenciesConfigurationFile, configuration ) )
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Generates nuget.restored.config for TeamCity artifact restoration scenario.
+    /// This file uses relative paths and assumes dependencies are in dependencies/&lt;name&gt;/ directory.
+    /// </summary>
+    internal static bool TryWriteRestoredArtifacts(
+        BuildContext context,
+        DependenciesConfigurationFile dependenciesConfigurationFile,
+        BuildConfiguration configuration )
+    {
+        var generator = new RestoredArtifactsNuGetConfigGenerator();
+
+        return generator.TryGenerate( context, dependenciesConfigurationFile, configuration );
+    }
+}

src/PostSharp.Engineering.BuildTools/Build/Files/NuGet/NuGetConfigFile.cs

@@ -1,83 +1,47 @@
-// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+// 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.Dependencies.Model;
 using PostSharp.Engineering.BuildTools.Utilities;
 using System;
 using System.IO;
 using System.Xml.Linq;
 
-namespace PostSharp.Engineering.BuildTools.Build.Files;
+namespace PostSharp.Engineering.BuildTools.Build.Files.NuGet;
 
 /// <summary>
-/// Writes <c>nuget.config</c>.
+/// Abstract base class for generating nuget.config files with different path strategies.
 /// </summary>
-internal static class NuGetConfigFile
+internal abstract class NuGetConfigGenerator
 {
-    private static string ConvertToWslPath( string path )
-    {
-        // Convert Windows path to WSL: C:\path -> /mnt/c/path
-        if ( path is [_, ':', _, ..] && (path[2] == '\\' || path[2] == '/') )
-        {
-            var drive = char.ToLower( path[0], System.Globalization.CultureInfo.InvariantCulture );
-            var remainder = path.Substring( 2 ).Replace( "\\", "/", StringComparison.Ordinal );
-
-            return $"/mnt/{drive}{remainder}";
-        }
-
-        return path;
-    }
-
-    internal static bool TryWrite( BuildContext context, DependenciesConfigurationFile dependenciesConfigurationFile, BuildConfiguration configuration )
-    {
-        var product = context.Product;
-
-        if ( !product.GenerateNuGetConfig )
-        {
-            return true;
-        }
-
-        // Fetch to resolve the VersionFile properties.
-        if ( !dependenciesConfigurationFile.Fetch( context ) )
-        {
-            return false;
-        }
-
-        // Generate regular nuget.config
-        if ( !GenerateNuGetConfig( context, dependenciesConfigurationFile, configuration, "nuget.config", path => path ) )
-        {
-            return false;
-        }
-
-        // Generate WSL version if AddWslSupport is enabled
-        if ( product.AddWslSupport )
-        {
-            if ( !GenerateNuGetConfig( context, dependenciesConfigurationFile, configuration, "nuget.wsl.config", ConvertToWslPath ) )
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static bool GenerateNuGetConfig(
+    /// <summary>
+    /// Generates a nuget.config file.
+    /// </summary>
+    public bool TryGenerate(
         BuildContext context,
         DependenciesConfigurationFile dependenciesConfigurationFile,
-        BuildConfiguration configuration,
-        string targetFileName,
-        Func<string, string> pathTransform )
+        BuildConfiguration configuration )
     {
         var product = context.Product;
-        var baseFilePath = Path.Combine( context.RepoDirectory, "nuget.base.config" );
-        var targetFilePath = Path.Combine( context.RepoDirectory, targetFileName );
+        var targetFilePath = this.GetTargetFilePath( context, configuration );
 
         XDocument document;
         XElement rootElement;
 
-        if ( File.Exists( baseFilePath ) )
+        if ( this.ShouldLoadBaseConfig() )
         {
-            document = XDocument.Load( baseFilePath );
-            rootElement = document.Root!;
+            var baseFilePath = Path.Combine( context.RepoDirectory, "nuget.base.config" );
+
+            if ( File.Exists( baseFilePath ) )
+            {
+                document = XDocument.Load( baseFilePath );
+                rootElement = document.Root!;
+            }
+            else
+            {
+                document = new XDocument();
+                rootElement = new XElement( "configuration" );
+                document.Add( rootElement );
+            }
         }
         else
         {
@@ -116,8 +80,7 @@ private static bool GenerateNuGetConfig(
         }
 
         // Add the current artifact directory.
-        var artifactDirectory =
-            product.GetPrivateArtifactsAbsoluteDirectory( context, configuration );
+        var artifactDirectory = this.GetCurrentProductDirectory( context, configuration );
 
         AddDirectory( product.ProductName, artifactDirectory, product.DependencyDefinition.PackagePatterns );
 
@@ -139,15 +102,22 @@ private static bool GenerateNuGetConfig(
             }
 
             var dependencyDefinition = product.GetDependencyDefinition( dependencySource.Key );
-            var dependencyDirectory = Path.GetDirectoryName( dependencySource.Value.VersionFile )!;
 
-            if ( dependencySource.Value.SourceKind == DependencySourceKind.Local )
+            if ( !this.ShouldIncludeDependency( dependencyDefinition ) )
             {
-                dependencyDirectory = Path.Combine(
-                    dependencyDirectory,
-                    dependencyDefinition.GetPrivateArtifactsDirectory( configuration ) );
+                // Skip this dependency based on generator-specific logic
+                packageSourcesElement.Add( new XComment( $" {dependencySource.Key} excluded by generator. " ) );
+
+                continue;
             }
 
+            var dependencyDirectory = this.GetDependencyDirectory(
+                context,
+                dependencySource.Key,
+                dependencySource.Value,
+                dependencyDefinition,
+                configuration );
+
             if ( !AddDirectory( dependencySource.Key, dependencyDirectory, dependencyDefinition.PackagePatterns ) )
             {
                 return false;
@@ -165,8 +135,8 @@ bool AddDirectory( string name, string directory, string[]? patterns )
                 throw new ArgumentNullException( nameof(directory), $"Null directory for source '{name}'." );
             }
 
-            // Apply path transformation (e.g., Windows to WSL)
-            var transformedDirectory = pathTransform( directory );
+            // Apply path transformation
+            var transformedDirectory = this.TransformPath( directory, context );
 
             var addElement = new XElement( "add" );
             addElement.Add( new XAttribute( "key", name ) );
@@ -192,4 +162,41 @@ void AddPattern( string pattern )
             }
         }
     }
+
+    /// <summary>
+    /// Gets the target file path where the nuget.config will be written.
+    /// </summary>
+    protected abstract string GetTargetFilePath( BuildContext context, BuildConfiguration configuration );
+
+    /// <summary>
+    /// Transforms a path (e.g., to WSL format or relative path).
+    /// </summary>
+    protected abstract string TransformPath( string path, BuildContext context );
+
+    /// <summary>
+    /// Gets the directory for the current product's packages.
+    /// </summary>
+    protected abstract string GetCurrentProductDirectory( BuildContext context, BuildConfiguration configuration );
+
+    /// <summary>
+    /// Gets the directory for a dependency's packages.
+    /// </summary>
+    protected abstract string GetDependencyDirectory(
+        BuildContext context,
+        string dependencyKey,
+        DependencySource dependencySource,
+        DependencyDefinition dependencyDefinition,
+        BuildConfiguration configuration );
+
+    /// <summary>
+    /// Determines whether a dependency should be included in the nuget.config.
+    /// </summary>
+    /// <param name="dependencyDefinition">The dependency definition to check.</param>
+    /// <returns>True if the dependency should be included; otherwise, false.</returns>
+    protected virtual bool ShouldIncludeDependency( DependencyDefinition dependencyDefinition ) => true;
+
+    /// <summary>
+    /// Determines whether to load the base config file (nuget.base.config).
+    /// </summary>
+    protected virtual bool ShouldLoadBaseConfig() => true;
 }

…uildTools/Build/Files/NuGetConfigFile.cs …uild/Files/NuGet/NuGetConfigGenerator.cssrc/PostSharp.Engineering.BuildTools/Build/Files/NuGetConfigFile.cs renamed to src/PostSharp.Engineering.BuildTools/Build/Files/NuGet/NuGetConfigGenerator.cs src/PostSharp.Engineering.BuildTools/Build/Files/NuGetConfigFile.cs renamed to src/PostSharp.Engineering.BuildTools/Build/Files/NuGet/NuGetConfigGenerator.cs

@@ -0,0 +1,56 @@
+// 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.Dependencies.Model;
+using System.IO;
+
+namespace PostSharp.Engineering.BuildTools.Build.Files.NuGet;
+
+/// <summary>
+/// Generates nuget.restored.config with relative paths for TeamCity artifact restoration scenario.
+/// Assumes all dependencies have been restored to dependencies/&lt;name&gt;/ directory.
+/// All paths are relative to the repository root.
+/// </summary>
+internal sealed class RestoredArtifactsNuGetConfigGenerator : NuGetConfigGenerator
+{
+    protected override string GetTargetFilePath( BuildContext context, BuildConfiguration configuration )
+        => Path.Combine(
+            context.Product.GetPrivateArtifactsAbsoluteDirectory( context, configuration ),
+            "nuget.restored.config" );
+
+    protected override string TransformPath( string path, BuildContext context )
+    {
+        // Make path relative to repository root
+        var relativePath = Path.GetRelativePath( context.RepoDirectory, path );
+
+        // Normalize to forward slashes for consistency
+        return relativePath.Replace( '\\', '/' );
+    }
+
+    protected override string GetCurrentProductDirectory( BuildContext context, BuildConfiguration configuration )
+        => context.Product.GetPrivateArtifactsAbsoluteDirectory( context, configuration );
+
+    protected override string GetDependencyDirectory(
+        BuildContext context,
+        string dependencyKey,
+        DependencySource dependencySource,
+        DependencyDefinition dependencyDefinition,
+        BuildConfiguration configuration )
+    {
+        // For restored artifacts, dependencies are always under dependencies/<name>/{PrivateArtifactsDirectory}
+        // regardless of the source kind (this is the TeamCity artifact restoration structure)
+        return Path.Combine(
+            context.RepoDirectory,
+            "dependencies",
+            dependencyKey,
+            dependencyDefinition.GetPrivateArtifactsDirectory( configuration ) );
+    }
+
+    protected override bool ShouldIncludeDependency( DependencyDefinition dependencyDefinition )
+    {
+        // Only include dependencies that generate snapshot dependencies
+        // Dependencies with GenerateSnapshotDependency = false won't be restored as TeamCity artifacts
+        return dependencyDefinition.GenerateSnapshotDependency;
+    }
+
+    protected override bool ShouldLoadBaseConfig() => false; // TeamCity scenario doesn't need base config
+}

src/PostSharp.Engineering.BuildTools/Build/Files/NuGet/RestoredArtifactsNuGetConfigGenerator.cs

@@ -0,0 +1,39 @@
+// 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.Dependencies.Model;
+using System.IO;
+
+namespace PostSharp.Engineering.BuildTools.Build.Files.NuGet;
+
+/// <summary>
+/// Generates standard nuget.config with absolute Windows paths.
+/// </summary>
+internal class StandardNuGetConfigGenerator : NuGetConfigGenerator
+{
+    protected override string GetTargetFilePath( BuildContext context, BuildConfiguration configuration )
+        => Path.Combine( context.RepoDirectory, "nuget.config" );
+
+    protected override string TransformPath( string path, BuildContext context ) => path; // No transformation - use absolute paths as-is
+
+    protected override string GetCurrentProductDirectory( BuildContext context, BuildConfiguration configuration )
+        => context.Product.GetPrivateArtifactsAbsoluteDirectory( context, configuration );
+
+    protected override string GetDependencyDirectory(
+        BuildContext context,
+        string dependencyKey,
+        DependencySource dependencySource,
+        DependencyDefinition dependencyDefinition,
+        BuildConfiguration configuration )
+    {
+        var dependencyDirectory = Path.GetDirectoryName( dependencySource.VersionFile )!;
+
+        if ( dependencySource.SourceKind == DependencySourceKind.Local )
+        {
+            dependencyDirectory = Path.Combine(
+                dependencyDirectory,
+                dependencyDefinition.GetPrivateArtifactsDirectory( configuration ) );
+        }
+
+        return dependencyDirectory;
+    }
+}