Fixed prepublished.

Author: gfraiteur

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

@@ -21,16 +21,9 @@ public static bool TryWrite( BuildContext context, bool dry, out bool hasChanges
         var autoUpdatedDependencies = context.Product.DependencyDefinition.GetAllDependencies( BuildConfiguration.Public )
             .Where( d => d.Definition.AutoUpdateVersion )
             .ToArray();
-
-        if ( autoUpdatedDependencies.Length == 0 )
-        {
-            context.Console.WriteMessage( "There are no auto-updated dependencies to check." );
-
-            return true;
-        }
-
+        
         // Load XML.
-        var thisAutoUpdatedVersionsFilePath = context.Product.AutoUpdatedVersionsFilePath;
+        var thisAutoUpdatedVersionsFilePath = Path.Combine( context.RepoDirectory, context.Product.AutoUpdatedVersionsFilePath );
         var thisAutoUpdatedVersionsDocument = XDocument.Load( thisAutoUpdatedVersionsFilePath, LoadOptions.PreserveWhitespace );
         var thisAutoUpdatedVersionsPropertyGroupElement = thisAutoUpdatedVersionsDocument.Root!.Element( "PropertyGroup" )!;
 
@@ -44,8 +37,8 @@ public static bool TryWrite( BuildContext context, bool dry, out bool hasChanges
 
             string[] filePathCandidates =
             [
-                Path.Combine( context.RepoDirectory, context.Product.SourceDependenciesDirectory, dependency.Name, "eng", FileName ),
-                Path.Combine( context.RepoDirectory, "..", dependency.Name, "eng", FileName )
+                Path.GetFullPath( Path.Combine( context.RepoDirectory, context.Product.SourceDependenciesDirectory, dependency.Name, dependency.EngineeringDirectory, FileName ) ),
+                Path.GetFullPath( Path.Combine( context.RepoDirectory, "..", dependency.Name, dependency.EngineeringDirectory, FileName ) )
             ];
 
             var theirAutoUpdatedVersionsFilePath = filePathCandidates.FirstOrDefault( File.Exists );
@@ -63,7 +56,7 @@ public static bool TryWrite( BuildContext context, bool dry, out bool hasChanges
 
             var releasedVersionPropertyName = $"{dependency.NameWithoutDot}ReleaseVersion";
 
-            var dependencyReleasedVersion = theirAutoUpdatedVersionsDocument.Root?.Element( "Project" )
+            var dependencyReleasedVersion = theirAutoUpdatedVersionsDocument.Root
                 ?.Element( "PropertyGroup" )
                 ?.Element( releasedVersionPropertyName )
                 ?.Value;
@@ -105,9 +98,9 @@ public static bool TryWrite( BuildContext context, bool dry, out bool hasChanges
             {
                 var releasedMainVersionPropertyName = $"{dependency.NameWithoutDot}ReleaseMainVersion";
 
-                var releasedMainVersionPropertyValue = theirAutoUpdatedVersionsDocument.Root?.Element( "Project" )
+                var releasedMainVersionPropertyValue = theirAutoUpdatedVersionsDocument.Root
                     ?.Element( "PropertyGroup" )
-                    ?.Element( releasedVersionPropertyName )
+                    ?.Element( releasedMainVersionPropertyName )
                     ?.Value;
 
                 if ( string.IsNullOrEmpty( releasedMainVersionPropertyValue ) )
@@ -165,8 +158,8 @@ public static bool TryWrite( BuildContext context, bool dry, out bool hasChanges
 
         if ( thisMainVersionElement == null )
         {
-            thisMainVersionElement = new XElement( $"{context.Product.ProductNameWithoutDot}ReleaseVersion" );
-            thisAutoUpdatedVersionsPropertyGroupElement.Add( thisVersionElement );
+            thisMainVersionElement = new XElement( $"{context.Product.ProductNameWithoutDot}ReleaseMainVersion" );
+            thisAutoUpdatedVersionsPropertyGroupElement.Add( thisMainVersionElement );
         }
 
         if ( thisMainVersionElement.Value != versionComponents.MainVersion )

src/PostSharp.Engineering.BuildTools/Build/Publishing/PrePublishCommand.cs

@@ -54,16 +54,28 @@ private static bool Execute( BuildContext context, PublishSettings settings )
             return false;
         }
 
-        if ( !AutoUpdatedVersionsFile.TryWriteAndCommit( context, settings.Dry ) )
+        if ( settings.NoCommit )
         {
-            return false;
+            if ( !AutoUpdatedVersionsFile.TryWrite( context, settings.Dry, out _ ) )
+            {
+                return false;
+            }   
         }
-
-        if ( !GitHelper.TryPullAndMergeAndPush( context, settings, targetBranch ) )
+        else
         {
-            return false;
+            if ( !AutoUpdatedVersionsFile.TryWriteAndCommit( context, settings.Dry ) )
+            {
+                return false;
+            }
+            
+            if ( !GitHelper.TryPullAndMergeAndPush( context, settings, targetBranch ) )
+            {
+                return false;
+            }
+
         }
 
+       
         return true;
     }
 }

src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishSettings.cs

@@ -13,6 +13,10 @@ public class PublishSettings : BuildSettings
     [CommandOption( "--dry" )]
     public bool Dry { get; protected set; }
 
+    [Description( "Write the files (unless --dry is used) but do not commit them." )]
+    [CommandOption( "--no-commit" )]
+    public bool NoCommit { get; init; }
+
     [Description( "Avoids check of the current branch" )]
     [CommandOption( "--standalone" )]
     public bool IsStandalone { get; protected set; }