From b75d7696de87e582d22fa25334d21a816fff2bff Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 13 Mar 2017 14:51:39 -0700
Subject: [PATCH] Re-insert Supplemental Payload into Helix payload

Commit migrated from https://github.com/dotnet/coreclr/commit/1f73c041fb78a4c246bf098e82dea2496d401599
---
 src/coreclr/tests/helixpublish.proj | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/tests/helixpublish.proj b/src/coreclr/tests/helixpublish.proj
index aa967f1..699e220 100644
--- a/src/coreclr/tests/helixpublish.proj
+++ b/src/coreclr/tests/helixpublish.proj
@@ -14,23 +14,29 @@
     <DummyPackages Include="$(TestWorkingDir)\archive\packages\*" ></DummyPackages>
     <ForUpload Include="@(TestList)" ></ForUpload>
     <ForUpload Include="@(CoreRootUri)" ></ForUpload>
-    <SupplementalPayload Include="@(DummyPackages)" >
-      <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/Packages.zip</RelativeBlobPath>
-    </SupplementalPayload>
   </ItemGroup>
 
   <!-- Define name & location of test JSON blob -->
   <PropertyGroup>
+    <SkipArchive>true</SkipArchive>
     <PayloadTestListFilename>Tests.$(ConfigurationGroup).json</PayloadTestListFilename>
     <PayloadTestListFile>$(TestWorkingDir)$(PayloadTestListFilename)</PayloadTestListFile>
-    <SkipArchive>true</SkipArchive>
   </PropertyGroup>
 
   <Target Name="CreateTestListJson"
           DependsOnTargets="CreateAzureStorage">
 
-    <!-- Define Correlation Payload as a property -->
+    <ItemGroup>
+      <SupplementalPayload Include="@(DummyPackages)" >
+        <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/Packages.zip</RelativeBlobPath>
+      </SupplementalPayload>
+      <CorrelationPayloadUri Include="@(SupplementalPayload->'$(DropUri)%(RelativeBlobPath)$(DropUriReadOnlyToken)')" />
+    </ItemGroup>
+
     <PropertyGroup>
+      <!-- flatten it into a property as msbuild chokes on @(CorrelationPayloadUri) -->
+      <CorrelationPayloadUris>@(CorrelationPayloadUri)</CorrelationPayloadUris>
+      <!-- Define Correlation Payload as a property -->
       <CoreRootUris>$(DropUri)$(Platform)$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(CoreRootUri.Filename)%(CoreRootUri.Extension)$(DropUriReadOnlyToken)</CoreRootUris>
       <CorrelationPayloadProperty>$(CorrelationPayloadUris);$(CoreRootUris)</CorrelationPayloadProperty>
     </PropertyGroup>
-- 
2.7.4