From c6bcc53a5fa8ca17c7c3092aeb865e8d932b44fe Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Tue, 12 Jan 2021 10:06:24 -0800
Subject: [PATCH 1/2] Reorder aggregate-report Steps

---
 eng/pipelines/aggregate-reports.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
index 61037d1310187..36b28967a4c7c 100644
--- a/eng/pipelines/aggregate-reports.yml
+++ b/eng/pipelines/aggregate-reports.yml
@@ -17,11 +17,6 @@ jobs:
       vmImage: 'ubuntu-18.04'
     steps:
 
-    - template: ../common/pipelines/templates/steps/verify-links.yml
-      parameters:
-        Directory: ""
-        CheckLinkGuidance: $true
-
     # We `install` the code quality reports tooling into our local m2 cache separately from building the Maven project
     # reports. This means it is available as part of that, but also so that this is not documented in the project report.
     - template: templates/steps/install-reporting-tools.yml
@@ -44,7 +39,8 @@ jobs:
     - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
       # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR
       # builds should be sufficient.
-      condition: and(succeededOrFailed(), ne(variables['Build.Reason'], 'PullRequest'))
+      # Only run if building all libraries succeeded.
+      condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
       displayName: 'Component Detection'
 
     - task: Maven@3
@@ -98,6 +94,14 @@ jobs:
         Copy-Item data.js $(Build.ArtifactStagingDirectory)/staging
       displayName: 'Copy reports to artifact staging'
 
+    # Run link verification at the end as it will run no matter the pipeline passing or failing.
+    # If this task fails with an error it shouldn't prevent aggregate reports from being generated.
+    - template: ../common/pipelines/templates/steps/verify-links.yml
+      condition: succeededOrFailed()
+      parameters:
+        Directory: ""
+        CheckLinkGuidance: $true
+
     - publish: $(Build.ArtifactStagingDirectory)
       condition: succeededOrFailed()
       displayName: 'Publish Report Artifacts'

From d780a4c643db55e0e09fe88af8c7307581f516e7 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Tue, 12 Jan 2021 11:26:47 -0800
Subject: [PATCH 2/2] Remove invalid condition from template step

---
 eng/pipelines/aggregate-reports.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
index 36b28967a4c7c..92265faca5c88 100644
--- a/eng/pipelines/aggregate-reports.yml
+++ b/eng/pipelines/aggregate-reports.yml
@@ -97,7 +97,6 @@ jobs:
     # Run link verification at the end as it will run no matter the pipeline passing or failing.
     # If this task fails with an error it shouldn't prevent aggregate reports from being generated.
     - template: ../common/pipelines/templates/steps/verify-links.yml
-      condition: succeededOrFailed()
       parameters:
         Directory: ""
         CheckLinkGuidance: $true