Merge remote-tracking branch 'upstream/main' into release/2025-mar

Author: lbussell

eng/common/Invoke-ImageBuilder.ps1

@@ -8,7 +8,7 @@ Executes ImageBuilder with the specified args.
 The args to pass to ImageBuilder.
 
 .PARAMETER ReuseImageBuilderImage
-Indicates that a previously built ImageBuilder image is presumed to exist locally and that 
+Indicates that a previously built ImageBuilder image is presumed to exist locally and that
 it should be used for this execution of the script.  This allows some optimization when
 multiple calls are being made to this script that don't require a fresh image (i.e. the
 repo contents in the image don't need to be or should not be updated with each call to
@@ -74,6 +74,7 @@ try {
     }
     else {
         # On Windows, ImageBuilder is run locally due to limitations with running Docker client within a container.
+        # Remove when https://github.com/dotnet/docker-tools/issues/159 is resolved
         $imageBuilderFolder = ".Microsoft.DotNet.ImageBuilder"
         $imageBuilderCmd = [System.IO.Path]::Combine($imageBuilderFolder, "Microsoft.DotNet.ImageBuilder.exe")
         if (-not (Test-Path -Path "$imageBuilderCmd" -PathType Leaf)) {
@@ -99,6 +100,6 @@ finally {
     if ($containerCreated) {
         Exec "docker container rm -f $imageBuilderContainerName"
     }
-    
+
     popd
 }

eng/common/templates/variables/docker-images.yml

@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2647883
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2657098
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner