Merge pull request #20215 from dotnet/dougbu/5.0-preview2/newer.agent…

…s.3540 [release/5.0-preview2] Update hosted and BYOC agents used in our builds
dotnet · Mar 9, 2020 · b424608 · b424608
2 parents dee8cbb + ffab4a6
commit b424608
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -53,10 +53,10 @@ stages:
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
                 name: NetCorePublic-Pool
-                queue: BuildPool.Windows.10.Amd64.VS2017.Open
+                queue: BuildPool.Server.Amd64.VS2017.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 name: NetCoreInternal-Pool
-                queue: BuildPool.Windows.10.Amd64.VS2017
+                queue: BuildPool.Server.Amd64.VS2017
             variables:
               - _InternalBuildArgs: ''
               - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -73,10 +73,10 @@ stages:
                   command: custom
                   arguments: 'locals all -clear'
               - script: "echo ##vso[build.addbuildtag]daily-build"
-                condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true'))
+                condition: and(notin(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true'))
                 displayName: 'Set CI tags'
               - script: "echo ##vso[build.addbuildtag]release-candidate"
-                condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['IsFinalBuild'], 'true'))
+                condition: and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['IsFinalBuild'], 'true'))
                 displayName: 'Set CI tags'
               - ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 - task: PowerShell@2
@@ -111,7 +111,7 @@ stages:
           - job: macOS
             enablePublishTestResults: true
             pool:
-              vmImage: macOS-10.13
+              vmImage: macOS-10.14
             steps:
               # HACK: Use an older version to work around #16667
               - bash: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/835ae521c065524abdf66578e68032fa24bce514/Formula/libspatialite.rb
@@ -189,10 +189,10 @@ stages:
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
                 name: NetCorePublic-Pool
-                queue: BuildPool.Windows.10.Amd64.VS2017.Open
+                queue: BuildPool.Server.Amd64.VS2017.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 name: NetCoreInternal-Pool
-                queue: BuildPool.Windows.10.Amd64.VS2017
+                queue: BuildPool.Server.Amd64.VS2017
             variables:
               - name: _HelixBuildConfig
                 value: $(_BuildConfig)