Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Xcode 12 option for xcodeVersion input #14501

Merged
merged 5 commits into from
Mar 3, 2021
Merged

Add Xcode 12 option for xcodeVersion input #14501

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa2492b
add xcode 12 option
Mar 2, 2021
df200e8
add note to helpMarkDown
Mar 2, 2021
ff971b7
upd helpMarkDown and resjson
Mar 2, 2021
a9017f2
Merge branch 'master' into users/max-zaytsev/xcode-12
Mar 3, 2021
521d0b1
Merge branch 'master' into users/max-zaytsev/xcode-12
Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/XcodeV5/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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