Update AOT pipeline to no longer require ci parameters

eng/Directory.Build.Common.props

@@ -111,6 +111,7 @@
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">true</EnableSourceLink>
     <DefineConstants Condition="'$(BuildSnippets)' == 'true'">$(DefineConstants);SNIPPET</DefineConstants>
     <AotCompatOptOut>false</AotCompatOptOut>
+    <AotAnalyzersOptOut>false</AotAnalyzersOptOut>
     <ApiCompatBaselineTargetFramework Condition="'$(TargetFramework)' == '$(LtsTargetFramework)'">netstandard2.0</ApiCompatBaselineTargetFramework>
   </PropertyGroup>
 

eng/Directory.Build.Common.targets

@@ -22,7 +22,7 @@
     <PackageRootDirectory>$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory)/../).TrimEnd("/").TrimEnd("\\"))</PackageRootDirectory>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsShippingLibrary)' == 'true' and '$(AotCompatOptOut)' == 'false'">
+  <PropertyGroup Condition="'$(IsShippingLibrary)' == 'true' and '$(AotCompatOptOut)' == 'false' and '$(AotAnalyzersOptOut)' == 'false'">
     <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
@@ -387,7 +387,7 @@
       <ServiceDirectory><![CDATA[$([System.Text.RegularExpressions.Regex]::Replace($(PackageRootDirectory), '^.*[\\/]+sdk[\\/]+([^\\/]+).*$', '$1'))]]></ServiceDirectory>
 
       <!-- Format package info line for output -->
-      <PackageInfoText Condition="'$(IsShippingLibrary)' == 'true'">'$(PackageRootDirectory)' '$(ServiceDirectory)' '$(PackageId)' '$(VersionForProperties)' '$(PackageSdkType)' '$(PackageIsNewSdk)' '$(BaseOutputPath)' '$(AotCompatOptOut)'</PackageInfoText>
+      <PackageInfoText Condition="'$(IsShippingLibrary)' == 'true'">'$(PackageRootDirectory)' '$(ServiceDirectory)' '$(PackageId)' '$(VersionForProperties)' '$(PackageSdkType)' '$(PackageIsNewSdk)' '$(BaseOutputPath)' </PackageInfoText>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsShippingLibrary)' == 'true'">
@@ -401,6 +401,16 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="GetAotCompatOptOut" Returns="@(AotCompatOptOutLine)">
+    <PropertyGroup>
+      <AotCompatOptOutText>$(PackageId):AotCompatOptOut=$(AotCompatOptOut)</AotCompatOptOutText>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(IsShippingLibrary)' == 'true'">
+      <AotCompatOptOutLine Include="$(AotCompatOptOutText)" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="_SetProjectDependsOnInnerTarget">
     <PropertyGroup>
       <InnerTargets>ProjectDependsOnInner</InnerTargets>

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/jobs/ci.yml

@@ -17,12 +17,6 @@ parameters:
   - name: BuildSnippets
     type: boolean
     default: true
-  - name: CheckAOTCompat
-    type: boolean
-    default: false
-  - name: AOTTestInputs
-    type: object
-    default: []
   - name: TestSetupSteps
     type: stepList
     default: []
@@ -75,8 +69,6 @@ jobs:
           TestPipeline: ${{ parameters.TestPipeline }}
           ServiceDirectory: ${{ parameters.ServiceDirectory }}
           SDKType: ${{ parameters.SDKType }}
-          CheckAOTCompat: ${{ parameters.CheckAOTCompat }}
-          AOTTestInputs: ${{ parameters.AOTTestInputs }}
           BuildSnippets: ${{ parameters.BuildSnippets }}
         PreGenerationSteps:
           - template: /eng/pipelines/templates/steps/pr-matrix-presteps.yml
@@ -116,8 +108,6 @@ jobs:
             TestPipeline: ${{ parameters.TestPipeline }}
             ServiceDirectory: ${{ parameters.ServiceDirectory }}
             SDKType: ${{ parameters.SDKType }}
-            CheckAOTCompat: ${{ parameters.CheckAOTCompat }}
-            AOTTestInputs: ${{ parameters.AOTTestInputs }}
 
     - job: "Analyze"
       timeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -17,12 +17,6 @@ parameters:
   - name: BuildSnippets
     type: boolean
     default: true
-  - name: CheckAOTCompat
-    type: boolean
-    default: false
-  - name: AOTTestInputs
-    type: object
-    default: []
   - name: TestSetupSteps
     type: stepList
     default: []
@@ -84,8 +78,6 @@ extends:
               ArtifactName: packages
               LimitForPullRequest: ${{ parameters.LimitForPullRequest }}
               BuildSnippets: ${{ parameters.BuildSnippets }}
-              CheckAOTCompat: ${{ parameters.CheckAOTCompat }}
-              AOTTestInputs: ${{ parameters.AOTTestInputs }}
               TestSetupSteps: ${{ parameters.TestSetupSteps }}
               TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
               MatrixConfigs:

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

@@ -1,7 +1,7 @@
 parameters:
   ServiceDirectory: ''
+  Artifacts: ''
   PackageInfoFolder: ''
-  AOTTestInputs: []
 
 steps:
 
