summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.json15
-rw-r--r--src/publish.proj6
-rw-r--r--src/syncAzure.proj4
-rw-r--r--sync.cmd7
4 files changed, 19 insertions, 13 deletions
diff --git a/config.json b/config.json
index 8e5c06ee00..d519b00dad 100644
--- a/config.json
+++ b/config.json
@@ -441,6 +441,13 @@
"Project": "./src/syncAzure.proj"
}
},
+ "n": {
+ "description": "Downloads test native binaries. The values for '-AzureAccount', '-AzureToken', and '-Container' are required",
+ "settings": {
+ "Project": "./src/syncAzure.proj",
+ "PublishTestNativeBins": "true"
+ }
+ },
"azureToken": {
"description": "Account token to connect to Azure Blob storage.",
"settings": {
@@ -476,12 +483,6 @@
"settings": {
"BuildNumberMinor": "default"
}
- },
- "PublishTestNativeBins": {
- "description": "Downloads Published test native binaries.",
- "settings": {
- "PublishTestNativeBins": "default"
- }
}
},
"defaultValues": {
@@ -608,4 +609,4 @@
"valueTypes": {}
}
}
-}
+} \ No newline at end of file
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" />
diff --git a/sync.cmd b/sync.cmd
index 094d0c1a71..dd089b229d 100644
--- a/sync.cmd
+++ b/sync.cmd
@@ -7,7 +7,6 @@ if /I [%1] == [-help] goto Usage
@if [%1]==[] set __args=-p
@call %~dp0run.cmd sync %__args% %*
- @call %~dp0run.cmd sync -PublishTestNativeBins %__args% %*
@exit /b %ERRORLEVEL%
:Usage
@@ -27,6 +26,12 @@ echo -BuildMajor
echo -BuildMinor
echo To download from a specific container, specify:
echo -Container="container name"
+echo -n - Downloads test native binaries for the specified OS
+echo The following properties are required:
+echo -AzureAccount="Account name"
+echo -AzureToken="Access token"
+echo -Container="container name (with RID suffix)"
+echo.
echo.
echo.
echo If no option is specified then sync.cmd -p is implied. \ No newline at end of file