Fixes around BuildArguments with Publish and Swap.

Author: gfraiteur

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

@@ -59,7 +59,14 @@ private BuildArguments( string? packageVersion, string configuration, string msB
         public static BuildArguments ReadFromArtifactManifest( BuildContext context, BuildConfiguration buildConfiguration )
             => ArtifactManifestFile.CreateParametricStringArguments( context, buildConfiguration );
 
+        [Obsolete( "Renamed TryReadFromAutoUpdatedVersions." )]
         public static bool TryCreate( BuildContext context, BuildConfiguration configuration, [NotNullWhen( true )] out BuildArguments? buildArguments )
+            => TryReadFromAutoUpdatedVersionsFile( context, configuration, out buildArguments );
+
+        public static bool TryReadFromAutoUpdatedVersionsFile(
+            BuildContext context,
+            BuildConfiguration configuration,
+            [NotNullWhen( true )] out BuildArguments? buildArguments )
         {
             if ( !MainVersionFile.TryRead( context, out var mainVersionFile ) )
             {
@@ -84,5 +91,43 @@ public static bool TryCreate( BuildContext context, BuildConfiguration configura
 
             return true;
         }
+
+        public static bool TryCreate(
+            BuildContext context,
+            BuildSettings settings,
+            [NotNullWhen( true )] out BuildArguments? buildArguments )
+            => TryCreate( context, settings.BuildConfiguration, settings.GetVersionSpec( settings.BuildConfiguration ), settings.UserName, out buildArguments );
+        
+        public static bool TryCreate(
+            BuildContext context,
+            BuildConfiguration configuration,
+            VersionSpec versionSpec,
+            string? userName,
+            [NotNullWhen( true )] out BuildArguments? buildArguments )
+        {
+            if ( !MainVersionFile.TryRead( context, out var mainVersionFile ) )
+            {
+                buildArguments = null;
+
+                return false;
+            }
+
+            
+            if ( !VersionComponents.TryCompute( context, configuration, mainVersionFile, null, versionSpec,  userName, out var versionComponents  ) )
+            {
+                buildArguments = null;
+
+                return false;
+            }
+
+            buildArguments = new BuildArguments()
+            {
+                MSBuildConfiguration = context.Product.DependencyDefinition.MSBuildConfiguration[configuration],
+                Configuration = configuration.ToString(),
+                PackageVersion = versionComponents.PackageVersion
+            };
+
+            return true;
+        }
     }
 }

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

@@ -127,7 +127,7 @@ public static bool TryCompute(
         BuildContext context,
         BuildConfiguration configuration,
         MainVersionFile mainVersionFile,
-        string? inheritedMainVersion,
+        string? mainVersionOverride,
         VersionSpec versionSpec,
         string? userName,
         [NotNullWhen( true )] out VersionComponents? version )
@@ -137,16 +137,18 @@ public static bool TryCompute(
 
         version = null;
 
+        var mainVersion = mainVersionOverride ?? mainVersionFile.MainVersion;
+
         if ( !string.IsNullOrEmpty( mainVersionFile.OverriddenPatchVersion )
-             && !mainVersionFile.OverriddenPatchVersion.StartsWith( inheritedMainVersion ?? mainVersionFile.MainVersion + ".", StringComparison.Ordinal ) )
+             && !mainVersionFile.OverriddenPatchVersion.StartsWith( mainVersionOverride ?? mainVersionFile.MainVersion + ".", StringComparison.Ordinal ) )
         {
             context.Console.WriteError(
-                $"The OverriddenPatchVersion property in MainVersion.props ({mainVersionFile.OverriddenPatchVersion}) does not match the MainVersion property value ({inheritedMainVersion ?? mainVersionFile.MainVersion})." );
+                $"The OverriddenPatchVersion property in MainVersion.props ({mainVersionFile.OverriddenPatchVersion}) does not match the MainVersion property value ({mainVersion})." );
 
             return false;
         }
 
-        var versionPrefix = inheritedMainVersion ?? mainVersionFile.MainVersion;
+        var versionPrefix = mainVersion;
         string versionSuffix;
         int patchNumber;
 
@@ -217,7 +219,7 @@ public static bool TryCompute(
                 throw new InvalidOperationException();
         }
 
-        version = new VersionComponents( inheritedMainVersion ?? mainVersionFile.MainVersion, versionPrefix, patchNumber, versionSuffix, configuration, product );
+        version = new VersionComponents( mainVersion, versionPrefix, patchNumber, versionSuffix, configuration, product );
 
         return true;
     }

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

@@ -96,7 +96,7 @@ private static bool Execute( BuildContext context, PublishSettings settings )
 
         var configuration = settings.BuildConfiguration;
 
-        if ( !BuildArguments.TryCreate( context, configuration, out var buildArguments ) )
+        if ( !BuildArguments.TryCreate( context, settings, out var buildArguments ) )
         {
             return false;
         }

src/PostSharp.Engineering.BuildTools/Build/Swapping/SwapCommand.cs

@@ -27,10 +27,7 @@ private static bool Execute( BuildContext context, SwapSettings settings )
         var product = context.Product;
         var configuration = product.Configurations.GetValue( settings.BuildConfiguration );
 
-        if ( !BuildArguments.TryCreate( context, settings.BuildConfiguration, out var buildArguments ) )
-        {
-            return false;
-        }
+        var buildArguments = BuildArguments.ReadFromArtifactManifest( context, settings.BuildConfiguration );
 
         var directories = product.GetArtifactsAbsoluteDirectories( context, settings.BuildConfiguration );
 

src/PostSharp.Engineering.BuildTools/Build/Swapping/SwapSettings.cs

@@ -12,7 +12,7 @@ public class SwapSettings : CommonCommandSettings
     {
         [Description( "Sets the build configuration (Debug | Release | Public) to swap" )]
         [CommandOption( "-c|--configuration" )]
-        public BuildConfiguration BuildConfiguration { get; set; }
+        public BuildConfiguration BuildConfiguration { get; init; }
 
         [Description( "Prints the command line, but does not execute it" )]
         [CommandOption( "--dry" )]

src/PostSharp.Engineering.BuildTools/Tools/VerifyCommand.cs

@@ -20,11 +20,6 @@ public static bool Execute( BuildContext context, PublishSettings settings )
 
         if ( configuration == BuildConfiguration.Public )
         {
-            if ( !BuildArguments.TryCreate( context, configuration, out var buildArguments ) )
-            {
-                return false;
-            }
-
             var directories = product.GetArtifactsAbsoluteDirectories( context, configuration );
 
             // Verify that public packages have no private dependencies.