From f9fb5ad00e568005fbc509079d75cc65a7ee25cd Mon Sep 17 00:00:00 2001
From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
Date: Thu, 6 Feb 2025 08:52:48 -0800
Subject: [PATCH 1/2] Update common Docker engineering infrastructure with
 latest

---
 eng/common/templates/variables/docker-images.yml | 2 +-
 eng/common/templates/variables/dotnet/common.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
index 24f82f054a..c04bcd5fac 100644
--- a/eng/common/templates/variables/docker-images.yml
+++ b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2630210
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2634835
   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
diff --git a/eng/common/templates/variables/dotnet/common.yml b/eng/common/templates/variables/dotnet/common.yml
index f9d52677b3..f4863073a7 100644
--- a/eng/common/templates/variables/dotnet/common.yml
+++ b/eng/common/templates/variables/dotnet/common.yml
@@ -54,6 +54,6 @@ variables:
 - name: windowsServer2025PoolName
   value: Docker-2025-${{ variables['System.TeamProject'] }}
 
-- group: DotNet-Docker-Common-2
+- group: DotNet-Docker-Common
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-  - group: DotNet-Docker-Secrets
+  - group: DotNet-Docker-Secrets-WIF

From 91a199957ae3c005d1e7319f053be815f6d2bf60 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 6 Feb 2025 16:06:37 -0500
Subject: [PATCH 2/2] Discard variable group changes

---
 eng/common/templates/variables/dotnet/common.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/common/templates/variables/dotnet/common.yml b/eng/common/templates/variables/dotnet/common.yml
index f4863073a7..f9d52677b3 100644
--- a/eng/common/templates/variables/dotnet/common.yml
+++ b/eng/common/templates/variables/dotnet/common.yml
@@ -54,6 +54,6 @@ variables:
 - name: windowsServer2025PoolName
   value: Docker-2025-${{ variables['System.TeamProject'] }}
 
-- group: DotNet-Docker-Common
+- group: DotNet-Docker-Common-2
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-  - group: DotNet-Docker-Secrets-WIF
+  - group: DotNet-Docker-Secrets