Merge pull request #60508 from dotnet/merges/release/dev17.0-vs-deps-…

…to-release/dev17.1 Merge release/dev17.0-vs-deps to release/dev17.1
dotnet · Mar 31, 2022 · 5a07129 · 5a07129
2 parents 291f17b + 775b2ac
commit 5a07129
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -18,8 +18,8 @@ jobs:
 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
   - job: VS_Integration_Debug_32
     pool:
-      name: $(poolName)
-      demands: ImageOverride -equals $(queueName)
+      name: NetCore1ESPool-Svc-Public
+      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
     timeoutInMinutes: 135
     variables:
       - name: XUNIT_LOGS
@@ -33,8 +33,8 @@ jobs:
 
 - job: VS_Integration_Debug_64
   pool:
-    name: $(poolName)
-    demands: ImageOverride -equals $(queueName)
+    name: NetCore1ESPool-Svc-Public
+    demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
   timeoutInMinutes: 135
   variables:
     - name: XUNIT_LOGS
@@ -48,8 +48,8 @@ jobs:
 
 - job: VS_Integration_Release_32
   pool:
-    name: $(poolName)
-    demands: ImageOverride -equals $(queueName)
+    name: NetCore1ESPool-Svc-Public
+    demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
   timeoutInMinutes: 135
   variables:
     - name: XUNIT_LOGS
@@ -64,8 +64,8 @@ jobs:
 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
   - job: VS_Integration_Release_64
     pool:
-      name: $(poolName)
-      demands: ImageOverride -equals $(queueName)
+      name: NetCore1ESPool-Svc-Public
+      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
     timeoutInMinutes: 135
     variables:
       - name: XUNIT_LOGS

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -84,7 +84,7 @@ jobs:
     buildJobName: Build_Windows_Release
     testArtifactName: Transport_Artifacts_Windows_Release
     configuration: Release
-    testArguments: -testDesktop -test64 -helixQueueName Windows.10.Amd64.Server19H1.ES.Open
+    testArguments: -testDesktop -test64 -helixQueueName Windows.10.Amd64.Server2022.ES.Open
 
 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
   - template: eng/pipelines/test-windows-job.yml