diff options
author | William Godbe <wigodbe@microsoft.com> | 2017-01-26 16:55:06 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 16:55:06 -0800 |
commit | fbe0c29ed30496eec55910c6bb6c9b1d305ee920 (patch) | |
tree | cbb3484abaa04e7cab0d066733803526e193fa46 /src | |
parent | 427b02caf1efdfb7c4ed1f8070851de564bde839 (diff) | |
download | coreclr-fbe0c29ed30496eec55910c6bb6c9b1d305ee920.tar.gz coreclr-fbe0c29ed30496eec55910c6bb6c9b1d305ee920.tar.bz2 coreclr-fbe0c29ed30496eec55910c6bb6c9b1d305ee920.zip |
Revert "Revert "Speed up test native binary syncing in pipeline""
Diffstat (limited to 'src')
-rw-r--r-- | src/publish.proj | 6 | ||||
-rw-r--r-- | src/syncAzure.proj | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/publish.proj b/src/publish.proj index d4e4a7f24b..b1ef3bbaeb 100644 --- a/src/publish.proj +++ b/src/publish.proj @@ -14,7 +14,7 @@ <ItemGroup> <ForPublishing> <RelativeBlobPath Condition="'$(PublishTestNativeBins)' != 'true'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> - <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__DistroRid)-$(__BuildArch)/$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> + <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> </ForPublishing> </ItemGroup> <Error Condition="'@(ForPublishing)' == ''" Text="No items were found matching pattern '$(PublishPattern)'." /> @@ -30,9 +30,9 @@ Condition="'$(ContainerName)' == '' or '$(PublishTestNativeBins)' == 'true'"> <PropertyGroup> <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' != 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName> - <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-test-native-bins</ContainerName> + <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-$(__DistroRid)-$(__BuildArch)</ContainerName> <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName> - <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-$(__DistroRid)-$(__BuildArch)</ContainerName> </PropertyGroup> </Target> diff --git a/src/syncAzure.proj b/src/syncAzure.proj index 0b71a3bdcd..de468b7bf7 100644 --- a/src/syncAzure.proj +++ b/src/syncAzure.proj @@ -5,8 +5,7 @@ <PropertyGroup> <ContainerNamePrefix Condition="'$(ContainerNamePrefix)' == ''">coreclr-$(PreReleaseLabel)</ContainerNamePrefix> <ContainerName Condition="'$(__Container)' == '' and '$(ContainerNamePrefix)' != '' and '$(BuildNumberMajor)' != '' and '$(BuildNumberMinor)' != ''">$(ContainerNamePrefix)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName> - <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName> - <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName> + <ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName> <DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory> <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins</DownloadDirectory> </PropertyGroup> @@ -16,6 +15,7 @@ <Target Name="ValidateRequiredProperties"> <Error Condition="'$(CloudDropAccountName)' == ''" Text="Missing property CloudDropAccountName." /> <Error Condition="'$(CloudDropAccessToken)' == ''" Text="Missing property CloudDropAccessToken." /> + <Error Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property Container." /> </Target> <Target Name="Build" DependsOnTargets="ValidateRequiredProperties;DownloadBlobsFromAzureTargets" /> |