[TESTING ONLY] Testing common changes required for duplicate artifactId

eng/common/pipelines/templates/steps/create-apireview.yml

@@ -1,12 +1,31 @@
 parameters:
-  ArtifactPath: $(Build.ArtifactStagingDirectory)
-  Artifacts: []
-  ConfigFileDir: $(Build.ArtifactStagingDirectory)/PackageInfo
-  MarkPackageAsShipped: false
-  GenerateApiReviewForManualOnly: false
-  ArtifactName: 'packages'
-  PackageName: ''
-  SourceRootPath: $(Build.SourcesDirectory)
+  - name: ArtifactPath
+    type: string
+    default: $(Build.ArtifactStagingDirectory)
+  - name: Artifacts
+    type: object
+    default: []
+  - name: ConfigFileDir
+    type: string
+    default: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: MarkPackageAsShipped
+    type: boolean
+    default: false
+  - name: GenerateApiReviewForManualOnly
+    type: boolean
+    default: false
+  - name: ArtifactName
+    type: string
+    default: 'packages'
+  - name: PackageName
+    type: string
+    default: ''
+  - name: SourceRootPath
+    type: string
+    default: $(Build.SourcesDirectory)
+  - name: PackageInfoFiles
+    type: object
+    default: []
 
 steps:
   # ideally this should be done as initial step of a job in caller template
@@ -16,30 +35,59 @@ steps:
       WorkingDirectory: ${{ parameters.SourceRootPath }}
 
   # Automatic API review is generated for a package when pipeline runs irrespective of how pipeline gets triggered.
-  # Below condition ensures that API review is generated only for manual pipeline runs when flag GenerateApiReviewForManualOnly is set to true. 
+  # Below condition ensures that API review is generated only for manual pipeline runs when flag GenerateApiReviewForManualOnly is set to true.
   - ${{ if or(ne(parameters.GenerateApiReviewForManualOnly, true), eq(variables['Build.Reason'], 'Manual')) }}:
-    - task: Powershell@2
-      inputs:
-        filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
-        arguments: >
-          -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
-          -ArtifactPath '${{parameters.ArtifactPath}}'
-          -ArtifactName ${{ parameters.ArtifactName }}
-          -APIKey '$(azuresdk-apiview-apikey)'
-          -PackageName '${{parameters.PackageName}}'
-          -SourceBranch '$(Build.SourceBranchName)'
-          -DefaultBranch '$(DefaultBranch)'
-          -ConfigFileDir '${{parameters.ConfigFileDir}}'
-          -BuildId '$(Build.BuildId)'
-          -RepoName '$(Build.Repository.Name)'    
-          -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
-        pwsh: true
-      displayName: Create API Review
-      condition: >-
-        and(
-          succeededOrFailed(),
-          ne(variables['Skip.CreateApiReview'], 'true'),
-          ne(variables['Build.Reason'],'PullRequest'),
-          eq(variables['System.TeamProject'], 'internal'),
-          not(endsWith(variables['Build.Repository.Name'], '-pr'))
-        )
+    - ${{ if eq(length(parameters.PackageInfoFiles), 0) }}:
+      - task: Powershell@2
+        inputs:
+          filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
+          arguments: >
+            -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
+            -ArtifactPath '${{parameters.ArtifactPath}}'
+            -ArtifactName ${{ parameters.ArtifactName }}
+            -APIKey '$(azuresdk-apiview-apikey)'
+            -PackageName '${{parameters.PackageName}}'
+            -SourceBranch '$(Build.SourceBranchName)'
+            -DefaultBranch '$(DefaultBranch)'
+            -ConfigFileDir '${{parameters.ConfigFileDir}}'
+            -BuildId '$(Build.BuildId)'
+            -RepoName '$(Build.Repository.Name)'
+            -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
+          pwsh: true
+        displayName: Create API Review
+        condition: >-
+          and(
+            succeededOrFailed(),
+            ne(variables['Skip.CreateApiReview'], 'true'),
+            ne(variables['Build.Reason'],'PullRequest'),
+            eq(variables['System.TeamProject'], 'internal'),
+            not(endsWith(variables['Build.Repository.Name'], '-pr'))
+          )
+    - ${{ else }}:
+      - task: Powershell@2
+        inputs:
+          filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReviewV2.ps1
+          # The .Replace("\", "\\") below is in case this runs on Windows which would have paths like:
+          # D:\a\_work\1/packages-signed/PackageInfo/
+          # and the backslashes in the string, without replacing them with the double would be treated
+          # as escape sequences.
+          arguments: >
+            -PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}'.Replace("\", "\\").Replace("\\", "/") | ConvertFrom-Json -NoEnumerate)
+            -ArtifactPath '${{parameters.ArtifactPath}}'
+            -ArtifactName ${{ parameters.ArtifactName }}
+            -APIKey '$(azuresdk-apiview-apikey)'
+            -SourceBranch '$(Build.SourceBranchName)'
+            -DefaultBranch '$(DefaultBranch)'
+            -BuildId '$(Build.BuildId)'
+            -RepoName '$(Build.Repository.Name)'
+            -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
+          pwsh: true
+        displayName: Create API Review
+        condition: >-
+          and(
+            succeededOrFailed(),
+            ne(variables['Skip.CreateApiReview'], 'true'),
+            ne(variables['Build.Reason'],'PullRequest'),
+            eq(variables['System.TeamProject'], 'internal'),
+            not(endsWith(variables['Build.Repository.Name'], '-pr'))
+          )

