Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing downloadPath to targetPath and couple of other fields to match V0 #10059

Merged
merged 6 commits into from
Apr 24, 2019
Merged

Changing downloadPath to targetPath and couple of other fields to match V0 #10059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22b8d74
Adding aliases to targetpath
fadnavistanmay Apr 8, 2019
5141aa0
Chaning patch for Download Pipeline Artifact V1 task
fadnavistanmay Apr 9, 2019
6749138
PR comments
fadnavistanmay Apr 9, 2019
ffab781
Resolving conflicts and reverting the pipeline task versions
fadnavistanmay Apr 23, 2019
bae2f79
Fixing version for PublishPipelineArtifact task as well
fadnavistanmay Apr 23, 2019
5db2ba2
Version fix
fadnavistanmay Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/DownloadPipelineArtifactV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 151,
"Minor": 139,
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
"Patch": 0
},
"groups": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPipelineArtifactV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 151,
"Minor": 139,
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
"Patch": 0
},
"groups": [],
Expand Down
8 changes: 4 additions & 4 deletions Tasks/DownloadPipelineArtifactV1/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"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.pipelineId": "Pipeline",
"loc.input.help.pipelineId": "The pipeline from which to download the artifacts.",
"loc.input.label.tags": "Build Tags",
"loc.input.help.tags": "A comma-delimited list of tags. Only builds with these tags will be returned.",
"loc.input.label.artifactName": "Artifact name",
"loc.input.help.artifactName": "The name of the artifact to download.",
"loc.input.label.itemPattern": "Matching pattern",
"loc.input.help.itemPattern": "Specify files to be downloaded as multi line minimatch pattern. [More Information](https://aka.ms/minimatchexamples).</p>",
"loc.input.label.downloadPath": "Destination directory",
"loc.input.help.downloadPath": "Path on the agent machine where the artifacts will be downloaded."
"loc.input.label.targetPath": "Destination directory",
"loc.input.help.targetPath": "Path on the agent machine where the artifacts will be downloaded."
}
18 changes: 12 additions & 6 deletions Tasks/DownloadPipelineArtifactV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"version": {
"Major": 1,
"Minor": 1,
"Patch": 2
"Patch": 1
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
},
"groups": [],
"demands": [],
"preview": true,
"minimumAgentVersion": "2.147.0",
"minimumAgentVersion": "2.150.0",
"inputs": [
{
"name": "buildType",
Expand Down Expand Up @@ -90,7 +90,10 @@
"helpMarkDown": "Specify to filter on branch/ref name, for example: ```refs/heads/develop```."
},
{
"name": "buildId",
"name": "pipelineId",
"aliases": [
"buildId"
],
"type": "pickList",
"label": "Build",
"defaultValue": "",
Expand Down Expand Up @@ -136,7 +139,10 @@
"helpMarkDown": "Specify files to be downloaded as multi line minimatch pattern. [More Information](https://aka.ms/minimatchexamples).</p>"
},
{
"name": "downloadPath",
"name": "targetPath",
"aliases": [
"downloadPath"
],
"type": "string",
"label": "Destination directory",
"defaultValue": "$(System.ArtifactsDirectory)",
Expand Down Expand Up @@ -171,7 +177,7 @@
},
{
"endpointId": "tfs:teamfoundation",
"target": "buildId",
"target": "pipelineId",
"endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/builds?definitions={{definition}}&resultFilter=succeeded,partiallySucceeded&$top=200",
"resultSelector": "jsonpath:$.value[*]",
"parameters": {
Expand All @@ -195,7 +201,7 @@
"instanceNameFormat": "Download Pipeline Artifact",
"execution": {
"AgentPlugin": {
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_0, Agent.Plugins"
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_1, Agent.Plugins"
}
},
"messages": {}
Expand Down
26 changes: 16 additions & 10 deletions Tasks/DownloadPipelineArtifactV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"version": {
"Major": 1,
"Minor": 1,
"Patch": 2
"Patch": 1
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
},
"groups": [],
"demands": [],
"preview": true,
"minimumAgentVersion": "2.147.0",
"minimumAgentVersion": "2.150.0",
"inputs": [
{
"name": "buildType",
Expand Down Expand Up @@ -90,17 +90,20 @@
"helpMarkDown": "ms-resource:loc.input.help.branchName"
},
{
"name": "buildId",
"name": "pipelineId",
"aliases": [
"buildId"
],
"type": "pickList",
"label": "ms-resource:loc.input.label.buildId",
"label": "ms-resource:loc.input.label.pipelineId",
"defaultValue": "",
"required": true,
"visibleRule": "buildType == specific && buildVersionToDownload == specific",
"properties": {
"EditableOptions": "True",
"DisableManageLink": "True"
},
"helpMarkDown": "ms-resource:loc.input.help.buildId"
"helpMarkDown": "ms-resource:loc.input.help.pipelineId"
},
{
"name": "tags",
Expand Down Expand Up @@ -136,12 +139,15 @@
"helpMarkDown": "ms-resource:loc.input.help.itemPattern"
},
{
"name": "downloadPath",
"name": "targetPath",
"aliases": [
"downloadPath"
],
"type": "string",
"label": "ms-resource:loc.input.label.downloadPath",
"label": "ms-resource:loc.input.label.targetPath",
"defaultValue": "$(System.ArtifactsDirectory)",
"required": true,
"helpMarkDown": "ms-resource:loc.input.help.downloadPath"
"helpMarkDown": "ms-resource:loc.input.help.targetPath"
}
],
"dataSourceBindings": [
Expand Down Expand Up @@ -171,7 +177,7 @@
},
{
"endpointId": "tfs:teamfoundation",
"target": "buildId",
"target": "pipelineId",
"endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/builds?definitions={{definition}}&resultFilter=succeeded,partiallySucceeded&$top=200",
"resultSelector": "jsonpath:$.value[*]",
"parameters": {
Expand All @@ -195,7 +201,7 @@
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"execution": {
"AgentPlugin": {
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_0, Agent.Plugins"
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_1, Agent.Plugins"
}
},
"messages": {}
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishPipelineArtifactV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 151,
"Minor": 139,
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
"Patch": 0
},
"groups": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishPipelineArtifactV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 151,
"Minor": 139,
stephenmichaelf marked this conversation as resolved.
Show resolved Hide resolved
"Patch": 0
},
"groups": [],
Expand Down