pull across eng/common changes

Author: scbedd

eng/common/pipelines/templates/jobs/generate-job-matrix.yml

@@ -66,7 +66,7 @@ jobs:
       value: $[ coalesce(variables.jobMatrixFilter, '.*') ]
   pool:
     name: ${{ parameters.Pool }}
-    vmImage: ${{ parameters.OsVmImage }}
+    image: ${{ parameters.OsVmImage }}
     os: ${{ parameters.Os }}
   ${{ if parameters.DependsOn }}:
     dependsOn: ${{ parameters.DependsOn }}

eng/common/scripts/Verify-AgentOS.ps1

@@ -12,7 +12,7 @@ if ($IsWindows -and $AgentImage -match "windows|win|MMS\d{4}") {
     $osName = "Windows"
 } elseif ($IsLinux -and $AgentImage -match "ubuntu|linux") {
     $osName = "Linux"
-} elseif ($IsMacOs -and $AgentImage -match "macos") {
+} elseif ($IsMacOs -and $AgentImage -match "macos|macOS") {
     $osName = "macOS"
 } else {
     Throw-InvalidOperatingSystem