Fixed issue where feed dependencies would be replaced by transitive dependencies.

Author: gfraiteur

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

@@ -46,7 +46,7 @@ public static bool TryWriteFiles(
         // We always save the Versions.g.props because it may not exist, and it may have been changed by the previous step.
         dependenciesOverrideFile.LocalBuildFile = propsFilePath;
 
-        if ( !dependenciesOverrideFile.TrySave( context, settings ) )
+        if ( !dependenciesOverrideFile.TryWrite( context ) )
         {
             return false;
         }

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

@@ -31,7 +31,7 @@ protected override bool ExecuteCore( BuildContext context, FetchDependenciesComm
                 return false;
             }
 
-            if ( !dependenciesOverrideFile.TrySave( context, settings ) )
+            if ( !dependenciesOverrideFile.TryWrite( context ) )
             {
                 return false;
             }

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

@@ -111,7 +111,7 @@ protected override bool ExecuteCore( BuildContext context, T settings )
         }
 
         // Writing the version file.
-        if ( !dependenciesOverrideFile.TrySave( context, settings ) )
+        if ( !dependenciesOverrideFile.TryWrite( context ) )
         {
             return false;
         }

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

@@ -292,7 +292,7 @@ bool TryGetBuildId( out string? versionFile1, out ICiBuildSpec? ciBuildSpec )
             return true;
         }
 
-        public bool TrySave( BuildContext context, CommonCommandSettings settings )
+        public bool TryWrite( BuildContext context )
         {
             var console = context.Console;
             var product = context.Product;
@@ -308,7 +308,7 @@ public bool TrySave( BuildContext context, CommonCommandSettings settings )
                 dockerMountsWriter = File.CreateText( dockersMountsPath );
 
                 dockerMountsWriter.WriteLine(
-                    $"# File generated by PostSharp.Engineering {VersionHelper.EngineeringVersion}, method {nameof(DependenciesConfigurationFile)}.{nameof(this.TrySave)}." );
+                    $"# File generated by PostSharp.Engineering {VersionHelper.EngineeringVersion}, method {nameof(DependenciesConfigurationFile)}.{nameof(this.TryWrite)}." );
 
                 dockerMountsWriter.WriteLine();
             }
@@ -322,7 +322,7 @@ public bool TrySave( BuildContext context, CommonCommandSettings settings )
 
             project.Add(
                 new XComment(
-                    $"File generated by PostSharp.Engineering {VersionHelper.EngineeringVersion}, method {nameof(DependenciesConfigurationFile)}.{nameof(this.TrySave)}." ) );
+                    $"File generated by PostSharp.Engineering {VersionHelper.EngineeringVersion}, method {nameof(DependenciesConfigurationFile)}.{nameof(this.TryWrite)}." ) );
 
             var requiredFiles = new List<string>();
 
