From ddcc4017ada9eeacee9437cc4c85d97bda2a08c4 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Wed, 1 Apr 2015 07:18:54 -0400 Subject: [PATCH 1/4] Unify task description format --- Tasks/AndroidBuild/task.json | 2 +- Tasks/AndroidSigning/task.json | 2 +- Tasks/CMake/task.json | 2 +- Tasks/Gradle/task.json | 2 +- Tasks/Gulp/task.json | 2 +- Tasks/XamarinAndroid/task.json | 2 +- Tasks/XamarinTestCloud/task.json | 6 +++--- Tasks/XamariniOS/task.json | 2 +- Tasks/Xcode/task.json | 2 +- Tasks/XcodePackageiOS/task.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tasks/AndroidBuild/task.json b/Tasks/AndroidBuild/task.json index 1f19231d2956..e1c437c3cd4d 100644 --- a/Tasks/AndroidBuild/task.json +++ b/Tasks/AndroidBuild/task.json @@ -2,7 +2,7 @@ "id": "DF857559-8715-46EB-A74E-AC98B9178AA0", "name": "AndroidBuild", "friendlyName": "Android Build", - "description": "Run an Android build using Gradle and optionally start the emulator for unit tests", + "description": "Build an Android app using Gradle and optionally start the emulator for unit tests", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/AndroidSigning/task.json b/Tasks/AndroidSigning/task.json index 14fbcbfa6d65..1d2ced163ca5 100644 --- a/Tasks/AndroidSigning/task.json +++ b/Tasks/AndroidSigning/task.json @@ -2,7 +2,7 @@ "id": "80F3F6A0-82A6-4A22-BA7A-E5B8C541B9B9", "name": "AndroidSigning", "friendlyName": "Android Signing", - "description": "Signing and aligning APK", + "description": "Sign and align Android APK files", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/CMake/task.json b/Tasks/CMake/task.json index 3b9533567e83..74dcaeaa935a 100644 --- a/Tasks/CMake/task.json +++ b/Tasks/CMake/task.json @@ -2,7 +2,7 @@ "id": "7D831C3C-3C68-459A-A5C9-BDE6E659596C", "name": "CMake", "friendlyName": "CMake", - "description": "Cross platform build system", + "description": "Build with a cross-platform build system", "category": "Build", "author": "Microsoft Corporation", "demands" : [ diff --git a/Tasks/Gradle/task.json b/Tasks/Gradle/task.json index 5c8c2c8d7544..24b77d305d9f 100644 --- a/Tasks/Gradle/task.json +++ b/Tasks/Gradle/task.json @@ -2,7 +2,7 @@ "id": "8D8EEBD8-2B94-4C97-85AF-839254CC6DA4", "name": "Gradle", "friendlyName": "Gradle", - "description": "Run a build using Gradle wrapper", + "description": "Build using a Gradle wrapper script", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/Gulp/task.json b/Tasks/Gulp/task.json index b76ab5932846..a23bed9b6315 100644 --- a/Tasks/Gulp/task.json +++ b/Tasks/Gulp/task.json @@ -2,7 +2,7 @@ "id": "B82CFBE4-34F9-40F5-889E-C8842CA9DD9D", "name": "Gulp", "friendlyName": "Gulp", - "description": "Node.js streaming task based build system", + "description": "Build with a Node.js streaming, task-based build system", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/XamarinAndroid/task.json b/Tasks/XamarinAndroid/task.json index be7dee14f772..2e461b82983b 100644 --- a/Tasks/XamarinAndroid/task.json +++ b/Tasks/XamarinAndroid/task.json @@ -2,7 +2,7 @@ "id": "27EDD013-36FD-43AA-96A3-7D73E1E35285", "name": "Xamarin.Android", "friendlyName": "Xamarin.Android", - "description": "Build Android app with Xamarin", + "description": "Build an Android app with Xamarin", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/XamarinTestCloud/task.json b/Tasks/XamarinTestCloud/task.json index a6bdc2db8064..59cad23a98e9 100644 --- a/Tasks/XamarinTestCloud/task.json +++ b/Tasks/XamarinTestCloud/task.json @@ -2,7 +2,7 @@ "id": "049918CB-1488-48EB-85E8-C318ECCAAA74", "name": "XamarinTestCloud", "friendlyName": "Xamarin Test Cloud", - "description": "Test mobile apps with Xamarin Test Cloud with Xamarin.UITest", + "description": "Test mobile apps with Xamarin Test Cloud using Xamarin.UITest", "category": "Test", "author": "Microsoft Corporation", "version": { @@ -63,7 +63,7 @@ { "name": "testDir", "type": "filePath", - "label": "Test Assemembly Directory", + "label": "Test Assembly Directory", "defaultValue": "", "required": true, "helpMarkDown": "Relative path to the folder that contains the test assemblies." @@ -92,7 +92,7 @@ { "name": "locale", "type": "pickList", - "label": "System language", + "label": "System Language", "defaultValue": "en_US", "required": true, "groupName": "advanced", diff --git a/Tasks/XamariniOS/task.json b/Tasks/XamariniOS/task.json index 220af0217db4..7ca62f44bf46 100644 --- a/Tasks/XamariniOS/task.json +++ b/Tasks/XamariniOS/task.json @@ -2,7 +2,7 @@ "id": "0F077E3A-AF59-496D-81BC-AD971B7464E0", "name": "Xamarin.iOS", "friendlyName": "Xamarin.iOS", - "description": "Build iOS app with Xamarin on Mac OS", + "description": "Build an iOS app with Xamarin on Mac OS", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/Xcode/task.json b/Tasks/Xcode/task.json index dcabea1c521f..474cb4235706 100644 --- a/Tasks/Xcode/task.json +++ b/Tasks/Xcode/task.json @@ -2,7 +2,7 @@ "id": "1E78DC1B-9132-4B18-9C75-0E7ECC634B74", "name": "Xcode", "friendlyName": "Xcode Build", - "description": "Build an Xcode project with xctool or xcodebuild tool", + "description": "Build an Xcode workspace on Mac OS", "category": "Build", "author": "Microsoft Corporation", "version": { diff --git a/Tasks/XcodePackageiOS/task.json b/Tasks/XcodePackageiOS/task.json index a07ac7b6e9b8..51f4f5235844 100644 --- a/Tasks/XcodePackageiOS/task.json +++ b/Tasks/XcodePackageiOS/task.json @@ -2,7 +2,7 @@ "id": "F54D001C-999F-408A-9867-0400C1838C5E", "name": "XcodePackageiOS", "friendlyName": "Xcode Package iOS", - "description": "Generates an .ipa file from the build output", + "description": "Generate an .ipa file from Xcode build output", "category": "Build", "author": "Microsoft Corporation", "version": { From 6c0fc7af8dab8c130aa44e8ffa754bdd209b2cb7 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Wed, 1 Apr 2015 09:25:16 -0400 Subject: [PATCH 2/4] Added help markdown --- Tasks/XamarinTestCloud/task.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tasks/XamarinTestCloud/task.json b/Tasks/XamarinTestCloud/task.json index 59cad23a98e9..370c9a392925 100644 --- a/Tasks/XamarinTestCloud/task.json +++ b/Tasks/XamarinTestCloud/task.json @@ -26,7 +26,7 @@ "label": "App", "defaultValue": "", "required": true, - "helpMarkDown": "Relative path from repo root of the app(s) to test. Wildcards can be used. For example, `**\\*.apk` for all apk files in all subfolders." + "helpMarkDown": "Relative path from repo root of the app(s) to test. Wildcards can be used. For example, `**\\*.apk` for all APK files in all subfolders." }, { "name": "teamApiKey", @@ -34,7 +34,7 @@ "label": "Team API Key", "defaultValue": "", "required": true, - "helpMarkDown": "Xamarin Test Cloud Team API key." + "helpMarkDown": "The Xamarin Test Cloud Team API key can be found under \"Teams & Apps\" at https://testcloud.xamarin.com/account." }, { "name": "user", @@ -50,7 +50,7 @@ "label": "Devices", "defaultValue": "", "required": true, - "helpMarkDown": "Devices string generated from Xamarin Test Cloud" + "helpMarkDown": "Devices string generated by Xamarin Test Cloud. This is the value of the --devices command line argument of a test run." }, { "name": "series", From fc9c460b17070598426ab239f04a37bd2240e9ea Mon Sep 17 00:00:00 2001 From: David Staheli Date: Wed, 1 Apr 2015 09:30:19 -0400 Subject: [PATCH 3/4] Refined help markdown --- Tasks/XamarinTestCloud/task.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/XamarinTestCloud/task.json b/Tasks/XamarinTestCloud/task.json index 370c9a392925..de05db30fd8f 100644 --- a/Tasks/XamarinTestCloud/task.json +++ b/Tasks/XamarinTestCloud/task.json @@ -34,7 +34,7 @@ "label": "Team API Key", "defaultValue": "", "required": true, - "helpMarkDown": "The Xamarin Test Cloud Team API key can be found under \"Teams & Apps\" at https://testcloud.xamarin.com/account." + "helpMarkDown": "Your Xamarin Test Cloud Team API key can be found under \"Teams & Apps\" at https://testcloud.xamarin.com/account." }, { "name": "user", @@ -50,7 +50,7 @@ "label": "Devices", "defaultValue": "", "required": true, - "helpMarkDown": "Devices string generated by Xamarin Test Cloud. This is the value of the --devices command line argument of a test run." + "helpMarkDown": "The devices string is generated by Xamarin Test Cloud. It can be found as the value of the --devices command line argument of a Test Cloud test run." }, { "name": "series", From 1ebceeb3befbf01e04a4ec0a8e4a7b7b56d15402 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Wed, 1 Apr 2015 09:41:58 -0400 Subject: [PATCH 4/4] Bump patch version number of modified tasks --- Tasks/AndroidBuild/task.json | 2 +- Tasks/AndroidSigning/task.json | 2 +- Tasks/CMake/task.json | 4 ++-- Tasks/Gradle/task.json | 2 +- Tasks/Gulp/task.json | 2 +- Tasks/XamarinAndroid/task.json | 2 +- Tasks/XamarinTestCloud/task.json | 2 +- Tasks/Xcode/task.json | 2 +- Tasks/XcodePackageiOS/task.json | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Tasks/AndroidBuild/task.json b/Tasks/AndroidBuild/task.json index e1c437c3cd4d..1b76b8968a47 100644 --- a/Tasks/AndroidBuild/task.json +++ b/Tasks/AndroidBuild/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 1 + "Patch": 2 }, "demands" : [ "AndroidSDK" diff --git a/Tasks/AndroidSigning/task.json b/Tasks/AndroidSigning/task.json index 1d2ced163ca5..aed12aa165c3 100644 --- a/Tasks/AndroidSigning/task.json +++ b/Tasks/AndroidSigning/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 1 + "Patch": 2 }, "demands": [ "JDK", diff --git a/Tasks/CMake/task.json b/Tasks/CMake/task.json index 74dcaeaa935a..58b0de1af530 100644 --- a/Tasks/CMake/task.json +++ b/Tasks/CMake/task.json @@ -2,7 +2,7 @@ "id": "7D831C3C-3C68-459A-A5C9-BDE6E659596C", "name": "CMake", "friendlyName": "CMake", - "description": "Build with a cross-platform build system", + "description": "Build with the CMake cross-platform build system", "category": "Build", "author": "Microsoft Corporation", "demands" : [ @@ -11,7 +11,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 3 + "Patch": 4 }, "instanceNameFormat": "CMake $(args)", "inputs": [ diff --git a/Tasks/Gradle/task.json b/Tasks/Gradle/task.json index 24b77d305d9f..0e7c8fcd6ce6 100644 --- a/Tasks/Gradle/task.json +++ b/Tasks/Gradle/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 1 + "Patch": 2 }, "demands" : [ "java" diff --git a/Tasks/Gulp/task.json b/Tasks/Gulp/task.json index a23bed9b6315..40223d83e8df 100644 --- a/Tasks/Gulp/task.json +++ b/Tasks/Gulp/task.json @@ -8,7 +8,7 @@ "version": { "Major": 0, "Minor": 1, - "Patch": 1 + "Patch": 2 }, "demands" : [ "gulp" diff --git a/Tasks/XamarinAndroid/task.json b/Tasks/XamarinAndroid/task.json index 2e461b82983b..fd73a85cb46f 100644 --- a/Tasks/XamarinAndroid/task.json +++ b/Tasks/XamarinAndroid/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 1 + "Patch": 2 }, "demands": [ "AndroidSDK", diff --git a/Tasks/XamarinTestCloud/task.json b/Tasks/XamarinTestCloud/task.json index de05db30fd8f..ebf5e55d731d 100644 --- a/Tasks/XamarinTestCloud/task.json +++ b/Tasks/XamarinTestCloud/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 0 + "Patch": 1 }, "demands": [ ], diff --git a/Tasks/Xcode/task.json b/Tasks/Xcode/task.json index 474cb4235706..304137087882 100644 --- a/Tasks/Xcode/task.json +++ b/Tasks/Xcode/task.json @@ -8,7 +8,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 7 + "Patch": 8 }, "demands" : [ "xcode" diff --git a/Tasks/XcodePackageiOS/task.json b/Tasks/XcodePackageiOS/task.json index 51f4f5235844..d85adcb82115 100644 --- a/Tasks/XcodePackageiOS/task.json +++ b/Tasks/XcodePackageiOS/task.json @@ -8,7 +8,7 @@ "version": { "Major": 0, "Minor": 1, - "Patch": 3 + "Patch": 4 }, "instanceNameFormat": "Xcode Package $(appName)", "demands" : [