Merge pull request #63742 from dotnet/merges/release/dev17.2-to-relea…

…se/dev17.3 Merge release/dev17.2 to release/dev17.3
dotnet · Sep 1, 2022 · 84458a4 · 84458a4
2 parents 38bbaff + 31d4c6d
commit 84458a4
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/azure-pipelines-integration-lsp.yml b/azure-pipelines-integration-lsp.yml
@@ -2,47 +2,47 @@
 
 # Branches that trigger a build on commit
 trigger:
-  include:
-  - main
-  - main-vs-deps
-  - release/*
-  - features/*
-  - demos/*
-  exclude:
-  # Since the version of VS on the integration VM images are a moving target,
-  # we are unable to reliably run integration tests on servicing branches.
-  - release/dev17.0-vs-deps
-  - release/dev17.2
-  - release/dev17.3
+  branches:
+    include:
+    - main
+    - main-vs-deps
+    - release/*
+    - features/*
+    - demos/*
+    exclude:
+    # Since the version of VS on the integration VM images are a moving target,
+    # we are unable to reliably run integration tests on servicing branches.
+    - release/dev17.0-vs-deps
+    - release/dev17.2
+    - release/dev17.3
 
 # Branches that are allowed to trigger a build via /azp run.
 # Automatic building of all PRs is disabled in the pipeline's trigger page.
 # See https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#comment-triggers
 pr:
-  include:
-  - main
-  - main-vs-deps
-  - release/*
-  - features/*
-  - demos/*
-  exclude:
-  # Since the version of VS on the integration VM images are a moving target,
-  # we are unable to reliably run integration tests on servicing branches.
-  - release/dev17.0-vs-deps
-  - release/dev17.2
-  - release/dev17.3
+  branches:
+    include:
+    - main
+    - main-vs-deps
+    - release/*
+    - features/*
+    - demos/*
+    exclude:
+    # Since the version of VS on the integration VM images are a moving target,
+    # we are unable to reliably run integration tests on servicing branches.
+    - release/dev17.0-vs-deps
+    - release/dev17.2
+    - release/dev17.3
 
 variables:
 - name: XUNIT_LOGS
   value: $(Build.SourcesDirectory)\artifacts\log\$(_configuration)
-- name: queueName
-  value: windows.vs2022.amd64.open  
 
 jobs:
 - job: VS_Integration_LSP
   pool:
-    name: NetCore-Public
-    demands: ImageOverride -equals $(queueName)
+    name: NetCore-Svc-Public
+    demands: ImageOverride -equals windows.vs2022.amd64.open
   timeoutInMinutes: 150
 
   steps:

diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -45,7 +45,7 @@ pr:
 
 variables:
 - name: poolName
-  value: NetCore-Public
+  value: NetCore-Svc-Public
 - name: queueName
   value: windows.vs2022.amd64.open 
 

diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml
@@ -19,8 +19,8 @@ pr: none
 jobs:
 - job: RichCodeNav_Indexing
   pool:
-    name: NetCore-Public
-    demands: ImageOverride -equals windows.vs2022preview.amd64.open
+    name: NetCore-Svc-Public
+    demands: ImageOverride -equals windows.vs2022.amd64.open
   variables:
     EnableRichCodeNavigation: true
   timeoutInMinutes: 260

diff --git a/eng/pipelines/build-unix-job.yml b/eng/pipelines/build-unix-job.yml
@@ -20,7 +20,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   pool:
     ${{ if ne(parameters.queueName, '') }}:
-      name: NetCore-Public
+      name: NetCore-Svc-Public
       demands: ImageOverride -equals ${{ parameters.queueName }}
 
     ${{ if ne(parameters.vmImageName, '') }}:

diff --git a/eng/pipelines/build-windows-job.yml b/eng/pipelines/build-windows-job.yml
@@ -23,7 +23,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   pool:
     ${{ if ne(parameters.queueName, '') }}:
-      name: NetCore-Public
+      name: NetCore-Svc-Public
       demands: ImageOverride -equals ${{ parameters.queueName }}
 
     ${{ if ne(parameters.vmImageName, '') }}:

diff --git a/eng/pipelines/test-unix-job-single-machine.yml b/eng/pipelines/test-unix-job-single-machine.yml
@@ -30,7 +30,7 @@ jobs:
   dependsOn: ${{ parameters.buildJobName }}
   pool:
     ${{ if ne(parameters.queueName, '') }}:
-      name: NetCore-Public
+      name: NetCore-Svc-Public
       demands: ImageOverride -equals ${{ parameters.queueName }}
 
     ${{ if ne(parameters.vmImageName, '') }}:

diff --git a/eng/pipelines/test-windows-job-single-machine.yml b/eng/pipelines/test-windows-job-single-machine.yml
@@ -26,7 +26,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   dependsOn: ${{ parameters.buildJobName }}
   pool:
-    name: NetCore-Public
+    name: NetCore-Svc-Public
     demands: ImageOverride -equals ${{ parameters.queueName }}
   timeoutInMinutes: 120
   variables: