From afb4b8baee2101837c7d0d3dcc23f43bd817df85 Mon Sep 17 00:00:00 2001
From: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com>
Date: Wed, 23 Nov 2022 14:03:19 -0800
Subject: [PATCH] Cherry picking PR that fixes official build. (#6468)

Merging since it has already been validated in the official build and is already in main.
---
 build/vsts-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index 4b82489e6e..15502526f7 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -22,7 +22,7 @@ variables:
   DOTNET_MULTILEVEL_LOOKUP: 0
   Codeql.Enabled: true
   Codeql.SkipTaskAutoInjection: True  #default to not inject CodeQL tasks, we'll enable it in a single job.
-  
+
 stages:
 - stage: build
   displayName: Build
@@ -100,7 +100,7 @@ stages:
     pool:
       vmImage: macOS-12
     steps:
-    - script: brew update && brew unlink python@3.8 && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
+    - script: brew update && brew unlink python@3.8 &&  rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
       displayName: Install build dependencies
     # Only build native assets to avoid conflicts.
     - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
@@ -148,7 +148,7 @@ stages:
       _TeamName: DotNetCore
     pool:
       name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
     # Only build native assets to avoid conflicts.
     - script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:CopyPackageAssets=true
@@ -175,7 +175,7 @@ stages:
       _TeamName: DotNetCore
     pool:
       name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
 
     # Build both native and managed assets.
@@ -227,7 +227,7 @@ stages:
         - NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
         - _SignType: real
         - _TeamName: DotNetCore
-        - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) 
+        - _InternalBuildArgs: /p:DotNetSignType=$(_SignType)
                               /p:TeamName=$(_TeamName)
                               /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
                               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
@@ -235,7 +235,7 @@ stages:
                               /p:DotNetPublishUsingPipelines=$true
       pool:
         name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64
       steps:
 
       # Download all agent packages from all previous phases