Skip to content

Commit

Permalink
Add Xcode 12 option for xcodeVersion input (#14501)
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxim Zaytsev authored Mar 3, 2021
1 parent a80ff5c commit db54986
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"loc.input.label.scheme": "Scheme",
"loc.input.help.scheme": "(Optional) Enter a scheme name defined in Xcode. It must be a shared scheme, with its <strong>Shared</strong> checkbox enabled under <strong>Managed Schemes</strong> in Xcode. If you specify a <strong>Workspace or project path</strong> above without specifying a scheme, and the workspace has a single shared scheme, it will be automatically used.",
"loc.input.label.xcodeVersion": "Xcode version",
"loc.input.help.xcodeVersion": "Specify the target version of Xcode. Select `Default` to use the default version of Xcode on the agent machine. Selecting a version number (e.g. `Xcode 9`) relies on environment variables being set on the agent machine for the version's location (e.g. `XCODE_9_DEVELOPER_DIR=/Applications/Xcode_9.0.0.app/Contents/Developer`). Select `Specify path` to provide a specific path to the Xcode developer directory.",
"loc.input.help.xcodeVersion": "Specify the target version of Xcode. Select `Default` to use the default version of Xcode on the agent machine. Selecting a version number (e.g. `Xcode 9`) relies on environment variables being set on the agent machine for the version's location (e.g. `XCODE_9_DEVELOPER_DIR=/Applications/Xcode_9.0.0.app/Contents/Developer`). Select `Specify path` to provide a specific path to the Xcode developer directory.<br/>Note: XCode 12 is installed on macOS-10.15 (or higher)",
"loc.input.label.xcodeDeveloperDir": "Xcode developer path",
"loc.input.help.xcodeDeveloperDir": "(Optional) Enter a path to a specific Xcode developer directory (e.g. `/Applications/Xcode_9.0.0.app/Contents/Developer`). This is useful when multiple versions of Xcode are installed on the agent machine.",
"loc.input.label.packageApp": "Create app package",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/XcodeV5/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 5,
"Minor": 179,
"Minor": 184,
"Patch": 0
},
"releaseNotes": "This version of the task is compatible with Xcode 8 - 11. Features that were solely to maintain compatibility with Xcode 7 have been removed. This task has better options for using Microsoft-hosted macOS agents.",
Expand Down Expand Up @@ -87,14 +87,15 @@
"type": "pickList",
"label": "Xcode version",
"required": false,
"helpMarkDown": "Specify the target version of Xcode. Select `Default` to use the default version of Xcode on the agent machine. Selecting a version number (e.g. `Xcode 9`) relies on environment variables being set on the agent machine for the version's location (e.g. `XCODE_9_DEVELOPER_DIR=/Applications/Xcode_9.0.0.app/Contents/Developer`). Select `Specify path` to provide a specific path to the Xcode developer directory.",
"helpMarkDown": "Specify the target version of Xcode. Select `Default` to use the default version of Xcode on the agent machine. Selecting a version number (e.g. `Xcode 9`) relies on environment variables being set on the agent machine for the version's location (e.g. `XCODE_9_DEVELOPER_DIR=/Applications/Xcode_9.0.0.app/Contents/Developer`). Select `Specify path` to provide a specific path to the Xcode developer directory.<br/>Note: XCode 12 is installed on macOS-10.15 (or higher)",
"defaultValue": "default",
".comment": "//If you update the options here, be sure to update the Xcode.json build template as well.",
"options": {
"8": "Xcode 8",
"9": "Xcode 9",
"10": "Xcode 10",
"11": "Xcode 11",
"12": "Xcode 12",
"default": "Default",
"specifyPath": "Specify path"
}
Expand Down
3 changes: 2 additions & 1 deletion Tasks/XcodeV5/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 5,
"Minor": 179,
"Minor": 184,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down Expand Up @@ -95,6 +95,7 @@
"9": "Xcode 9",
"10": "Xcode 10",
"11": "Xcode 11",
"12": "Xcode 12",
"default": "Default",
"specifyPath": "Specify path"
}
Expand Down

0 comments on commit db54986

Please sign in to comment.