diff options
author | William Godbe <wigodbe@microsoft.com> | 2017-01-26 16:55:03 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 16:55:03 -0800 |
commit | 427b02caf1efdfb7c4ed1f8070851de564bde839 (patch) | |
tree | f845c4d81529dc9e9c9bf1642b5c2f72ca641c91 /src | |
parent | 0ff5302eb0fab432c3af5b7277f0f86f2705f7b3 (diff) | |
parent | fdcda4dd6da13d903228a66625fac4d6e2a1afe0 (diff) | |
download | coreclr-427b02caf1efdfb7c4ed1f8070851de564bde839.tar.gz coreclr-427b02caf1efdfb7c4ed1f8070851de564bde839.tar.bz2 coreclr-427b02caf1efdfb7c4ed1f8070851de564bde839.zip |
Merge pull request #9155 from dotnet/revert-9152-SpeedUpSync
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 b1ef3bbaeb..d4e4a7f24b 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'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> + <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__DistroRid)-$(__BuildArch)/$(__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)-$(__DistroRid)-$(__BuildArch)</ContainerName> + <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-test-native-bins</ContainerName> <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName> - <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-$(__DistroRid)-$(__BuildArch)</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName> </PropertyGroup> </Target> diff --git a/src/syncAzure.proj b/src/syncAzure.proj index de468b7bf7..0b71a3bdcd 100644 --- a/src/syncAzure.proj +++ b/src/syncAzure.proj @@ -5,7 +5,8 @@ <PropertyGroup> <ContainerNamePrefix Condition="'$(ContainerNamePrefix)' == ''">coreclr-$(PreReleaseLabel)</ContainerNamePrefix> <ContainerName Condition="'$(__Container)' == '' and '$(ContainerNamePrefix)' != '' and '$(BuildNumberMajor)' != '' and '$(BuildNumberMinor)' != ''">$(ContainerNamePrefix)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName> - <ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName> <DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory> <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins</DownloadDirectory> </PropertyGroup> @@ -15,7 +16,6 @@ <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" /> |