Download native binaries into a folder named 'RID'

Commit migrated from https://github.com/dotnet/coreclr/commit/60422521a182dc51d31911c941bdf7b39d45632a

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index 66b9566..85753ab 100644 (file)
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -224,8 +224,8 @@ if defined __RuntimeId (
     )
 
     call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -CreateNonWindowsTestOverlay -RuntimeId="%__RuntimeId%"  -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs%
-    for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.so) do copy %%f %Core_Overlay%
-    for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.dylib) do copy %%f %Core_Overlay%
+    for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.so) do copy %%f %Core_Overlay%
+    for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.dylib) do copy %%f %Core_Overlay%
 
     echo %__MsgPrefix% Created the runtime layout for %__RuntimeId% in %CORE_OVERLAY%
 )

diff --git a/src/coreclr/config.json b/src/coreclr/config.json
index d519b00..be0b4bd 100644 (file)
--- a/src/coreclr/config.json
+++ b/src/coreclr/config.json
@@ -466,6 +466,12 @@
             "__Container": "default"
           }
         },
+        "runtimeId": {
+          "description": "Runtime ID of the binaries in the specified container.",
+          "settings": {
+            "RuntimeId": "default"
+          }
+        },
         "verbose": {
           "description": "Passes /flp:v=diag to the msbuild command or the value passed by the user.",
           "settings": {

diff --git a/src/coreclr/src/syncAzure.proj b/src/coreclr/src/syncAzure.proj
index 9c262b3..a5bb495 100644 (file)
--- a/src/coreclr/src/syncAzure.proj
+++ b/src/coreclr/src/syncAzure.proj
@@ -8,7 +8,7 @@
     <ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName>
     <ContainerName>$(ContainerName.Replace(".","-"))</ContainerName>
     <DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory>
-    <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins</DownloadDirectory>
+    <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins\$(RuntimeId)</DownloadDirectory>
   </PropertyGroup>
 
   <Import Project="$(ToolsDir)SyncCloudContent.targets" />
@@ -17,6 +17,7 @@
     <Error Condition="'$(CloudDropAccountName)' == ''" Text="Missing property CloudDropAccountName." />
     <Error Condition="'$(CloudDropAccessToken)' == ''" Text="Missing property CloudDropAccessToken." />
     <Error Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property Container." />
+    <Error Condition="'$(RuntimeId)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property RuntimeId." />
   </Target>
 
   <Target Name="Build" DependsOnTargets="ValidateRequiredProperties;DownloadBlobsFromAzureTargets" />

diff --git a/src/coreclr/sync.cmd b/src/coreclr/sync.cmd
index dd089b2..f633155 100644 (file)
--- a/src/coreclr/sync.cmd
+++ b/src/coreclr/sync.cmd
@@ -26,11 +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     -n     - Downloads test native binaries from the specified container
 echo              The following properties are required:
 echo                 -AzureAccount="Account name"
 echo                 -AzureToken="Access token"
-echo                 -Container="container name (with RID suffix)"
+echo                 -Container="Container name"
+echo                 -RuntimeId="RID" (Needs to match what's in the container)
 echo.
 echo.
 echo.