Merge in 'release/3.1' changes

Author: dotnet-bot

eng/xplat-job.yml

@@ -55,14 +55,10 @@ jobs:
       ${{ if and(eq(parameters.osGroup, 'FreeBSD'), ne(variables['System.TeamProject'], 'public')) }}:
         name: dnceng-freebsd-internal
 
-      # Public OSX Build Pool
-      ${{ if and(eq(parameters.osGroup, 'OSX'), ne(variables['System.TeamProject'], 'public')) }}:
+      # OSX Build Pool
+      ${{ if eq(parameters.osGroup, 'OSX') }}:
         vmImage: macOS-latest
 
-      # Official Build OSX Pool
-      ${{ if and(eq(parameters.osGroup, 'OSX'), eq(variables['System.TeamProject'], 'public')) }}:
-        name: Hosted MacOS
-
       # Official Build Windows Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
         name: NetCore1ESPool-Svc-Internal