Fixed some version reading.

Author: gfraiteur

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

@@ -226,63 +226,38 @@ public static bool TryRead(
         [NotNullWhen( true )] out ArtifactManifestVersionInfo? artifactManifestVersionInfo )
     {
         var product = context.Product;
+        var artifactVersionFile = context.GetManifestFilePath( configuration );
 
-        if ( !MainVersionFile.TryRead( context, out var mainVersionFile ) )
+        var document = XDocument.Load( artifactVersionFile );
+        var project = document.Root;
+        var properties = project?.Element( "PropertyGroup" );
+        var mainVersionPropertyName = $"{product.ProductNameWithoutDot}MainVersion";
+        var mainVersion = properties?.Element( mainVersionPropertyName )?.Value;
+
+        if ( mainVersion == null )
         {
+            context.Console.WriteError(
+                $"Cannot load '{product.MainVersionFilePath}': the property '{mainVersionPropertyName}' in '{artifactVersionFile}' is not defined." );
+
             artifactManifestVersionInfo = null;
 
             return false;
         }
 
-        var overriddenPatchVersion = mainVersionFile.OverriddenPatchVersion;
-
-        string? mainVersion;
-        Version? currentVersion;
-
-        // The MainVersionDependency is not defined.
-        if ( product.MainVersionDependency == null )
-        {
-            // The current version defaults to MainVersion.
-
-            mainVersion = mainVersionFile.MainVersion;
+        var packageVersionPropertyName = $"{product.ProductNameWithoutDot}Version";
+        var packageVersion = properties?.Element( packageVersionPropertyName )?.Value;
 
-            currentVersion = Version.Parse( mainVersion );
-        }
-        else
+        if ( packageVersion == null )
         {
-            // If MainVersionDependency and OverriddenPatchVersion properties are defined, we use OverriddenPatchVersion value.
-            if ( !string.IsNullOrEmpty( overriddenPatchVersion ) )
-            {
-                currentVersion = new Version( overriddenPatchVersion );
-            }
-            else
-            {
-                // If no OverridenPatchVersion is defined, we use MainVersion property from private artifact.
-
-                var artifactVersionFile = context.GetManifestFilePath( configuration );
-
-                var document = XDocument.Load( artifactVersionFile );
-                var project = document.Root;
-                var properties = project?.Element( "PropertyGroup" );
-                var propertyName = $"{product.ProductNameWithoutDot}MainVersion";
-                mainVersion = properties?.Element( propertyName )?.Value;
-
-                if ( mainVersion == null )
-                {
-                    context.Console.WriteError(
-                        $"Cannot load '{product.MainVersionFilePath}': the property '{propertyName}' in '{artifactVersionFile}' is not defined." );
+            context.Console.WriteError(
+                $"Cannot load '{product.MainVersionFilePath}': the property '{packageVersionPropertyName}' in '{artifactVersionFile}' is not defined." );
 
-                    artifactManifestVersionInfo = null;
-
-                    return false;
-                }
+            artifactManifestVersionInfo = null;
 
-                // Set the current version to dependency version.
-                currentVersion = new Version( mainVersion );
-            }
+            return false;
         }
 
-        artifactManifestVersionInfo = new ArtifactManifestVersionInfo( currentVersion, mainVersionFile.PackageVersionSuffix );
+        artifactManifestVersionInfo = new ArtifactManifestVersionInfo( new Version( mainVersion ), packageVersion );
 
         return true;
     }

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

@@ -4,7 +4,4 @@
 
 namespace PostSharp.Engineering.BuildTools.Build.Files;
 
-internal record ArtifactManifestVersionInfo( Version Version, string PackageVersionSuffix )
-{
-    public string PackageVersion => this.Version.ToString() + this.PackageVersionSuffix;
-}
+internal record ArtifactManifestVersionInfo( Version MainVersion, string PackageVersion );

src/PostSharp.Engineering.BuildTools/Build/Files/MasterGenerator.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 PostSharp.Engineering.BuildTools.Build.Model;
 using PostSharp.Engineering.BuildTools.Dependencies.Model;
 using PostSharp.Engineering.BuildTools.Utilities;
 using System.Diagnostics.CodeAnalysis;
@@ -8,6 +9,11 @@ namespace PostSharp.Engineering.BuildTools.Build.Files;
 
 internal static class MasterGenerator
 {
+    public static bool TryWriteFiles(
+        BuildContext context,
+        BuildSettings settings )
+        => TryWriteFiles( context, settings, out _ );
+
     public static bool TryWriteFiles(
         BuildContext context,
         BuildSettings settings,

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

@@ -4,9 +4,7 @@
 using PostSharp.Engineering.BuildTools.Build.Files;
 using PostSharp.Engineering.BuildTools.Build.Helpers;
 using PostSharp.Engineering.BuildTools.Build.Model;
-using PostSharp.Engineering.BuildTools.ContinuousIntegration;
 using PostSharp.Engineering.BuildTools.Dependencies.Model;
-using PostSharp.Engineering.BuildTools.Tools.TeamCity;
 using System.Diagnostics.CodeAnalysis;
 
 namespace PostSharp.Engineering.BuildTools.Build;
@@ -62,8 +60,7 @@ public static bool Execute(
             return false;
         }
 
-        context.Console.WriteSuccess(
-            $"Preparing the build was successful. {product.ProductNameWithoutDot}Version={artifactManifestVersionInfo.PackageVersion}" );
+        context.Console.WriteSuccess( $"Preparing the build was successful. {product.ProductNameWithoutDot}Version={artifactManifestVersionInfo.PackageVersion}" );
 
         return true;
     }

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

@@ -21,7 +21,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
         {
             context.Console.WriteHeading( "Finishing publishing." );
 
-            if ( !MasterGenerator.TryWriteFiles( context, settings, out _ ) )
+            if ( !MasterGenerator.TryWriteFiles( context, settings ) )
             {
                 return false;
             }

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

@@ -22,7 +22,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
     {
         var product = context.Product;
 
-        if ( !MasterGenerator.TryWriteFiles( context, settings, out _ ) )
+        if ( !MasterGenerator.TryWriteFiles( context, settings ) )
         {
             return false;
         }

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

@@ -102,7 +102,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
             return false;
         }
 
-        if ( !MasterGenerator.TryWriteFiles( context, settings, out _ ) )
+        if ( !MasterGenerator.TryWriteFiles( context, settings ) )
         {
             return false;
         }