Merge pull request #8406 from johnbeisner/OrchestratedBuild

Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used.
This commit is contained in:
John Beisner 2018-01-16 11:35:44 -08:00 committed by GitHub
commit 501e11d928
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -39,7 +39,8 @@
PublishNupkgToBlobFeed; PublishNupkgToBlobFeed;
PublishCliVersionBadge" /> PublishCliVersionBadge" />
<Target Name="GatherItemsForPattern"> <Target Name="GatherItemsForPattern"
DependsOnTargets="SetAzureProps">
<ItemGroup> <ItemGroup>
<ForPublishing Include="@(GeneratedInstallers)" <ForPublishing Include="@(GeneratedInstallers)"
Condition=" '$(PublishNativeInstallers)' == 'true' "/> Condition=" '$(PublishNativeInstallers)' == 'true' "/>
@ -60,7 +61,8 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="PublishCliVersionBadge"> <Target Name="PublishCliVersionBadge"
DependsOnTargets="SetAzureProps">
<ItemGroup> <ItemGroup>
<CliVersionBadgeToUpload Include="$(VersionBadge)" /> <CliVersionBadgeToUpload Include="$(VersionBadge)" />
<CliVersionBadgeToUpload Include="$(CoherentBadge)" <CliVersionBadgeToUpload Include="$(CoherentBadge)"