Remove intermediate sync for test build (#14775)
authorKarthik Rajasekaran <karajas@microsoft.com>
Wed, 1 Nov 2017 03:44:27 +0000 (20:44 -0700)
committerGitHub <noreply@github.com>
Wed, 1 Nov 2017 03:44:27 +0000 (20:44 -0700)
buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
tests/dir.props

index 6901c36..112c7d8 100644 (file)
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Sync test native binaries",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "sync.cmd",
-        "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -RuntimeId=$(Rid) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid) -- /p:DownloadDirectory=$(Build.SourcesDirectory)/packages/TestNativeBins/$(Rid)",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
-    {
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
       "displayName": "Generate version props file",
       "timeoutInMinutes": 0,
       "task": {
index f676a7e..0d00f65 100644 (file)
@@ -89,8 +89,8 @@
       https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json;
       $(RestoreSources)
     </RestoreSources>
-    <RestoreSources Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
-      $(PackagesDir)AzureTransfer\;
+    <RestoreSources Condition="'$(IntermediateAzureFeed)' != ''">
+      $(IntermediateAzureFeed);
       $(RestoreSources)
     </RestoreSources>
   </PropertyGroup>