Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ado/templates/apple-xcode-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
sdk: ${{ parameters.xcode_sdk }}
xcWorkspacePath: ${{ parameters.xcode_workspacePath }}
scheme: ${{ parameters.xcode_scheme }}
xcodeVersion: 11
xcodeVersion: default
signingOption: auto
packageApp: false
teamId: '$(XCodeSigningMicrosoftTeamID)'
Expand Down
36 changes: 3 additions & 33 deletions .ado/templates/apple-xcode-select.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,7 @@
# Task Group: XCode select proper version
#
steps:
# The XCODE_11_DEVELOPER_DIR variable is defined in the Hosted Agents and is used by the Xcode@5 tasks.
# The 'OE Mac Pool' agents do not define this variable, so manually set it here if it is not defined.
- script: |
if [ -z $XCODE_11_DEVELOPER_DIR ]; then
DIR='/Applications/Xcode_11_beta.app/Contents/Developer/'
if [ ! -d $DIR ]; then
DIR='/Applications/Xcode.app/Contents/Developer/'
fi
if [ -d $DIR ]; then
echo "##vso[task.setvariable variable=XCODE_11_DEVELOPER_DIR;]$DIR"
else
(>&2 echo "No Xcode found.")
fi
fi
displayName: 'Ensure XCODE_11_DEVELOPER_DIR'
failOnStderr: true

# The DEVELOPER_DIR variable is used by xcodebuild to specify the version of Xcode to use.
# Set the variable here so that npm components and CMake build steps get the latest XCode version
# instead of whatever version is the default on the build agent.
- script: |
echo "##vso[task.setvariable variable=DEVELOPER_DIR;]$XCODE_11_DEVELOPER_DIR"
displayName: 'Set DEVELOPER_DIR'

- script: |
REQUIRED=11.0
VER=`xcodebuild -version | head -n1 | cut -d' ' -f2`
if (( $(echo "$VER >= $REQUIRED" | bc -l) )); then
echo "XCode version $VER is active."
else
(>&2 echo "Must have XCode $REQUIRED or later.")
fi
displayName: 'Check XCode version'
- bash: |
sudo xcode-select --switch '/Applications/Xcode_11.2.1.app'
displayName: 'Switch to XCode 11.2.1'
failOnStderr: true