From 0e3634f18bb613b7f4cb120e0d3b77caf57c423a Mon Sep 17 00:00:00 2001 From: David Staheli Date: Tue, 1 May 2018 16:02:43 -0400 Subject: [PATCH 1/2] Go string tweaks based on team feedback --- .../resources.resjson/en-US/resources.resjson | 12 ++++++------ Tasks/Go/task.json | 14 +++++++------- Tasks/Go/task.loc.json | 2 +- .../resources.resjson/en-US/resources.resjson | 12 ++++++------ Tasks/GoTool/task.json | 14 +++++++------- Tasks/GoTool/task.loc.json | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Tasks/Go/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Go/Strings/resources.resjson/en-US/resources.resjson index 4b7e5da06eb8..1f15a0f33b9c 100644 --- a/Tasks/Go/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Go/Strings/resources.resjson/en-US/resources.resjson @@ -1,16 +1,16 @@ { "loc.friendlyName": "Go", "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=867582)", - "loc.description": "Get, build, test a go application, or run a custom go command.", + "loc.description": "Get, build, or test a Go application, or run a custom Go command.", "loc.instanceNameFormat": "go $(command)", "loc.group.displayName.advanced": "Advanced", "loc.input.label.command": "Command", "loc.input.help.command": "Select a Go command to run. Select 'Custom' to use a command not listed here.", "loc.input.label.customCommand": "Custom command", - "loc.input.help.customCommand": "Custom Go command for execution. For example: to execute go version, enter version.", + "loc.input.help.customCommand": "A custom Go command to execute. For example, to execute 'go version', enter 'version'.", "loc.input.label.arguments": "Arguments", - "loc.input.help.arguments": "Arguments to the selected command. For example, build time arguments for go build command.", - "loc.input.label.workingDirectory": "Working Directory", - "loc.input.help.workingDirectory": "Current working directory where the script is run. Empty is the root of the repo (build) or artifacts (release), which is $(System.DefaultWorkingDirectory)", - "loc.messages.TaskFailedWithError": "Go task failed with error: %s" + "loc.input.help.arguments": "Optional arguments to the selected command. For example, build-time arguments for the 'go build' command.", + "loc.input.label.workingDirectory": "Working directory", + "loc.input.help.workingDirectory": "The working directory where the command will run. When empty, the root of the repository (for builds) or artifacts (for releases) is used, which is the value of '$(System.DefaultWorkingDirectory)'.", + "loc.messages.TaskFailedWithError": "The Go task failed with an error: %s" } \ No newline at end of file diff --git a/Tasks/Go/task.json b/Tasks/Go/task.json index b1ed7b637e3e..bcd060c48a49 100644 --- a/Tasks/Go/task.json +++ b/Tasks/Go/task.json @@ -2,7 +2,7 @@ "id": "34B37FDD-BBF7-4EF1-B37C-9652CA7BB355", "name": "Go", "friendlyName": "Go", - "description": "Get, build, test a go application, or run a custom go command.", + "description": "Get, build, or test a Go application, or run a custom Go command.", "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=867582)", "author": "Microsoft Corporation", "preview": true, @@ -13,7 +13,7 @@ ], "version": { "Major": 0, - "Minor": 1, + "Minor": 135, "Patch": 0 }, "runsOn": [ @@ -48,7 +48,7 @@ { "name": "customCommand", "label": "Custom command", - "helpMarkDown": "Custom Go command for execution. For example: to execute go version, enter version.", + "helpMarkDown": "A custom Go command to execute. For example, to execute 'go version', enter 'version'.", "required": true, "type": "string", "visibleRule": "command == custom" @@ -59,13 +59,13 @@ "label": "Arguments", "defaultValue": "", "required": false, - "helpMarkDown": "Arguments to the selected command. For example, build time arguments for go build command." + "helpMarkDown": "Optional arguments to the selected command. For example, build-time arguments for the 'go build' command." }, { "name": "workingDirectory", "type": "filePath", - "label": "Working Directory", - "helpMarkDown": "Current working directory where the script is run. Empty is the root of the repo (build) or artifacts (release), which is $(System.DefaultWorkingDirectory)", + "label": "Working directory", + "helpMarkDown": "The working directory where the command will run. When empty, the root of the repository (for builds) or artifacts (for releases) is used, which is the value of '$(System.DefaultWorkingDirectory)'.", "required": "false", "groupName": "advanced" } @@ -78,6 +78,6 @@ } }, "messages": { - "TaskFailedWithError" : "Go task failed with error: %s" + "TaskFailedWithError" : "The Go task failed with an error: %s" } } diff --git a/Tasks/Go/task.loc.json b/Tasks/Go/task.loc.json index ba1d0fa1e889..33aba018a419 100644 --- a/Tasks/Go/task.loc.json +++ b/Tasks/Go/task.loc.json @@ -13,7 +13,7 @@ ], "version": { "Major": 0, - "Minor": 1, + "Minor": 135, "Patch": 0 }, "runsOn": [ diff --git a/Tasks/GoTool/Strings/resources.resjson/en-US/resources.resjson b/Tasks/GoTool/Strings/resources.resjson/en-US/resources.resjson index b2f56f904ba1..c1443f5002f2 100644 --- a/Tasks/GoTool/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/GoTool/Strings/resources.resjson/en-US/resources.resjson @@ -1,15 +1,15 @@ { "loc.friendlyName": "Go Tool Installer", "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=867581)", - "loc.description": "Finds or downloads specific version of Go tool into tools cache and adds it to the PATH. Use this task to change the version of Go Lang used in subsequent tasks", + "loc.description": "Finds or downloads a specific version of Go in the tools cache and adds it to the PATH. Use this to set the version of Go used in subsequent tasks.", "loc.instanceNameFormat": "Use Go $(version)", "loc.group.displayName.advanced": "Advanced", "loc.input.label.version": "Version", - "loc.input.help.version": "Go tool version to download and install. Example: 1.9.3", + "loc.input.help.version": "The Go version to download (if necessary) and use. Example: 1.9.3", "loc.input.label.goPath": "GOPATH", - "loc.input.help.goPath": "Value for the GOPATH environment variable.", + "loc.input.help.goPath": "A custom value for the GOPATH environment variable.", "loc.input.label.goBin": "GOBIN", - "loc.input.help.goBin": "Value for the GOBIN environment variable.", - "loc.messages.FailedToDownload": "Failed to download version %s. Please verify that the version is valid and resolve any other issues. Error: %s", - "loc.messages.TempDirNotSet": "Expected Agent.TempDirectory to be set" + "loc.input.help.goBin": "A custom value for the GOBIN environment variable.", + "loc.messages.FailedToDownload": "Failed to download Go version %s. Verify that the version is valid and resolve any other issues. Error: %s", + "loc.messages.TempDirNotSet": "The 'Agent.TempDirectory' environment variable was expected to be set." } \ No newline at end of file diff --git a/Tasks/GoTool/task.json b/Tasks/GoTool/task.json index cdb2f649cbdc..647d6e4da8c7 100644 --- a/Tasks/GoTool/task.json +++ b/Tasks/GoTool/task.json @@ -2,7 +2,7 @@ "id": "334727F4-9495-4F9D-A391-FC621D671474", "name": "GoTool", "friendlyName": "Go Tool Installer", - "description": "Finds or downloads specific version of Go tool into tools cache and adds it to the PATH. Use this task to change the version of Go Lang used in subsequent tasks", + "description": "Finds or downloads a specific version of Go in the tools cache and adds it to the PATH. Use this to set the version of Go used in subsequent tasks.", "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=867581)", "category": "Tool", "preview": "true", @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 1, + "Minor": 135, "Patch": 0 }, "satisfies": ["GO"], @@ -33,20 +33,20 @@ "label": "Version", "defaultValue": "1.10", "required": true, - "helpMarkDown": "Go tool version to download and install. Example: 1.9.3" + "helpMarkDown": "The Go version to download (if necessary) and use. Example: 1.9.3" }, { "name": "goPath", "type": "string", "label": "GOPATH", - "helpMarkDown": "Value for the GOPATH environment variable.", + "helpMarkDown": "A custom value for the GOPATH environment variable.", "groupName": "advanced" }, { "name": "goBin", "type": "string", "label": "GOBIN", - "helpMarkDown": "Value for the GOBIN environment variable.", + "helpMarkDown": "A custom value for the GOBIN environment variable.", "groupName": "advanced" } ], @@ -57,7 +57,7 @@ } }, "messages": { - "FailedToDownload": "Failed to download version %s. Please verify that the version is valid and resolve any other issues. Error: %s", - "TempDirNotSet": "Expected Agent.TempDirectory to be set" + "FailedToDownload": "Failed to download Go version %s. Verify that the version is valid and resolve any other issues. Error: %s", + "TempDirNotSet": "The 'Agent.TempDirectory' environment variable was expected to be set." } } \ No newline at end of file diff --git a/Tasks/GoTool/task.loc.json b/Tasks/GoTool/task.loc.json index 39395777722e..f3f4bfd35bc6 100644 --- a/Tasks/GoTool/task.loc.json +++ b/Tasks/GoTool/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 1, + "Minor": 135, "Patch": 0 }, "satisfies": [ From 4ef12e2e5c7fe534f1640eb8e9ca476d60349d47 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Wed, 9 May 2018 04:50:52 -0700 Subject: [PATCH 2/2] Make minor version increase sequential (not sprint number) --- Tasks/Go/task.json | 2 +- Tasks/Go/task.loc.json | 2 +- Tasks/GoTool/task.json | 2 +- Tasks/GoTool/task.loc.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/Go/task.json b/Tasks/Go/task.json index bcd060c48a49..f9380110cf67 100644 --- a/Tasks/Go/task.json +++ b/Tasks/Go/task.json @@ -13,7 +13,7 @@ ], "version": { "Major": 0, - "Minor": 135, + "Minor": 2, "Patch": 0 }, "runsOn": [ diff --git a/Tasks/Go/task.loc.json b/Tasks/Go/task.loc.json index 33aba018a419..ca0ff8c4cefe 100644 --- a/Tasks/Go/task.loc.json +++ b/Tasks/Go/task.loc.json @@ -13,7 +13,7 @@ ], "version": { "Major": 0, - "Minor": 135, + "Minor": 2, "Patch": 0 }, "runsOn": [ diff --git a/Tasks/GoTool/task.json b/Tasks/GoTool/task.json index 647d6e4da8c7..b1552c510a75 100644 --- a/Tasks/GoTool/task.json +++ b/Tasks/GoTool/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 135, + "Minor": 2, "Patch": 0 }, "satisfies": ["GO"], diff --git a/Tasks/GoTool/task.loc.json b/Tasks/GoTool/task.loc.json index f3f4bfd35bc6..5071e3b5fb11 100644 --- a/Tasks/GoTool/task.loc.json +++ b/Tasks/GoTool/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 135, + "Minor": 2, "Patch": 0 }, "satisfies": [