eng/common/pipelines/templates/steps/detect-api-changes.yml

@@ -1,8 +1,19 @@
 parameters:
-  ArtifactPath: $(Build.ArtifactStagingDirectory)
-  ArtifactName: 'packages'
-  RepoRoot: $(Build.SourcesDirectory)
-  Condition: true
+  - name: ArtifactPath
+    type: string
+    default: $(Build.ArtifactStagingDirectory)
+  - name: ArtifactName
+    type: string
+    default: 'packages'
+  - name: RepoRoot
+    type: string
+    default: $(Build.SourcesDirectory)
+  - name: UseV2
+    type: boolean
+    default: false
+  - name: Condition
+    type: boolean
+    default: true
 
 steps:
   - pwsh: |
@@ -11,18 +22,37 @@ steps:
     displayName: "Set API change detect request URL"
     condition: and(${{ parameters.Condition}}, eq(variables['ApiChangeDetectRequestUrl'], ''))
 
-  - task: Powershell@2
-    inputs:
-      filePath: ${{ parameters.RepoRoot }}/eng/common/scripts/Detect-Api-Changes.ps1
-      arguments: >
-        -ArtifactPath ${{parameters.ArtifactPath}}
-        -CommitSha '$(System.PullRequest.SourceCommitId)'
-        -BuildId $(Build.BuildId)
-        -PullRequestNumber $(System.PullRequest.PullRequestNumber)
-        -RepoFullName $(Build.Repository.Name)
-        -APIViewUri $(ApiChangeDetectRequestUrl)
-        -ArtifactName ${{ parameters.ArtifactName }}
-        -DevopsProject $(System.TeamProject)
-      pwsh: true
-    displayName: Detect API changes
-    condition: and(${{ parameters.Condition }}, succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))
+  - ${{ if eq(parameters.UseV2, false) }}:
+    - task: Powershell@2
+      inputs:
+        filePath: ${{ parameters.RepoRoot }}/eng/common/scripts/Detect-Api-Changes.ps1
+        arguments: >
+          -ArtifactPath ${{parameters.ArtifactPath}}
+          -CommitSha '$(System.PullRequest.SourceCommitId)'
+          -BuildId $(Build.BuildId)
+          -PullRequestNumber $(System.PullRequest.PullRequestNumber)
+          -RepoFullName $(Build.Repository.Name)
+          -APIViewUri $(ApiChangeDetectRequestUrl)
+          -ArtifactName ${{ parameters.ArtifactName }}
+          -DevopsProject $(System.TeamProject)
+        pwsh: true
+      displayName: Detect API changes
+      condition: and(${{ parameters.Condition }}, succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))
+  - ${{ else }}:
+    # The Detect-Api-ChangesV2.ps1 version calls a different Language-Settings function pointer and
+    # passes around the PackageInfo object instead of pieces of data
+    - task: Powershell@2
+      inputs:
+        filePath: ${{ parameters.RepoRoot }}/eng/common/scripts/Detect-Api-ChangesV2.ps1
+        arguments: >
+          -ArtifactPath ${{parameters.ArtifactPath}}
+          -CommitSha '$(System.PullRequest.SourceCommitId)'
+          -BuildId $(Build.BuildId)
+          -PullRequestNumber $(System.PullRequest.PullRequestNumber)
+          -RepoFullName $(Build.Repository.Name)
+          -APIViewUri $(ApiChangeDetectRequestUrl)
+          -ArtifactName ${{ parameters.ArtifactName }}
+          -DevopsProject $(System.TeamProject)
+        pwsh: true
+      displayName: Detect API changes
+      condition: and(${{ parameters.Condition }}, succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))

