@@ -93,9 +93,11 @@ jobs:

           New-Item -ItemType "directory" -Path "${{ env.BIN_OUT }}"

           docker cp "${{ env.TEST_CTN_NAME }}`:c`:\gopath\src\github.com\docker\docker\bundles\docker.exe" ${{ env.BIN_OUT }}\

           docker cp "${{ env.TEST_CTN_NAME }}`:c`:\gopath\src\github.com\docker\docker\bundles\dockerd.exe" ${{ env.BIN_OUT }}\

+          docker cp "${{ env.TEST_CTN_NAME }}`:c`:\gopath\src\github.com\docker\docker\bundles\docker-buildx.exe" ${{ env.BIN_OUT }}\

           docker cp "${{ env.TEST_CTN_NAME }}`:c`:\gopath\bin\gotestsum.exe" ${{ env.BIN_OUT }}\

           docker cp "${{ env.TEST_CTN_NAME }}`:c`:\containerd\bin\containerd.exe" ${{ env.BIN_OUT }}\

           docker cp "${{ env.TEST_CTN_NAME }}`:c`:\containerd\bin\containerd-shim-runhcs-v1.exe" ${{ env.BIN_OUT }}\

+          Get-ChildItem -Path ${{ env.BIN_OUT }}

       -

         name: Upload artifacts

         uses: actions/upload-artifact@v6

@@ -303,6 +305,9 @@ jobs:

         name: Init

         run: |

           New-Item -ItemType "directory" -Path "bundles" -ErrorAction SilentlyContinue

+          New-Item -ItemType "directory" -Path "${env:ProgramData}\Docker" -ErrorAction SilentlyContinue

+          New-Item -ItemType "directory" -Path "${env:ProgramData}\Docker\cli-plugins" -ErrorAction SilentlyContinue

+          Move-Item -Path "${{ env.BIN_OUT }}\docker-buildx.exe" -Destination "${env:ProgramData}\Docker\cli-plugins\docker-buildx.exe" -Force -ErrorAction Continue

           If ("${{ inputs.os }}" -eq "windows-2025") {

             echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2025 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

           } ElseIf ("${{ inputs.os }}" -eq "windows-2022") {

@@ -540,6 +540,11 @@ Try {

             Finally {

                 Remove-Item -Force "docker.zip"

             }

+

+            if (-not ($buildx = $env:BUILDX_VERSION)) { $buildx = "0.31.1" }

+            Write-Host "INFO: Downloading docker/buildx version $buildx..."

+            $url = "https://github.com/docker/buildx/releases/download/v${buildx}/buildx-v${buildx}.windows-amd64.exe"

+            Invoke-WebRequest $url -OutFile "$PWD\bundles\docker-buildx.exe"

         }

     }