From ad1a2ce41151c59b66f90fc4c18ecd331e211246 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Tue, 26 Oct 2021 12:42:20 -0700
Subject: [PATCH 1/2] Use VS2022 images when building Roslyn in CI

---
 azure-pipelines-official.yml      | 2 +-
 azure-pipelines-pr-validation.yml | 8 ++++----
 azure-pipelines-richnav.yml       | 2 +-
 azure-pipelines.yml               | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 6572395e03a4c..50cb7a28913f7 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -83,7 +83,7 @@ stages:
     timeoutInMinutes: 360
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
 
     steps:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
diff --git a/azure-pipelines-pr-validation.yml b/azure-pipelines-pr-validation.yml
index 494eceff5837c..e8a377024d3f0 100644
--- a/azure-pipelines-pr-validation.yml
+++ b/azure-pipelines-pr-validation.yml
@@ -49,7 +49,7 @@ stages:
     timeoutInMinutes: 360
     # Conditionally set build pool so we can share this YAML when building with different pipeline
     pool:
-      name: VSEngSS-MicroBuild2017
+      name: VSEngSS-MicroBuild2022-1ES
       demands:
       - msbuild
       - visualstudio
@@ -210,7 +210,7 @@ stages:
   displayName: Create Insertion
   dependsOn:
     - build
-  
+
   jobs:
   - job: insert
     displayName: Insert to VS
@@ -220,7 +220,7 @@ stages:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
       displayName: Setting SourceBranchName variable
       condition: succeeded()
-      
+
     - template: eng/pipelines/insert.yml
       parameters:
         createDraftPR: true
@@ -232,4 +232,4 @@ stages:
         titlePrefix: ${{ parameters.OptionalTitlePrefix }}
         sourceBranch: $(SourceBranchName)
         publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
-  
+
diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml
index 4bf52240ca699..545a8f43fcf7a 100644
--- a/azure-pipelines-richnav.yml
+++ b/azure-pipelines-richnav.yml
@@ -20,7 +20,7 @@ jobs:
 - job: RichCodeNav_Indexing
   pool:
     name: NetCore1ESPool-Svc-Public
-    demands: ImageOverride -equals Build.Windows.10.Amd64.Open
+    demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
   variables:
     EnableRichCodeNavigation: true
   timeoutInMinutes: 200
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d4db92b9a244b..e063d38e743f8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,14 +21,14 @@ jobs:
     jobName: Build_Windows_Debug
     testArtifactName: Transport_Artifacts_Windows_Debug
     configuration: Debug
-    queueName: Build.Windows.10.Amd64.Open
+    queueName: Build.Windows.Amd64.VS2022.Pre.Open
 
 - template: eng/pipelines/build-windows-job.yml
   parameters:
     jobName: Build_Windows_Release
     testArtifactName: Transport_Artifacts_Windows_Release
     configuration: Release
-    queueName: Build.Windows.10.Amd64.Open
+    queueName: Build.Windows.Amd64.VS2022.Pre.Open
 
 - template: eng/pipelines/test-windows-job.yml
   parameters:
@@ -202,7 +202,7 @@ jobs:
 - job: Correctness_Rebuild
   pool:
     name: NetCore1ESPool-Svc-Public
-    demands: ImageOverride -equals Build.Windows.10.Amd64.Open
+    demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
   timeoutInMinutes: 90
   steps:
     - template: eng/pipelines/checkout-windows-task.yml

From 9d8a6d92e1759326061f376d7f02a1b61189354f Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Tue, 26 Oct 2021 12:52:39 -0700
Subject: [PATCH 2/2] Fix image name

---
 azure-pipelines-official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 50cb7a28913f7..b4a25c41026e9 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -83,7 +83,7 @@ stages:
     timeoutInMinutes: 360
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
+      demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
 
     steps:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"