From 2dd1d4cab3b15e1e423e423e088600fecee74bab Mon Sep 17 00:00:00 2001 From: David Staheli Date: Sat, 28 Apr 2018 15:50:13 -0400 Subject: [PATCH 1/2] Simplify repetitive YAML of PublishBuildArtirfacts with default values --- Tasks/PublishBuildArtifacts/task.json | 8 ++++---- Tasks/PublishBuildArtifacts/task.loc.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tasks/PublishBuildArtifacts/task.json b/Tasks/PublishBuildArtifacts/task.json index 3bd67c576534..381aef04d12d 100644 --- a/Tasks/PublishBuildArtifacts/task.json +++ b/Tasks/PublishBuildArtifacts/task.json @@ -11,7 +11,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 133, + "Minor": 135, "Patch": 0 }, "demands": [], @@ -21,7 +21,7 @@ "name": "PathtoPublish", "type": "filePath", "label": "Path to publish", - "defaultValue": "", + "defaultValue": "$(Build.ArtifactStagingDirectory)", "required": true, "helpMarkDown": "The folder or file path to publish. This can be a fully-qualified path or a path relative to the root of the repository. Wildcards are not supported. [Variables](https://go.microsoft.com/fwlink/?LinkID=550988) are supported. Example: $(Build.ArtifactStagingDirectory)" }, @@ -29,7 +29,7 @@ "name": "ArtifactName", "type": "string", "label": "Artifact name", - "defaultValue": "", + "defaultValue": "artifact", "required": true, "helpMarkDown": "The name of the artifact to create in the publish location" }, @@ -38,7 +38,7 @@ "aliases": [ "publishLocation" ], "type": "pickList", "label": "Artifact publish location", - "defaultValue": "", + "defaultValue": "Container", "required": true, "helpMarkDown": "Choose whether to store the artifact in Visual Studio Team Services/TFS, or to copy it to a file share that must be accessible from the build agent.", "options": { diff --git a/Tasks/PublishBuildArtifacts/task.loc.json b/Tasks/PublishBuildArtifacts/task.loc.json index 6c0e7dde0fa9..b286de8673d9 100644 --- a/Tasks/PublishBuildArtifacts/task.loc.json +++ b/Tasks/PublishBuildArtifacts/task.loc.json @@ -11,7 +11,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 133, + "Minor": 135, "Patch": 0 }, "demands": [], @@ -21,7 +21,7 @@ "name": "PathtoPublish", "type": "filePath", "label": "ms-resource:loc.input.label.PathtoPublish", - "defaultValue": "", + "defaultValue": "$(Build.ArtifactStagingDirectory)", "required": true, "helpMarkDown": "ms-resource:loc.input.help.PathtoPublish" }, @@ -29,7 +29,7 @@ "name": "ArtifactName", "type": "string", "label": "ms-resource:loc.input.label.ArtifactName", - "defaultValue": "", + "defaultValue": "artifact", "required": true, "helpMarkDown": "ms-resource:loc.input.help.ArtifactName" }, @@ -40,7 +40,7 @@ ], "type": "pickList", "label": "ms-resource:loc.input.label.ArtifactType", - "defaultValue": "", + "defaultValue": "Container", "required": true, "helpMarkDown": "ms-resource:loc.input.help.ArtifactType", "options": { From 46343a429fa35ebd0dad8e2c89a4d273786855f4 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Sun, 29 Apr 2018 18:48:37 -0400 Subject: [PATCH 2/2] Change artifact name back to 'drop' --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/PublishBuildArtifacts/task.json | 4 ++-- Tasks/PublishBuildArtifacts/task.loc.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/PublishBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson b/Tasks/PublishBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson index 068b9bc6e568..fc6fa0d71a6f 100644 --- a/Tasks/PublishBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/PublishBuildArtifacts/Strings/resources.resjson/en-US/resources.resjson @@ -6,7 +6,7 @@ "loc.input.label.PathtoPublish": "Path to publish", "loc.input.help.PathtoPublish": "The folder or file path to publish. This can be a fully-qualified path or a path relative to the root of the repository. Wildcards are not supported. [Variables](https://go.microsoft.com/fwlink/?LinkID=550988) are supported. Example: $(Build.ArtifactStagingDirectory)", "loc.input.label.ArtifactName": "Artifact name", - "loc.input.help.ArtifactName": "The name of the artifact to create in the publish location", + "loc.input.help.ArtifactName": "The name of the artifact to create in the publish location.", "loc.input.label.ArtifactType": "Artifact publish location", "loc.input.help.ArtifactType": "Choose whether to store the artifact in Visual Studio Team Services/TFS, or to copy it to a file share that must be accessible from the build agent.", "loc.input.label.TargetPath": "File share path", diff --git a/Tasks/PublishBuildArtifacts/task.json b/Tasks/PublishBuildArtifacts/task.json index 381aef04d12d..04e4d1e9843c 100644 --- a/Tasks/PublishBuildArtifacts/task.json +++ b/Tasks/PublishBuildArtifacts/task.json @@ -29,9 +29,9 @@ "name": "ArtifactName", "type": "string", "label": "Artifact name", - "defaultValue": "artifact", + "defaultValue": "drop", "required": true, - "helpMarkDown": "The name of the artifact to create in the publish location" + "helpMarkDown": "The name of the artifact to create in the publish location." }, { "name": "ArtifactType", diff --git a/Tasks/PublishBuildArtifacts/task.loc.json b/Tasks/PublishBuildArtifacts/task.loc.json index b286de8673d9..e77cf66136ea 100644 --- a/Tasks/PublishBuildArtifacts/task.loc.json +++ b/Tasks/PublishBuildArtifacts/task.loc.json @@ -29,7 +29,7 @@ "name": "ArtifactName", "type": "string", "label": "ms-resource:loc.input.label.ArtifactName", - "defaultValue": "artifact", + "defaultValue": "drop", "required": true, "helpMarkDown": "ms-resource:loc.input.help.ArtifactName" },