eng/common/pipelines/templates/steps/validate-all-packages.yml

@@ -1,7 +1,16 @@
 parameters:
-  ArtifactPath: $(Build.ArtifactStagingDirectory)
-  Artifacts: []
-  ConfigFileDir: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: ArtifactPath
+    type: string
+    default: $(Build.ArtifactStagingDirectory)
+  - name: Artifacts
+    type: object
+    default: []
+  - name: ConfigFileDir
+    type: string
+    default: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: PackageInfoFiles
+    type: object
+    default: []
 
 steps:
  - ${{ if and(ne(variables['Skip.PackageValidation'], 'true'), and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))) }}:
@@ -10,26 +19,49 @@ steps:
       displayName: "Set as release build"
       condition: and(succeeded(), eq(variables['SetAsReleaseBuild'], ''))
 
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: opensource-api-connection
-        scriptType: pscore
-        scriptLocation: inlineScript
-        inlineScript: |
-          $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 `
-            -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) `
-            -ArtifactPath ${{ parameters.ArtifactPath }} `
-            -RepoRoot $(Build.SourcesDirectory) `
-            -APIKey $(azuresdk-apiview-apikey) `
-            -ConfigFileDir '${{ parameters.ConfigFileDir }}' `
-            -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) `
-            -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) `
-            -IsReleaseBuild $$(SetAsReleaseBuild)
-        workingDirectory: $(Pipeline.Workspace)
-      displayName: Validate packages and update work items
-      continueOnError: true
-      condition: >-
-        and(
-          succeededOrFailed(),
-          not(endsWith(variables['Build.Repository.Name'], '-pr'))
-        )
+    - ${{ if eq(length(parameters.PackageInfoFiles), 0) }}:
+      - task: AzureCLI@2
+        inputs:
+          azureSubscription: opensource-api-connection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 `
+              -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) `
+              -ArtifactPath ${{ parameters.ArtifactPath }} `
+              -RepoRoot $(Build.SourcesDirectory) `
+              -APIKey $(azuresdk-apiview-apikey) `
+              -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) `
+              -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) `
+              -IsReleaseBuild $$(SetAsReleaseBuild)
+          workingDirectory: $(Pipeline.Workspace)
+        displayName: Validate packages and update work items
+        continueOnError: true
+        condition: >-
+          and(
+            succeededOrFailed(),
+            not(endsWith(variables['Build.Repository.Name'], '-pr'))
+          )
+    - ${{ else }}:
+      - task: AzureCLI@2
+        inputs:
+          azureSubscription: opensource-api-connection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages2.ps1 `
+              -PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}'.Replace("\", "\\").Replace("\\", "/") | ConvertFrom-Json -NoEnumerate) `
+              -ArtifactPath ${{ parameters.ArtifactPath }} `
+              -RepoRoot $(Build.SourcesDirectory) `
+              -APIKey $(azuresdk-apiview-apikey) `
+              -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) `
+              -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) `
+              -IsReleaseBuild $$(SetAsReleaseBuild)
+          workingDirectory: $(Pipeline.Workspace)
+        displayName: Validate packages and update work items
+        continueOnError: true
+        condition: >-
+          and(
+            succeededOrFailed(),
+            not(endsWith(variables['Build.Repository.Name'], '-pr'))
+          )