Merge pull request #13845 from dotnet/merges/release/dev17.3-to-main

Merge release/dev17.3 to main

azure-pipelines.yml

@@ -447,7 +447,7 @@ stages:
         - job: MacOS
           condition: eq(1,2)
           pool:
-            vmImage: $(MacOSMachineQueueName)
+            vmImage: macos-11
           variables:
           - name: _SignType
             value: Test
@@ -578,7 +578,7 @@ stages:
         - job: Plain_Build_MacOS
           condition: eq(1,2)
           pool:
-            vmImage: $(MacOSMachineQueueName)
+            vmImage: macos-11
           variables:
           - name: _BuildConfig
             value: Debug

eng/common/templates/job/source-index-stage1.yml

@@ -29,7 +29,7 @@ jobs:
     pool:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCore-Public
-        demands: ImageOverride -equals windows.vs2019.amd64.open
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         name: NetCore1ESPool-Internal
         demands: ImageOverride -equals windows.vs2019.amd64