Skip to content

Instantly share code, notes, and snippets.

commit 60488c410946dc7f3c69a0794890cb379afed672
Author: Rolf Bjarne Kvinge <[email protected]>
Date: Fri Jul 1 13:12:19 2016 +0200
[System] Disable tests that require working networking stack on watchOS.
diff --git a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs b/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
index 8fa752a..6c6da54 100644
--- a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
+++ b/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
commit 6bbf84f41817c1333e43a7283d7174d398c1cf0e
Author: Rolf Bjarne Kvinge <[email protected]>
Date: Mon Jun 13 20:41:28 2016 -0700
[Xamarin.Hosting] Load all the required libraries for Xcode 8.
diff --git a/Xamarin.Hosting/Xamarin.Hosting/Services.cs b/Xamarin.Hosting/Xamarin.Hosting/Services.cs
index 4bcd106..db13a41 100644
--- a/Xamarin.Hosting/Xamarin.Hosting/Services.cs
+++ b/Xamarin.Hosting/Xamarin.Hosting/Services.cs
Sampling process 28593 for 3 seconds with 1 millisecond of run time between samples
Sampling completed, processing symbols...
Analysis of sampling Microsoft Outlook (pid 28593) every 1 millisecond
Process: Microsoft Outlook [28593]
Path: /Applications/Microsoft Outlook.app/Contents/MacOS/Microsoft Outlook
Load Address: 0x4c000
Identifier: com.microsoft.Outlook
Version: 15.23 (15.23.16061100)
Code Type: X86
Parent Process: ??? [1]
diff --git a/builds/Makefile b/builds/Makefile
index 1c3eead..f8acaf9 100644
--- a/builds/Makefile
+++ b/builds/Makefile
@@ -154,8 +154,8 @@ define MacBuildTemplate
$(2)_CPPFLAGS = \
-isysroot $(XCODE_MAC_SDKROOT) \
-mmacosx-version-min=$(MIN_OSX_SDK_VERSION)
-$(2)_CFLAGS = -O2 -arch $(1)
-$(2)_CXXFLAGS = -O2 -arch $(1)
diff --git a/Makefile b/Makefile
index 08c7799..9cf6570 100644
--- a/Makefile
+++ b/Makefile
@@ -156,6 +156,9 @@ endif
install-system: install-system-ios install-system-mac
$(Q) $(MAKE) install-symlinks MAC_DESTDIR=/ MAC_INSTALL_VERSION=Current IOS_DESTDIR=/ IOS_INSTALL_VERSION=Current -C msbuild V=$(V)
+ifdef ENABLE_XAMARIN
+ $(Q) $(MAKE) install-symlinks MAC_DESTDIR=/ MAC_INSTALL_VERSION=Current IOS_DESTDIR=/ IOS_INSTALL_VERSION=Current -C $(MACCORE_PATH) V=$(V)
diff --git a/Makefile b/Makefile
index b068b23..3d3aaf2 100644
--- a/Makefile
+++ b/Makefile
@@ -32,3 +32,6 @@ git-clean-all:
@git submodule foreach -q --recursive 'git clean -xffdq'
@for dir in $(DEPENDENCY_DIRECTORIES); do echo "Cleaning $$dir" && cd $(CURDIR)/$$dir && git clean -xffdq && git reset --hard -q && git submodule foreach -q --recursive 'git clean -xffdq'; done
@echo "Done"
+
+install-symlinks:
#!/bin/bash -e
MTOUCH=/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch
XCODE=/Applications/Xcode73.app
if test -f /work/maccore/master/maccore/tools/mlaunch/mlaunch; then
MTOUCH=/work/maccore/master/maccore/tools/mlaunch/mlaunch
fi
echo "Listing devices..."
XBuild Engine Version 14.0
Mono, Version 4.4.0.0
Copyright (C) 2005-2013 Various Mono authors
Loading default tasks for ToolsVersion: 4.0 from /Library/Frameworks/Mono.framework/Versions/4.4.0/lib/mono/4.5/Microsoft.Common.tasks
Build started 5/24/2016 4:20:26 PM.
__________________________________________________
/work/maccore/coop/maccore/tests/bcl-test/System.Numerics/System.Numerics-watchos-app.csproj: Importing project /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/WatchOS/Xamarin.WatchOS.App.CSharp.targets from extension path /Library/Frameworks/Mono.framework/External/xbuild
/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/WatchOS/Xamarin.WatchOS.App.CSharp.targets: Importing project /Library/Frameworks/Mono.framework/Versions/4.4.0/lib/mono/4.5/Microsoft.CSharp.targets
/Library/Frameworks/Mono.framework/Versions/4.4.0/lib/mono/4.5/Microsoft.CSharp.targets: Importing project /Library/Frameworks/Mono.framework/Versions/4.4.0/lib/mono/4.5/Microsoft.Common.targets
INFO [2016-05-18 15:47:39Z]: Starting Xamarin Studio 6.1 (build 853)
INFO [2016-05-18 15:47:39Z]: Running on Mono 4.4.0 (mono-4.4.0-branch/fcf7a6d) (64-bit)
INFO [2016-05-18 15:47:39Z]: Operating System: Mac OS X 10.11.4
Darwin Rolfs-Mac-Pro.local 15.4.0 Darwin Kernel Version 15.4.0
Fri Feb 26 22:08:05 PST 2016
root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64
INFO [2016-05-18 15:47:39Z]: GTK: Using gtkrc from /work/xamarin-studio/master/md-addins/Xamarin Studio.app/Contents/Resources/lib/monodevelop/bin/gtkrc.mac
WARNING [2016-05-18 15:47:39Z]: Gtk-Warning: Locale not supported by C library.
Using the fallback 'C' locale.
Stack trace: