Improved error message, formatting of AutoUpdatedVersions.g.props.

Author: gfraiteur

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

@@ -97,7 +97,7 @@ public static bool TryWrite(
 
         if ( File.Exists( thisAutoUpdatedVersionsFilePath ) )
         {
-            thisAutoUpdatedVersionsDocument = XDocument.Load( thisAutoUpdatedVersionsFilePath, LoadOptions.PreserveWhitespace );
+            thisAutoUpdatedVersionsDocument = XDocument.Load( thisAutoUpdatedVersionsFilePath );
             thisAutoUpdatedVersionsPropertyGroupElement = thisAutoUpdatedVersionsDocument.Root!.Element( "PropertyGroup" )!;
         }
         else
@@ -176,6 +176,7 @@ public static bool TryWrite(
                 thisAutoUpdatedVersionsPropertyGroupElement.Add( versionElement );
             }
 
+            versionElement.SetAttributeValue( "Condition", $"'$({versionElementName})' == ''" );
             versionElement.Value = dependencyReleasedVersion;
             hasChanges = true;
             hasDependenciesChanges = true;
@@ -244,18 +245,15 @@ public static bool TryWrite(
             thisMainVersionElement.Value = versionComponents.MainVersion;
         }
 
-        // Write changes.
-        if ( hasChanges )
+        // Write changes (always try to write to handle formatting and condition changes).
+        if ( !dry )
         {
-            if ( !dry )
-            {
-                hasChanges = TextFileHelper.WriteIfDifferent( thisAutoUpdatedVersionsFilePath, thisAutoUpdatedVersionsDocument, context );
-            }
-            else
-            {
-                context.Console.WriteMessage( $"New content for '{thisAutoUpdatedVersionsFilePath}':" );
-                context.Console.WriteMessage( thisAutoUpdatedVersionsDocument.ToNiceString() );
-            }
+            hasChanges = TextFileHelper.WriteIfDifferent( thisAutoUpdatedVersionsFilePath, thisAutoUpdatedVersionsDocument, context );
+        }
+        else if ( hasChanges )
+        {
+            context.Console.WriteMessage( $"New content for '{thisAutoUpdatedVersionsFilePath}':" );
+            context.Console.WriteMessage( thisAutoUpdatedVersionsDocument.ToNiceString() );
         }
 
         packageVersion = versionComponents.PackageVersion;

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

@@ -413,7 +413,7 @@ void WriteBuildServerSource()
 
                             if ( versionFile == null )
                             {
-                                throw new InvalidOperationException( "The VersionFile property of dependencies should be set." );
+                                throw new InvalidOperationException( $"'{this.FilePath}': The VersionFile property of dependency '{dependency.Key}' is not set." );
                             }
 
                             WriteBuildServerSource();
@@ -458,8 +458,13 @@ void WriteBuildServerSource()
 
                             // 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.
+                            // Only add the version property if we have an actual version. An empty version property
+                            // would incorrectly override a version set elsewhere.
 
-                            propertyGroup.Add( new XElement( $"{dependencyDefinition.NameWithoutDot}Version", dependencySource.Version ) );
+                            if ( !string.IsNullOrEmpty( dependencySource.Version ) )
+                            {
+                                propertyGroup.Add( new XElement( $"{dependencyDefinition.NameWithoutDot}Version", dependencySource.Version ) );
+                            }
                         }
 
                         break;