@@ -363,19 +363,24 @@ void AddImport( string file, bool required = true, string? label = null, bool ad
 
             var itemGroup = new XElement( "ItemGroup" );
             project.Add( itemGroup );
+            
+            var propertyGroup = new XElement( "PropertyGroup" );
+            project.Add( propertyGroup );
+
 
             foreach ( var dependency in this.Dependencies.OrderBy( d => d.Key ) )
             {
                 var ignoreDependency = false;
 
                 var dependencySource = dependency.Value;
+                var dependencyDefinition = product.GetDependencyDefinition( dependency.Key );
 
                 var item = new XElement(
                     "LocalDependencySource",
                     new XAttribute( "Include", dependency.Key ),
                     new XElement( "Kind", dependencySource.SourceKind ) );
 
-                void AddIfNotNull( string name, string? value )
+                void AddMetadataToItemIfNotNull( string name, string? value )
                 {
                     if ( value != null )
                     {
@@ -388,13 +393,13 @@ void WriteBuildServerSource()
                     switch ( dependencySource.BuildServerSource )
                     {
                         case CiLatestBuildOfBranch branch:
-                            AddIfNotNull( "Branch", branch.Name );
+                            AddMetadataToItemIfNotNull( "Branch", branch.Name );
 
                             break;
 
                         case CiBuildId buildId:
-                            AddIfNotNull( "BuildNumber", buildId.BuildNumber.ToString( CultureInfo.InvariantCulture ) );
-                            AddIfNotNull( "CiBuildTypeId", buildId.BuildTypeId );
+                            AddMetadataToItemIfNotNull( "BuildNumber", buildId.BuildNumber.ToString( CultureInfo.InvariantCulture ) );
+                            AddMetadataToItemIfNotNull( "CiBuildTypeId", buildId.BuildTypeId );
 
                             break;
                     }
@@ -405,8 +410,6 @@ void WriteBuildServerSource()
                     case DependencySourceKind.BuildServer:
                     case DependencySourceKind.RestoredDependency when !context.IsContinuousIntegrationBuild:
                         {
-                            var dependencyDefinition = context.Product.ParametrizedDependencies.SingleOrDefault( p => p.Name == dependency.Key )?.Definition;
-
                             if ( dependencyDefinition == null
                                  && !context.Product.ProductFamily.TryGetDependencyDefinition( dependency.Key, out dependencyDefinition ) )
                             {
@@ -424,7 +427,7 @@ void WriteBuildServerSource()
 
                                 WriteBuildServerSource();
 
-                                AddIfNotNull( "VersionFile", versionFile );
+                                AddMetadataToItemIfNotNull( "VersionFile", versionFile );
                                 AddImport( versionFile );
                             }
                         }
@@ -433,7 +436,7 @@ void WriteBuildServerSource()
 
                     case DependencySourceKind.Local:
                         {
-                            AddIfNotNull( "Path", dependencySource.LocalPath );
+                            AddMetadataToItemIfNotNull( "Path", dependencySource.LocalPath );
 
                             var importProjectFile = Path.GetFullPath(
                                 Path.Combine( dependencySource.GetResolvedLocalPath( context, dependency.Key ), dependency.Key + ".Import.props" ) );
@@ -461,7 +464,12 @@ void WriteBuildServerSource()
 
                     case DependencySourceKind.Feed:
                         {
-                            AddIfNotNull( "Version", dependencySource.Version );
+                            AddMetadataToItemIfNotNull( "Version", dependencySource.Version );
+                            
+                            // We must also save a property with the version, and set it before the imports, otherwise
+                            // the imports will override the setting in case of shared transitive dependency.
+                            
+                            propertyGroup.Add( new XElement( $"{dependencyDefinition.NameWithoutDot}Version", dependencySource.Version ) );
                         }
 
                         break;
@@ -478,23 +486,21 @@ void WriteBuildServerSource()
                 }
             }
 
-            var properties = new XElement( "PropertyGroup" );
-            project.Add( properties );
-            properties.Add( new XElement( "ProductFamily", context.Product.ProductFamily.Name ) );
-            properties.Add( new XElement( "ProductFamilyVersion", context.Product.ProductFamily.Version ) );
-            properties.Add( new XElement( "BuildDate", $"$({context.Product.ProductNameWithoutDot}BuildDate)" ) );
+            propertyGroup.Add( new XElement( "ProductFamily", context.Product.ProductFamily.Name ) );
+            propertyGroup.Add( new XElement( "ProductFamilyVersion", context.Product.ProductFamily.Version ) );
+            propertyGroup.Add( new XElement( "BuildDate", $"$({context.Product.ProductNameWithoutDot}BuildDate)" ) );
 
             // The following properties are NOT related to dependencies. They are put here (instead of in a separate file) for convenience.
-            properties.Add( new XElement( "PostSharpEngineeringExePath", context.Product.BuildExePath ) );
-            properties.Add( new XElement( "PostSharpEngineeringDataDirectory", PathHelper.GetEngineeringDataDirectory() ) );
+            propertyGroup.Add( new XElement( "PostSharpEngineeringExePath", context.Product.BuildExePath ) );
+            propertyGroup.Add( new XElement( "PostSharpEngineeringDataDirectory", PathHelper.GetEngineeringDataDirectory() ) );
 
             if ( product.MSBuildVersion != null )
             {
                 var msbuild = MSBuildHelper.FindMSBuildExe( context );
 
                 if ( msbuild != null )
                 {
-                    properties.Add( new XElement( "MSBuildExePath", "\"" + msbuild + "\"" ) );
+                    propertyGroup.Add( new XElement( "MSBuildExePath", "\"" + msbuild + "\"" ) );
                 }
             }
 

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

@@ -122,10 +122,7 @@ protected override bool ExecuteCore( BuildContext context, CommonCommandSettings
         console.WriteSuccess( "Engineering successfully updated." );
 
         // Generate scripts.
-        if ( !GenerateScriptsCommand.Execute( context, settings ) )
-        {
-            return false;
-        }
+        console.WriteWarning( "Now run `./Build.ps1 generate-scripts` with this new version." );
 
         return true;
     }