diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-03-13 14:51:39 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-03-13 14:51:39 -0700 |
| commit | 1f73c041fb78a4c246bf098e82dea2496d401599 (patch) | |
| tree | 0e6c9b8b46bd684a98de23797466f1399a40ffb7 /tests/helixpublish.proj | |
| parent | 98c0edfa07dc47e2ae4c7d785d3dd122f430bfc8 (diff) | |
| download | coreclr-1f73c041fb78a4c246bf098e82dea2496d401599.tar.gz coreclr-1f73c041fb78a4c246bf098e82dea2496d401599.tar.bz2 coreclr-1f73c041fb78a4c246bf098e82dea2496d401599.zip | |
Re-insert Supplemental Payload into Helix payload
Diffstat (limited to 'tests/helixpublish.proj')
| -rw-r--r-- | tests/helixpublish.proj | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/helixpublish.proj b/tests/helixpublish.proj index aa967f1d48..699e220731 100644 --- a/tests/helixpublish.proj +++ b/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> |