From 8d1ccad0686a77f361b1cea5e9a706067458c45b Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Mon, 11 Feb 2019 21:55:42 -0600
Subject: [PATCH] Publish build logs as artifacts and produce a binlog to
 publish to helix (dotnet/corefx#35235)

* Publish build logs as artifacts and produce a binlog to publish to helix

* Flow Configuration property to arcade for logs to be binplaced correctly


Commit migrated from https://github.com/dotnet/corefx/commit/0d5348f8836debced9d7f93a780e07016cf2e83c
---
 eng/pipelines/libraries/corefx-base.yml | 12 +++++++-----
 eng/pipelines/libraries/helix.yml       |  1 +
 eng/pipelines/libraries/windows.yml     |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml
index 251d3ee..b1f95e6 100644
--- a/eng/pipelines/libraries/corefx-base.yml
+++ b/eng/pipelines/libraries/corefx-base.yml
@@ -82,7 +82,7 @@ jobs:
         # Windows variables
         - ${{ if eq(parameters.targetOS, 'Windows_NT') }}:
           - _buildScript: build.cmd
-          - _commonArguments: -ci -includetests
+          - _commonArguments: -ci -includetests -configuration $(_BuildConfig)
           - _msbuildCommand: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -warnaserror:0 -ci
 
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
@@ -104,11 +104,10 @@ jobs:
         # Non-Windows variables
         - ${{ if ne(parameters.targetOS, 'Windows_NT') }}:
           - _buildScript: ${{ job.buildScriptPrefix }}./build.sh
-
+          - _args: --ci -includetests --configuration $(_BuildConfig)
+          - _commonArguments: $(_args)
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-            - _commonArguments: --ci -includetests -stripSymbols
-          - ${{ if eq(parameters.isOfficialBuild, 'false') }}:
-            - _commonArguments: --ci -includetests
+            - _commonArguments: $(_args) -stripSymbols
 
           - _msbuildCommand: ${{ job.buildScriptPrefix }}./eng/common/msbuild.sh --warnaserror false --ci
           - _windowsOfficialBuildArguments: ''
@@ -130,6 +129,9 @@ jobs:
         workspace:
           clean: all
 
+        # enabling publish build artifacts, will publish all build logs under /artifacts/log/
+        enablePublishBuildArtifacts: true
+
         ${{ if ne(job.enableMicrobuild, '') }}:
           enableMicrobuild: ${{ job.enableMicrobuild }}
 
diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml
index 2ec022a..8171d91 100644
--- a/eng/pipelines/libraries/helix.yml
+++ b/eng/pipelines/libraries/helix.yml
@@ -30,6 +30,7 @@ steps:
             /p:Creator=${{ parameters.creator }}
             /p:OfficialBuildId=${{ parameters.officialBuildId }}
             /p:EnableAzurePipelinesReporter=${{ parameters.enableAzurePipelinesReporter }}
+            /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
     displayName: Send to Helix
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
diff --git a/eng/pipelines/libraries/windows.yml b/eng/pipelines/libraries/windows.yml
index d56c6f4..4adfe2c 100644
--- a/eng/pipelines/libraries/windows.yml
+++ b/eng/pipelines/libraries/windows.yml
@@ -167,6 +167,7 @@ jobs:
         enableMicrobuild: ${{ parameters.isOfficialBuild }}
 
         variables:
+          - _outerloop: false
           - ${{ if eq(parameters.isOfficialBuild, 'false') }}:
             - allConfigurationsQueues: Windows.10.Amd64.ClientRS4.Open
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-- 
2.7.4