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

Bump Xcode 8.1 to beta 2 #945

Merged
merged 3 commits into from
Oct 5, 2016
Merged

Bump Xcode 8.1 to beta 2 #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad7ef6a
Bump Xcode 8.1 to beta 2
spouliot Oct 4, 2016
d80712e
Bump maccore to get simulator support fix
spouliot Oct 4, 2016
fde0f85
[xharness] Get updated mlaunch binary. (#3)
rolfbjarne Oct 5, 2016
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
4 changes: 2 additions & 2 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M

# Xcode 8.1
XCODE_VERSION=8.1
XCODE_URL=http://storage.bos.internalx.com/bot-provisioning/Xcode_8.1_beta.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode8.1-beta1.app/Contents/Developer
XCODE_URL=http://storage.bos.xamarin.com/bot-provisioning/Xcode_8.1_beta_2.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode81-beta2.app/Contents/Developer

# Minimum Mono version
MIN_MONO_VERSION=4.4.0.148
Expand Down
4 changes: 2 additions & 2 deletions mk/xamarin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := d86f2fafdbb60a192f5458cca02c33ec9019e09a
NEEDED_MACCORE_BRANCH := xcode8
NEEDED_MACCORE_VERSION := d6ca7038939ed95f8204896a6951e9d4a9cfd77f
NEEDED_MACCORE_BRANCH := xcode8.1

MACCORE_DIRECTORY := maccore
MACCORE_MODULE := git@github.com:xamarin/maccore.git
Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/Harness.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ string DownloadMlaunch ()
{
// Just hardcode this for now. We should be able to switch to a shipped version of XS soon.
// NOTE: the filename part in the url must be unique so that the caching logic works properly.
var mlaunch_url = "http://bosstoragemirror.blob.core.windows.net/public-builder/mlaunch-307d345a06bd3f13994877ee5a4f316f5e6a7940";
var mlaunch_url = "http://bosstoragemirror.blob.core.windows.net/public-builder/mlaunch-d6ca7038939ed95f8204896a6951e9d4a9cfd77f";
var mlaunch_path = Path.Combine (Path.GetTempPath (), Path.GetFileName (mlaunch_url), "mlaunch");
if (File.Exists (mlaunch_path))
return mlaunch_path;
Expand Down