From 65419de4e3abec2dac8595f8e8588a57bdf3b70d Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 19 Feb 2025 13:18:17 -0800
Subject: [PATCH] Revert more

---
 eng/common/templates/steps/cleanup-docker-windows.yml | 2 +-
 eng/common/templates/steps/init-docker-windows.yml    | 2 +-
 eng/pipelines/templates/variables/image-builder.yml   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/common/templates/steps/cleanup-docker-windows.yml b/eng/common/templates/steps/cleanup-docker-windows.yml
index 3c5de2479..98fc52969 100644
--- a/eng/common/templates/steps/cleanup-docker-windows.yml
+++ b/eng/common/templates/steps/cleanup-docker-windows.yml
@@ -1,6 +1,6 @@
 parameters:
   condition: true
-
+  
 steps:
   ################################################################################
   # Cleanup Docker Resources
diff --git a/eng/common/templates/steps/init-docker-windows.yml b/eng/common/templates/steps/init-docker-windows.yml
index 5b6b50b98..a6fbaead6 100644
--- a/eng/common/templates/steps/init-docker-windows.yml
+++ b/eng/common/templates/steps/init-docker-windows.yml
@@ -30,7 +30,7 @@ steps:
   - script: >
       docker cp
       setupImageBuilder-$(Build.BuildId)-$(System.JobId):/image-builder
-      $(Build.BinariesDirectory)/.ImageBuilder
+      $(Build.BinariesDirectory)/.Microsoft.DotNet.ImageBuilder
     displayName: Copy Image Builder
     condition: and(succeeded(), ${{ parameters.condition }})
   - script: docker rm -f setupImageBuilder-$(Build.BuildId)-$(System.JobId)
diff --git a/eng/pipelines/templates/variables/image-builder.yml b/eng/pipelines/templates/variables/image-builder.yml
index 7984fd9cc..f1ceabe43 100644
--- a/eng/pipelines/templates/variables/image-builder.yml
+++ b/eng/pipelines/templates/variables/image-builder.yml
@@ -1,7 +1,7 @@
 variables:
 - template: /eng/pipelines/templates/variables/build-test-publish.yml@self
 - name: manifest
-  value: src/ImageBuilder/manifest.json
+  value: src/Microsoft.DotNet.ImageBuilder/manifest.json
 - name: publishReadme
   value: false
 - name: manifestVariables
@@ -9,8 +9,8 @@ variables:
 - name: imageInfoVariant
   value: "-imagebuilder"
 - name: testScriptPath
-  value: ./tests/ImageBuilder.Tests/run-tests.ps1
+  value: ./src/Microsoft.DotNet.ImageBuilder/run-tests.ps1
 - name: testResultsDirectory
-  value: tests/ImageBuilder.Tests/TestResults/
+  value: src/Microsoft.DotNet.ImageBuilder/tests/TestResults/
 - name: publicGitRepoUri
   value: https://github.com/dotnet/docker-tools