Skip to content

Commit

Permalink
Merge pull request 24552 from users/dastahel/unifyTaskDescs into master
Browse files Browse the repository at this point in the history
  • Loading branch information
davidstaheli committed Apr 1, 2015
2 parents 99388cd + 1ebceeb commit b6795d3
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Tasks/AndroidBuild/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"demands" : [
"AndroidSDK"
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AndroidSigning/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"demands": [
"JDK",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/CMake/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "7D831C3C-3C68-459A-A5C9-BDE6E659596C",
"name": "CMake",
"friendlyName": "CMake",
"description": "Cross platform build system",
"description": "Build with the CMake cross-platform build system",
"category": "Build",
"author": "Microsoft Corporation",
"demands" : [
Expand All @@ -11,7 +11,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 3
"Patch": 4
},
"instanceNameFormat": "CMake $(args)",
"inputs": [
Expand Down
4 changes: 2 additions & 2 deletions Tasks/Gradle/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"demands" : [
"java"
Expand Down
4 changes: 2 additions & 2 deletions Tasks/Gulp/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 0,
"Minor": 1,
"Patch": 1
"Patch": 2
},
"demands" : [
"gulp"
Expand Down
4 changes: 2 additions & 2 deletions Tasks/XamarinAndroid/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"demands": [
"AndroidSDK",
Expand Down
14 changes: 7 additions & 7 deletions Tasks/XamarinTestCloud/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 0
"Patch": 1
},
"demands": [
],
Expand All @@ -26,15 +26,15 @@
"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",
"type": "string",
"label": "Team API Key",
"defaultValue": "",
"required": true,
"helpMarkDown": "Xamarin Test Cloud Team API key."
"helpMarkDown": "Your Xamarin Test Cloud Team API key can be found under \"Teams & Apps\" at https://testcloud.xamarin.com/account."
},
{
"name": "user",
Expand All @@ -50,7 +50,7 @@
"label": "Devices",
"defaultValue": "",
"required": true,
"helpMarkDown": "Devices string generated from Xamarin Test Cloud"
"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",
Expand All @@ -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."
Expand Down Expand Up @@ -92,7 +92,7 @@
{
"name": "locale",
"type": "pickList",
"label": "System language",
"label": "System Language",
"defaultValue": "en_US",
"required": true,
"groupName": "advanced",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/XamariniOS/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions Tasks/Xcode/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 1,
"Minor": 0,
"Patch": 7
"Patch": 8
},
"demands" : [
"xcode"
Expand Down
4 changes: 2 additions & 2 deletions Tasks/XcodePackageiOS/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"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": {
"Major": 0,
"Minor": 1,
"Patch": 3
"Patch": 4
},
"instanceNameFormat": "Xcode Package $(appName)",
"demands" : [
Expand Down

0 comments on commit b6795d3

Please sign in to comment.