check-in generated changes. (#6901) (#6904)

microsoft · Apr 9, 2018 · 9aa8837 · 9aa8837
1 parent f59f47e
commit 9aa8837
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/Tasks/DownloadBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DownloadBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson
@@ -12,6 +12,9 @@
   "loc.input.help.definition": "Select the build definition name",
   "loc.input.label.specificBuildWithTriggering": "When appropriate, download artifacts from the triggering build.",
   "loc.input.help.specificBuildWithTriggering": "If checked, this build task will try to download artifacts from the triggering build. If there is no triggering build from the specified definition, it will download artifacts from the build specified in the options below.",
+  "loc.input.label.buildVersionToDownload": "Build version to download",
+  "loc.input.label.branchName": "Branch name",
+  "loc.input.help.branchName": "Specify to filter on branch/ref name, for example: ```refs/heads/develop```.",
   "loc.input.label.buildId": "Build",
   "loc.input.help.buildId": "The build from which to download the artifacts",
   "loc.input.label.downloadType": "Download type",
@@ -35,5 +38,8 @@
   "loc.messages.ArtifactsSuccessfullyDownloaded": "Successfully downloaded artifacts to %s",
   "loc.messages.RetryingOperation": "Error : in %s, so retrying => retries pending  : %s",
   "loc.messages.OperationFailed": "Failed in %s with error: %s",
-  "loc.messages.ArtifactNameDirectoryNotFound": "Directory '%s' does not exist. Falling back to parent directory: %s"
+  "loc.messages.ArtifactNameDirectoryNotFound": "Directory '%s' does not exist. Falling back to parent directory: %s",
+  "loc.messages.LatestBuildFound": "Latest build found:  %s",
+  "loc.messages.LatestBuildNotFound": "Latest build not found",
+  "loc.messages.LatestBuildFromBranchNotFound": "Latest build from branch %s not found"
 }
diff --git a/Tasks/DownloadBuildArtifacts/task.loc.json b/Tasks/DownloadBuildArtifacts/task.loc.json
@@ -8,7 +8,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 132,
+    "Minor": 133,
     "Patch": 0
   },
   "groups": [
@@ -67,13 +67,35 @@
       "visibleRule": "buildType == specific",
       "helpMarkDown": "ms-resource:loc.input.help.specificBuildWithTriggering"
     },
+    {
+      "name": "buildVersionToDownload",
+      "type": "pickList",
+      "label": "ms-resource:loc.input.label.buildVersionToDownload",
+      "defaultValue": "latest",
+      "visibleRule": "buildType == specific",
+      "required": true,
+      "options": {
+        "latest": "Latest",
+        "latestFromBranch": "Latest from specific branch",
+        "specific": "Specific version"
+      }
+    },
+    {
+      "name": "branchName",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.branchName",
+      "defaultValue": "refs/heads/master",
+      "visibleRule": "buildType == specific && buildVersionToDownload == latestFromBranch",
+      "required": true,
+      "helpMarkDown": "ms-resource:loc.input.help.branchName"
+    },
     {
       "name": "buildId",
       "type": "pickList",
       "label": "ms-resource:loc.input.label.buildId",
       "defaultValue": "",
       "required": true,
-      "visibleRule": "buildType == specific",
+      "visibleRule": "buildType == specific && buildVersionToDownload == specific",
       "properties": {
         "EditableOptions": "True",
         "DisableManageLink": "True"
@@ -196,6 +218,9 @@
     "ArtifactsSuccessfullyDownloaded": "ms-resource:loc.messages.ArtifactsSuccessfullyDownloaded",
     "RetryingOperation": "ms-resource:loc.messages.RetryingOperation",
     "OperationFailed": "ms-resource:loc.messages.OperationFailed",
-    "ArtifactNameDirectoryNotFound": "ms-resource:loc.messages.ArtifactNameDirectoryNotFound"
+    "ArtifactNameDirectoryNotFound": "ms-resource:loc.messages.ArtifactNameDirectoryNotFound",
+    "LatestBuildFound": "ms-resource:loc.messages.LatestBuildFound",
+    "LatestBuildNotFound": "ms-resource:loc.messages.LatestBuildNotFound",
+    "LatestBuildFromBranchNotFound": "ms-resource:loc.messages.LatestBuildFromBranchNotFound"
   }
 }