more yml updates

eng/pipelines/pullrequest.yml

@@ -35,7 +35,6 @@ extends:
       ServiceDirectory: template
     ${{ else }}:
       ServiceDirectory: ${{ parameters.Service }}
-    CheckAOTCompat: true
     BuildSnippets: true
     ExcludePaths:
       - eng/packages/http-client-csharp/

eng/pipelines/templates/jobs/batched-build-analyze.yml

@@ -11,12 +11,6 @@ parameters:
   - name: SDKType
     type: string
     default: all
-  - name: CheckAOTCompat
-    type: boolean
-    default: false
-  - name: AOTTestInputs
-    type: object
-    default: []
   - name: BuildSnippets
     type: boolean
     default: true
@@ -66,8 +60,6 @@ jobs:
           TestPipeline: ${{ parameters.TestPipeline }}
           ServiceDirectory: ${{ parameters.ServiceDirectory }}
           SDKType: ${{ parameters.SDKType }}
-          CheckAOTCompat: ${{ parameters.CheckAOTCompat }}
-          AOTTestInputs: ${{ parameters.AOTTestInputs }}
 
   - job:
     displayName: "Analyze"

eng/pipelines/templates/steps/aot-compatibility.yml

@@ -1,14 +1,30 @@
 parameters:
   ServiceDirectory: ''
+  Artifacts: ''
   PackageInfoFolder: ''
 
 steps:
-- task: Powershell@2
-  displayName: Check for AOT compatibility regressions for PR
-  inputs:
-    targetType: filepath
-    filePath: $(Build.SourcesDirectory)/eng/scripts/compatibility/Check-AOT-Compatibility-For-PR.ps1
-    arguments: >-
-      -PackageInfoFolder "${{ parameters.PackageInfoFolder }}"
-      -ProjectNames "$(ProjectNames)"
-    workingDirectory: $(Build.SourcesDirectory)/eng/scripts/compatibility
+
+- ${{ if eq(parameters.ServiceDirectory, 'auto') }}:
+  - task: Powershell@2
+    displayName: Check for AOT compatibility regressions for PR
+    inputs:
+      targetType: filepath
+      filePath: $(Build.SourcesDirectory)/eng/scripts/compatibility/Check-AOT-Compatibility-For-PR.ps1
+      arguments: >-
+        -PackageInfoFolder "${{ parameters.PackageInfoFolder }}"
+        -ProjectNames "$(ProjectNames)"
+      workingDirectory: $(Build.SourcesDirectory)/eng/scripts/compatibility
+- ${{ else }}:
+  - ${{ each artifact in parameters.Artifacts }}:
+    - task: Powershell@2
+      displayName: Check for AOT compatibility regressions in ${{ artifact.name }}
+      inputs:
+        targetType: filepath
+        filePath: $(Build.SourcesDirectory)/eng/scripts/compatibility/Check-AOT-Compatibility.ps1
+        arguments: >-
+          -ServiceDirectory ${{ parameters.ServiceDirectory }}
+          -PackageName ${{ artifact.name }}
+          ${{ if ne(artifact.directoryName, '') }}:
+          -DirectoryName ${{ artifact.directoryName }}
+        workingDirectory: $(Build.SourcesDirectory)/eng/scripts/compatibility

eng/pipelines/templates/steps/build.yml

@@ -11,12 +11,6 @@ parameters:
   - name: SDKType
     type: string
     default: all
-  - name: CheckAOTCompat
-    type: boolean
-    default: false
-  - name: AOTTestInputs
-    type: object
-    default: []
   - name: BuildSnippets
     type: boolean
     default: true
@@ -153,12 +147,11 @@ steps:
       LibType: 'client'
       PackageInfoFolder: '$(Build.ArtifactStagingDirectory)/PackageInfo'
 
-  - ${{ if eq(parameters.CheckAOTCompat, 'true') }}:
-    - template: /eng/pipelines/templates/steps/aot-compatibility.yml
-      parameters:
-        ServiceDirectory: ${{ parameters.ServiceDirectory }}
-        AOTTestInputs: ${{ parameters.AOTTestInputs }}
-        PackageInfoFolder: '$(Build.ArtifactStagingDirectory)/PackageInfo'
+  - template: /eng/pipelines/templates/steps/aot-compatibility.yml
+    parameters:
+      ServiceDirectory: ${{ parameters.ServiceDirectory }}
+      Artifacts: ${{ parameters.Artifacts }}
+      PackageInfoFolder: '$(Build.ArtifactStagingDirectory)/PackageInfo'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: "Component Detection"

eng/scripts/compatibility/Check-AOT-Compatibility-For-PR.ps1

@@ -35,23 +35,14 @@ $filteredPackages = Get-ChildItem -Path $PackageInfoFolder -Filter "*.json" -Fil
 
 $failedAotChecks = $false
 foreach ($package in $filteredPackages) {
-    if ($package.CIParameters.CheckAOTCompat) {
-        Write-Host "Running Check-AOT-Compatibility.ps1 for Package: $($package.ArtifactName) Service $($package.ServiceDirectory)"
-
-        # Check if AOTTestInputs exists and has ExpectedWarningsFilePath, otherwise use "None"
-        $expectedWarningsFilePath = "None"
-        if ($package.CIParameters.AOTTestInputs -and $package.CIParameters.AOTTestInputs.ExpectedWarningsFilePath) {
-            $expectedWarningsFilePath = $package.CIParameters.AOTTestInputs.ExpectedWarningsFilePath
-        }
-
-        & $PSScriptRoot/Check-AOT-Compatibility.ps1 `
-            -PackageName $package.ArtifactName `
-            -ServiceDirectory $package.ServiceDirectory `
-            -ExpectedWarningsFilePath $expectedWarningsFilePath
-
-        if ($LASTEXITCODE -ne 0) {
-            $failedAotChecks = $true
-        }
+    Write-Host "Running Check-AOT-Compatibility.ps1 for Package: $($package.ArtifactName) Service $($package.ServiceDirectory)"
+
+    & $PSScriptRoot/Check-AOT-Compatibility.ps1 `
+        -PackageName $package.ArtifactName `
+        -ServiceDirectory $package.ServiceDirectory `
+
+    if ($LASTEXITCODE -ne 0) {
+        $failedAotChecks = $true
     }
 }
 

eng/scripts/compatibility/Check-AOT-Compatibility.ps1

@@ -1,7 +1,6 @@
 param(
   [string]$ServiceDirectory,
   [string]$PackageName,
-  [string]$ExpectedWarningsFilePath,
   [string]$DirectoryName = "")
 
 ### Check if AOT compatibility is opted out ###