@@ -16,14 +16,14 @@ steps:
         -ProjectNames "$(ProjectNames)"
       workingDirectory: $(Build.SourcesDirectory)/eng/scripts/compatibility
 - ${{ else }}:
-  - ${{ each aotTestInput in parameters.AOTTestInputs }}:
+  - ${{ each artifact in parameters.Artifacts }}:
     - task: Powershell@2
-      displayName: Check for AOT compatibility regressions in ${{ aotTestInput.ArtifactName }}
+      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 ${{ aotTestInput.ArtifactName }}
-          -ExpectedWarningsFilePath ${{ aotTestInput.ExpectedWarningsFilePath }}
+          -PackageName ${{ artifact.name }}
+          -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/Language-Settings.ps1

@@ -51,7 +51,7 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
       continue
     }
 
-    $pkgPath, $serviceDirectory, $pkgName, $pkgVersion, $sdkType, $isNewSdk, $dllFolder, $AotCompatOptOut = $projectOutput.Split("' '", [System.StringSplitOptions]::RemoveEmptyEntries).Trim("' ")
+    $pkgPath, $serviceDirectory, $pkgName, $pkgVersion, $sdkType, $isNewSdk, $dllFolder = $projectOutput.Split("' '", [System.StringSplitOptions]::RemoveEmptyEntries).Trim("' ")
     if(!(Test-Path $pkgPath)) {
       Write-Host "Parsed package path `$pkgPath` does not exist so skipping the package line '$projectOutput'."
       continue
@@ -67,49 +67,6 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
     $ciProps = $pkgProp.GetCIYmlForArtifact()
 
     if ($ciProps) {
-      # First, check if this artifact has baselined warnings in AOTTestInputs
-      $aotArtifacts = GetValueSafelyFrom-Yaml $ciProps.ParsedYml @("extends", "parameters", "AOTTestInputs")
-      $hasBaselinedWarnings = $false
-      if ($aotArtifacts) {
-        $matchingAotArtifact = $aotArtifacts | Where-Object { $_.ArtifactName -eq $pkgProp.ArtifactName }
-        if ($matchingAotArtifact -and $matchingAotArtifact.ExpectedWarningsFilepath) {
-          $hasBaselinedWarnings = $true
-        }
-      }
-
-      # CheckAOTCompat logic: if set in CI.yml, respect that value; 
-      # if artifact has baselined warnings, run AOT checks; 
-      # otherwise use AotCompatOptOut from project settings
-      $shouldAot = GetValueSafelyFrom-Yaml $ciProps.ParsedYml @("extends", "parameters", "CheckAOTCompat")
-      if ($null -ne $shouldAot) {
-        $parsedBool = $null
-        if ([bool]::TryParse($shouldAot, [ref]$parsedBool)) {
-          $pkgProp.CIParameters["CheckAOTCompat"] = $parsedBool
-        }
-      }
-      elseif ($hasBaselinedWarnings) {
-        # If artifact has baselined warnings, enable AOT checks
-        $pkgProp.CIParameters["CheckAOTCompat"] = $true
-      }
-      else {
-        # If not explicitly opted out of AOT compat, run the check
-        $pkgProp.CIParameters["CheckAOTCompat"] = $AotCompatOptOut -ne 'true'
-      }
-
-      # If CheckAOTCompat is true, look for additional AOTTestInputs parameter
-      if ($pkgProp.CIParameters["CheckAOTCompat"]) {
-        if ($aotArtifacts) {
-          $aotArtifacts = $aotArtifacts | Where-Object { $_.ArtifactName -eq $pkgProp.ArtifactName }
-          $pkgProp.CIParameters["AOTTestInputs"] = $aotArtifacts
-        }
-        else {
-          $pkgProp.CIParameters["AOTTestInputs"] = @()
-        }
-      }
-      else {
-        $pkgProp.CIParameters["AOTTestInputs"] = @()
-      }
-
       # BuildSnippets is opt _out_, so we should default to true if not specified
       $shouldSnippet = GetValueSafelyFrom-Yaml $ciProps.ParsedYml @("extends", "parameters", "BuildSnippets")
       if ($null -ne $shouldSnippet) {
@@ -123,11 +80,8 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
       }
     }
     # if the package isn't associated with a CI.yml, we still want to set the defaults values for these parameters
-    # so that when we are checking the package set for which need to "Build Snippets" or "Check AOT" we won't crash due to the property being null
+    # so that when we are checking the package set for which need to "Build Snippets"
     else {
-      # No CI.yml found, use IsAotCompatible from csproj for CheckAOTCompat
-      $pkgProp.CIParameters["CheckAOTCompat"] = $AotCompatOptOut -eq 'false'
-      $pkgProp.CIParameters["AOTTestInputs"] = @()
       $pkgProp.CIParameters["BuildSnippets"] = $true
     }
 

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

@@ -35,23 +35,17 @@ $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)"
+
+    $scriptPath = Join-Path $PSScriptRoot "Check-AOT-Compatibility.ps1"
+    Write-Host "Calling: $scriptPath -ServiceDirectory $($package.ServiceDirectory) -PackageName $($package.ArtifactName)"
+
+    & $scriptPath `
+        -ServiceDirectory $package.ServiceDirectory `
+        -PackageName $package.ArtifactName
+
+    if ($LASTEXITCODE -ne 0) {
+        $failedAotChecks = $true
     }
 }