Skip to content

Port Xcode path detection changes from #9861 #9862

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

Merged
MattGal merged 1 commit into from
Jul 5, 2022
Merged

Port Xcode path detection changes from #9861 #9862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,15 @@ fi
if [ -z "$xcode_version" ]; then
xcode_path="$(dirname "$(dirname "$(xcode-select -p)")")"
else
xcode_path="/Applications/Xcode${xcode_version/./}.app"
xcode_path="/Applications/Xcode_${xcode_version}.app"

if [ ! -d "$xcode_path" ]; then
xcode_path="/Applications/Xcode${xcode_version/./}.app"
fi
fi

if [ ! -d "$xcode_path" ]; then
echo "WARNING - Xcode not found at $xcode_path"
fi

# First we need to revive env variables since they were erased by launchctl
Expand Down