Improving Docker integration, nuget.config generation.

Author: gfraiteur

.idea/.idea.PostSharp.Engineering/.idea/copilot.data.migration.ask.xml

@@ -1209,7 +1209,7 @@ public bool PrepareVersionsFile(
             }
 
             // Generate nuget.config.
-            if ( this.GenerateNuGetConfig && !TryGenerateNuGetConfig( context, dependenciesOverrideFile, settings ) )
+            if ( !this.TryGenerateNuGetConfig( context, dependenciesOverrideFile, settings.BuildConfiguration ) )
             {
                 return false;
             }
@@ -1390,15 +1390,19 @@ private bool TryComputeVersion(
             return true;
         }
 
-        private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOverrideFile dependenciesOverrideFile, BuildSettings buildSettings )
+        internal bool TryGenerateNuGetConfig( BuildContext context, DependenciesOverrideFile dependenciesOverrideFile, BuildConfiguration configuration )
         {
+            if ( !this.GenerateNuGetConfig  )
+            {
+                return true;
+            }
+            
             // Fetch to resolve the VersionFile properties.
             if ( !dependenciesOverrideFile.Fetch( context ) )
             {
                 return false;
             }
 
-            var product = context.Product;
             var baseFilePath = Path.Combine( context.RepoDirectory, "nuget.base.config" );
             var targetFilePath = Path.Combine( context.RepoDirectory, "nuget.config" );
 
@@ -1438,9 +1442,9 @@ private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOv
             // Add the current artifact directory.
             var artifactDirectory = Path.Combine(
                 context.RepoDirectory,
-                product.PrivateArtifactsDirectory.ToString( new BuildInfo( null, buildSettings.BuildConfiguration, product, null ) ) );
+                this.PrivateArtifactsDirectory.ToString( new BuildInfo( null, configuration, this, null ) ) );
 
-            AddDirectory( product.ProductName, artifactDirectory, product.DependencyDefinition.PackagePatterns );
+            AddDirectory( this.ProductName, artifactDirectory, this.DependencyDefinition.PackagePatterns );
 
             // Add dependencies.
             foreach ( var dependencySource in dependenciesOverrideFile.Dependencies )
@@ -1457,8 +1461,8 @@ private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOv
                     continue;
                 }
 
-                var dependencyDefinition = product.GetDependencyDefinition( dependencySource.Key );
-                var parametrizedDependency = product.ParametrizedDependencies.Single( d => d.Name == dependencySource.Key );
+                var dependencyDefinition = this.GetDependencyDefinition( dependencySource.Key );
+                var parametrizedDependency = this.ParametrizedDependencies.Single( d => d.Name == dependencySource.Key );
                 var dependencyDirectory = Path.GetDirectoryName( dependencySource.Value.VersionFile )!;
 
                 if ( dependencySource.Value.SourceKind == DependencySourceKind.Local )
@@ -1468,7 +1472,7 @@ private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOv
                         dependencyDefinition.PrivateArtifactsDirectory.ToString(
                             new BuildInfo(
                                 null,
-                                parametrizedDependency.ConfigurationMapping[buildSettings.BuildConfiguration],
+                                parametrizedDependency.ConfigurationMapping[configuration],
                                 dependencyDefinition,
                                 null ) ) );
                 }

.idea/.idea.PostSharp.Engineering/.idea/copilot.data.migration.ask2agent.xml

@@ -113,6 +113,12 @@ protected override bool ExecuteCore( BuildContext context, T settings )
 
         // Writing the configurations neutral file.
         context.Product.PrepareConfigurationNeutralVersionsFile( context, settings, configuration );
+        
+        // Generate nuget.config.
+        if ( !context.Product.TryGenerateNuGetConfig( context, dependenciesOverrideFile, configuration ) )
+        {
+            return false;
+        }
 
         context.Console.WriteLine();
 

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

@@ -1,5 +1,6 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
+using JetBrains.Annotations;
 using PostSharp.Engineering.BuildTools.Build;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.Model;
 using System;
@@ -9,6 +10,7 @@
 
 namespace PostSharp.Engineering.BuildTools.Docker;
 
+[PublicAPI]
 public record ContainerRequirements : BuildAgentRequirements
 {
     public ContainerRequirements( ContainerHostKind hostKind ) : base( new BuildAgentRequirement( "env.BuildAgentType", GetBuildAgentType( hostKind ) ) ) { }

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

@@ -11,12 +11,25 @@ public class DotNetComponent : ContainerComponent
 {
     public string Version { get; }
 
+    public Version? ParsedVersion
+    {
+        get;
+
+    }
+
     public DotNetComponentKind DotNetComponentKind { get; }
 
     public DotNetComponent( string version, DotNetComponentKind dotNetComponentKind )
     {
         this.Version = version;
         this.DotNetComponentKind = dotNetComponentKind;
+        
+            var v = this.Version.Split( "-" )[0];
+
+        if ( System.Version.TryParse( v, out var parsedVersion ) )
+        {
+            this.ParsedVersion = parsedVersion;
+        }
     }
 
     public override string Name => $"Install .NET {this.DotNetComponentKind} {this.Version}";
@@ -59,7 +72,6 @@ public override void WriteDockerfile( StreamWriter writer )
 
     public override string ToString() => $"{this.Kind} {this.DotNetComponentKind} {this.Version}";
 
-
     public override int CompareTo( ContainerComponent? other )
     {
         var compareBase = base.CompareTo( other );
@@ -71,6 +83,18 @@ public override int CompareTo( ContainerComponent? other )
 
         var otherDotNetComponent = (DotNetComponent) other!;
 
-        return string.Compare( this.Version, otherDotNetComponent.Version, StringComparison.Ordinal );
+        // Compare the version number.
+        if ( this.ParsedVersion != null && otherDotNetComponent.ParsedVersion != null )
+        {
+            var compareParsedVersion = this.ParsedVersion.CompareTo( otherDotNetComponent.ParsedVersion );
+
+            if ( compareParsedVersion != 0 )
+            {
+                return compareParsedVersion;
+            }
+        }
+
+        // Compare the string part of the version number..
+        return -string.Compare( this.Version, otherDotNetComponent.Version, StringComparison.Ordinal );
     }
 }

src/PostSharp.Engineering.BuildTools/Docker/ContainerRequirements.cs

@@ -52,7 +52,7 @@ public static void ExtractResource(
         else
 
         {
-            context.Console.WriteMessage( $"File '{targetPath}' is already correct." );
+            context.Console.WriteMessage( $"File '{targetPath}' is up to date." );
         }
     }
 }