Docker: fixed VSSDK component. Postpublish:

Author: gfraiteur

src/PostSharp.Engineering.BuildTools/Build/Bumping/BumpCommand.cs

@@ -33,10 +33,9 @@ private static bool Execute( BuildContext context, BumpSettings settings )
 
         var developmentBranch = product.DependencyDefinition.Branch;
 
-        if ( context.Branch != developmentBranch )
+        if ( context.Branch != developmentBranch && !settings.Force )
         {
-            console.WriteError(
-                $"The version bump can only be executed on the development branch ('{developmentBranch}'). The current branch is '{context.Branch}'." );
+            console.WriteError( $"The version bump can only be executed on the development branch ('{developmentBranch}'), unless --force is used." );
 
             return false;
         }
@@ -108,7 +107,7 @@ private static bool Execute( BuildContext context, BumpSettings settings )
 
             return true;
         }
-        
+
         // Doing a dry run of AutoUpdatedVersionsFile both gets the versions of all dependencies and gets the current version.
         // Do not write the AutoUpdatedVersions.props file yet - we will do it after we set our own version.
         if ( !AutoUpdatedVersionsFile.TryWrite( context, true, out var hasChangesInDependencies, out _, out _, out var currentVersion ) )

src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs

@@ -18,20 +18,12 @@ internal static class GitIntegrationHelper
 {
     public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings settings )
     {
-        if ( !MainVersionFile.TryRead( context, out var mainVersionFileInfo ) )
+        if ( !AutoUpdatedVersionsFile.TryRead( context, out var releasedVersion, out _ ) )
         {
             return false;
         }
 
-        if ( !ArtifactManifestFile.TryRead(
-                context,
-                settings.BuildConfiguration,
-                out var preparedVersionInfo ) )
-        {
-            return false;
-        }
-
-        var versionTag = $"release/{preparedVersionInfo.PackageVersion}";
+        var versionTag = $"release/{releasedVersion}";
 
         ToolInvocationHelper.InvokeTool(
             context.Console,

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

@@ -15,35 +15,30 @@ internal class PostPublishCommand : BaseCommand<PublishSettings>
     {
         protected override bool ExecuteCore( BuildContext context, PublishSettings settings ) => Execute( context, settings );
 
-        public static bool Execute( BuildContext context, PublishSettings settings )
+        private static bool Execute( BuildContext context, PublishSettings settings )
         {
             context.Console.WriteHeading( "Finishing publishing." );
 
-            if ( !GitHelper.TryConfigureCredentials( context ) )
-            {
-                return false;
-            }
+            var product = context.Product;
+            var releaseBranch = product.DependencyDefinition.ReleaseBranch;
 
-            if ( !MasterGenerator.TryWriteFiles( context, settings ) )
+            if ( releaseBranch == null )
             {
+                context.Console.WriteError( $"The release branch is not set for '{product.ProductName}' product." );
+
                 return false;
             }
 
-            var product = context.Product;
-            var sourceBranch = product.DependencyDefinition.ReleaseBranch;
-
-            if ( sourceBranch == null )
+            if ( context.Branch != releaseBranch )
             {
-                context.Console.WriteError( $"Post-publishing failed. The release branch is not set for '{product.ProductName}' product." );
+                context.Console.WriteError(
+                    $"Post-publishing can only be executed on the release branch ('{releaseBranch}'). The current branch is '{context.Branch}'." );
 
                 return false;
             }
 
-            if ( context.Branch != sourceBranch )
+            if ( !GitHelper.TryConfigureCredentials( context ) )
             {
-                context.Console.WriteError(
-                    $"Post-publishing can only be executed on the release branch ('{sourceBranch}'). The current branch is '{context.Branch}'." );
-
                 return false;
             }
 

src/PostSharp.Engineering.BuildTools/Docker/VisualStudioBuildToolsComponent.cs

@@ -49,6 +49,12 @@ public override void WriteDockerfile( TextWriter writer )
                   Remove-Item C:\\vs_buildtools.exe;
               """ );
 
+        // Define VSSDKINSTALLDIR
+        if ( this._vsComponents.Contains( "Microsoft.VisualStudio.Component.VSSDKBuildTools" ) )
+        {
+            writer.WriteLine( "ENV VSSDKINSTALL=C:\\BuildTools\\VSSDK" );
+        }
+
         // We must always create "C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages" or MSBuild might complain.
         writer.WriteLine(
             """