From ae6703bb526150d2b45fd8fc3f87a7abe96801ec Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Tue, 26 Feb 2019 10:36:11 -0800
Subject: [PATCH] Fix warning conditions to only be emitted when feature is ON

---
 .../download-results/DownloadFromResultsContainer.targets | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
index f0bf9c8e7e7..427c6034981 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
@@ -14,13 +14,15 @@
 
     <PropertyGroup>
       <HelixResultsDestinationDir Condition="'$(HelixResultsDestinationDir)' == '' AND '$(BUILD_SOURCESDIRECTORY)' != ''">$([MSBuild]::NormalizePath('$(BUILD_SOURCESDIRECTORY)', 'artifacts', helixresults'))</HelixResultsDestinationDir>
+
+      <_shouldDownloadResults>false</_shouldDownloadResults>
+      <_shouldDownloadResults Condition="'@(_workItemsWithDownloadMetadata)' != '' AND '$(HelixResultsDestinationDir)' != ''">true</_shouldDownloadResults>
     </PropertyGroup>
 
-    <Warning Text="DownloadFromResultsContainer will be skipped for job %(SentJob.Identity) becaue results container uri is empty" Condition="'%(SentJob.ResultsContainerUri)' == ''" />
-    <Warning Text="DownloadFromResultsContainer will be skipped because HelixResultsDestinationDir is empty" Condition="'$(HelixResultsDestinationDir)' == ''" />
+    <Warning Text="DownloadFromResultsContainer will be skipped for job %(SentJob.Identity) becaue results container uri is empty" Condition="'%(SentJob.ResultsContainerUri)' == '' AND $(_shouldDownloadResults)" />
 
     <DownloadFromResultsContainer
-        Condition="'@(_workItemsWithDownloadMetadata)' != '' AND '%(SentJob.ResultsContainerUri)' != '' AND '$(HelixResultsDestinationDir)' != ''"
+        Condition="$(_shouldDownloadResults) AND '%(SentJob.ResultsContainerUri)' != ''"
         WorkItems="@(_workItemsWithDownloadMetadata)"
         ResultsContainer="%(SentJob.ResultsContainerUri)"
         OutputDirectory="$(HelixResultsDestinationDir)"