From 4eaf8ab130537ebb1a021d412ed86f89882dc78a Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 2 Nov 2021 08:52:17 -0500
Subject: [PATCH] Merge pull request #12562 from MichaelSimons/ci-improvements

Enable offline build and capture artifacts in PR validation
---
 .../job/source-build-run-tarball-build.yml      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
index 328623660..138e0c7db 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
@@ -27,13 +27,9 @@ jobs:
       Fedora33-Online:
         _runOnline: true
         _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
-
-      # TODO: Don't run offline in Pr validation until prebuilts are stabilized/removed, otherwise dependency flow continuously breaks PR validation.
-      # https://github.com/dotnet/source-build/issues/2490
-      ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-        Fedora33-Offline:
-          _runOnline: false
-          _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
+      Fedora33-Offline:
+        _runOnline: false
+        _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
   timeoutInMinutes: 210
   variables:
     _TarballDir: $(Build.StagingDirectory)/tarball
@@ -85,10 +81,9 @@ jobs:
       docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true
     displayName: Build Tarball
 
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/'
-      artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
-      displayName: Publish Source Build Artifacts
+  - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/'
+    artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
+    displayName: Publish Source Build Artifacts
 
   - script: |
       set -x