[release/6.0] Switch to consolidated Windows build images and Svc pool (#44349)

Author: dougbu

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

@@ -4,7 +4,7 @@ trigger:
   branches:
     include:
     - internal/release/6.0
-    
+
 parameters:
 # Run the pipeline manually (usually disallowed)
 - name: manualRun
@@ -26,8 +26,8 @@ jobs:
       - job: Merge_Azure_DevOps_Branches
         enableSBOM: false
         pool:
-          name: NetCore1ESPool-Internal
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          name: NetCore1ESPool-Svc-Internal
+          demands: ImageOverride -equals 1es-windows-2019
         variables:
         - name: WorkingDirectoryName
           value: repo-dir
@@ -67,4 +67,4 @@ jobs:
               $target = "$branch".Replace('/', ' ')
 
               Write-Host "##vso[build.updatebuildnumber]$target $commit"
-              Write-Host "##vso[build.addbuildtag]$target"
+              Write-Host "##vso[build.addbuildtag]$target"

.azure/pipelines/ci.yml

@@ -778,7 +778,7 @@ stages:
           - Source_Build_Managed
         pool:
           name: NetCore1ESPool-Svc-Internal
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          demands: ImageOverride -equals 1es-windows-2019
         publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
         enablePublishBuildArtifacts: true # publish artifacts/log files
 

.azure/pipelines/jobs/default-build.yml

@@ -112,7 +112,7 @@ jobs:
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCore1ESPool-Svc-Internal
           # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          demands: ImageOverride -equals 1es-windows-2019
     ${{ if ne(parameters.container, '') }}:
       container: ${{ parameters.container }}
     ${{ if ne(parameters.disableComponentGovernance, '') }}: