Skip to content

Commit d2d04c6

Browse files
authored
Change to XCode 11.2.1 (#231)
1 parent a8d3fd0 commit d2d04c6

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

.ado/templates/apple-xcode-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
sdk: ${{ parameters.xcode_sdk }}
1818
xcWorkspacePath: ${{ parameters.xcode_workspacePath }}
1919
scheme: ${{ parameters.xcode_scheme }}
20-
xcodeVersion: 11
20+
xcodeVersion: default
2121
signingOption: auto
2222
packageApp: false
2323
teamId: '$(XCodeSigningMicrosoftTeamID)'

.ado/templates/apple-xcode-select.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,7 @@
22
# Task Group: XCode select proper version
33
#
44
steps:
5-
# The XCODE_11_DEVELOPER_DIR variable is defined in the Hosted Agents and is used by the Xcode@5 tasks.
6-
# The 'OE Mac Pool' agents do not define this variable, so manually set it here if it is not defined.
7-
- script: |
8-
if [ -z $XCODE_11_DEVELOPER_DIR ]; then
9-
DIR='/Applications/Xcode_11_beta.app/Contents/Developer/'
10-
if [ ! -d $DIR ]; then
11-
DIR='/Applications/Xcode.app/Contents/Developer/'
12-
fi
13-
if [ -d $DIR ]; then
14-
echo "##vso[task.setvariable variable=XCODE_11_DEVELOPER_DIR;]$DIR"
15-
else
16-
(>&2 echo "No Xcode found.")
17-
fi
18-
fi
19-
displayName: 'Ensure XCODE_11_DEVELOPER_DIR'
20-
failOnStderr: true
21-
22-
# The DEVELOPER_DIR variable is used by xcodebuild to specify the version of Xcode to use.
23-
# Set the variable here so that npm components and CMake build steps get the latest XCode version
24-
# instead of whatever version is the default on the build agent.
25-
- script: |
26-
echo "##vso[task.setvariable variable=DEVELOPER_DIR;]$XCODE_11_DEVELOPER_DIR"
27-
displayName: 'Set DEVELOPER_DIR'
28-
29-
- script: |
30-
REQUIRED=11.0
31-
VER=`xcodebuild -version | head -n1 | cut -d' ' -f2`
32-
if (( $(echo "$VER >= $REQUIRED" | bc -l) )); then
33-
echo "XCode version $VER is active."
34-
else
35-
(>&2 echo "Must have XCode $REQUIRED or later.")
36-
fi
37-
displayName: 'Check XCode version'
5+
- bash: |
6+
sudo xcode-select --switch '/Applications/Xcode_11.2.1.app'
7+
displayName: 'Switch to XCode 11.2.1'
388
failOnStderr: true

0 commit comments

Comments
 (0)