Merge xcode9 into d15-4[-xi]

Make.config

@@ -17,6 +17,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 # PACKAGE_HEAD_BRANCH (set to the release branch name, this shows up in the IDE's version information, as well as mtouch/mmp --version)
 # IOS_PACKAGE_VERSION (major/minor #)
 # MAC_PACKAGE_VERSION (major/minor #)
+# PACKAGE_VERSION_REV (set to 0 and increment for service releases or previews)
 # (and updating the same on master as well, to next version)
 #
 
@@ -36,21 +37,23 @@ else
 CURRENT_BRANCH:=$(PACKAGE_HEAD_BRANCH)
 endif
 
+# for service releases and previews
+PACKAGE_VERSION_REV=9
+
 IOS_PRODUCT=Xamarin.iOS
 IOS_PACKAGE_NAME=Xamarin.iOS
 IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 # NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
-IOS_PACKAGE_VERSION=10.14.0.$(IOS_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=11.2.0.$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
+IOS_PACKAGE_VERSION_REV=0
 IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
 
-# Xcode 8.3
-XCODE_VERSION=8.3
-XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.3.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode83.app/Contents/Developer
+XCODE_VERSION=9
+XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9_GM_seed.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode9-GM.app/Contents/Developer
 
 # Minimum Mono version
 MIN_MONO_VERSION=5.2.0.90
@@ -60,7 +63,7 @@ MIN_MONO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-04/
 # Minimum Visual Studio version
 MIN_VISUAL_STUDIO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/monodevelop-lion-dogfood-vNext/8f/8f1c13cb983138ee63bd53e09908ea5e737988cd/VisualStudioForMac-Preview-7.0.0.2728.dmg
 MIN_VISUAL_STUDIO_VERSION=7.0.0.2728
-MAX_VISUAL_STUDIO_VERSION=7.1.99
+MAX_VISUAL_STUDIO_VERSION=7.3.99
 
 # Minimum CMake version
 MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
@@ -71,10 +74,10 @@ MIN_OSX_BUILD_VERSION=10.12
 MIN_OSX_VERSION_FOR_IOS=10.11
 MIN_OSX_VERSION_FOR_MAC=10.11
 
-IOS_SDK_VERSION=10.3
-OSX_SDK_VERSION=10.12
-WATCH_SDK_VERSION=3.2
-TVOS_SDK_VERSION=10.2
+IOS_SDK_VERSION=11.0
+OSX_SDK_VERSION=10.13
+WATCH_SDK_VERSION=4.0
+TVOS_SDK_VERSION=11.0
 
 MIN_IOS_SDK_VERSION=6.0
 MIN_OSX_SDK_VERSION=10.7
@@ -83,7 +86,7 @@ MIN_WATCH_OS_VERSION=1.0
 MIN_TVOS_SDK_VERSION=9.0
 
 INCLUDE_IOS=1
-INCLUDE_MAC=1
+#INCLUDE_MAC=1
 INCLUDE_WATCH=1
 INCLUDE_TVOS=1
 INCLUDE_DEVICE=1
@@ -248,10 +251,10 @@ MAC_PRODUCT=Xamarin.Mac
 MAC_PACKAGE_NAME=xamarin.mac
 MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 
-MAC_PACKAGE_VERSION=3.8.0.$(MAC_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=3.99.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE)
 MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
 MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))
+MAC_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)
 MAC_PACKAGE_VERSION_BUILD=$(word 4, $(subst ., ,$(MAC_PACKAGE_VERSION)))
 MAC_PACKAGE_VERSION_MAJOR_MINOR=$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR)
 MAC_PACKAGE_UPDATE_ID=$(shell echo $(subst ., ,$(MAC_PACKAGE_VERSION).$(MAC_PACKAGE_VERSION_BUILD)) | awk '{printf "2%02d%02d%02d%03d",$$1,$$2,$$3,$$4}')

README.md

@@ -142,4 +142,3 @@ We use [Mono's Coding Guidelines](http://www.mono-project.com/community/contribu
 ### Reporting Bugs
 
 We use [Bugzilla](https://bugzilla.xamarin.com/newbug) to track issues.
-

Versions-ios.plist.in

@@ -23,6 +23,7 @@
 			<string>10.1</string>
 			<string>10.2</string>
 			<string>10.3</string>
+			<string>11.0</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -32,6 +33,7 @@
 			<string>10.0</string>
 			<string>10.1</string>
 			<string>10.2</string>
+			<string>11.0</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -42,6 +44,7 @@
 			<string>3.0</string>
 			<string>3.1</string>
 			<string>3.2</string>
+			<string>4.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

Versions-mac.plist.in

@@ -12,6 +12,7 @@
 			<string>10.10</string>
 			<string>10.11</string>
 			<string>10.12</string>
+			<string>10.13</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Makefile

@@ -48,9 +48,18 @@ endif
 # so disable 'readlinkat' by setting using ac_cv_func_readlinkat=no
 # these can be removed when our min ios/osx version (at runtime) is macOS 10.10+ or iOS 8+
 
+# ld: weak import of symbol '_futimens' not supported because of option: -no_weak_imports for architecture x86_64
+# ld: weak import of symbol '_utimensat' not supported because of option: -no_weak_imports for architecture x86_64
+# headers say these methods were introduced in 10.13:
+# usr/include/sys/stat.h:int	futimens(int __fd, const struct timespec __times[2]) __API_AVAILABLE(macosx(10.13), ios(11.0), tvos(11.0), watchos(4.0));
+# int	utimensat(int __fd, const char *__path, const struct timespec __times[2], int __flag) __API_AVAILABLE(macosx(10.13), ios(11.0), tvos(11.0), watchos(4.0));
+# so disable 'futimens' and 'utimensat'
+
 COMMON_ACVARS =  \
 	ac_cv_func_fstatat=no \
 	ac_cv_func_readlinkat=no \
+	ac_cv_func_futimens=no \
+	ac_cv_func_utimensat=no \
 
 COMMON_LDFLAGS=-Wl,-no_weak_imports
 
@@ -796,6 +805,7 @@ SIM_ACVARS = \
 	$(COMMON_ACVARS) \
 	ac_cv_func_clock_nanosleep=no \
 	mono_cv_uscore=yes \
+	ac_cv_func_system=no \
 
 define SimulatorBuildTemplate
 
@@ -989,7 +999,9 @@ WATCHSIMULATOR_ACVARS =  \
 	ac_cv_func_execv=no \
 	ac_cv_func_execve=no \
 	ac_cv_func_execvp=no \
-	ac_cv_func_signal=no
+	ac_cv_func_signal=no \
+	ac_cv_func_futimens=no \
+	ac_cv_func_utimensat=no \
 
 WATCHSIMULATOR_ENVIRONMENT =                  \
 	$(WATCHSIMULATOR_ACVARS)                         \
@@ -1139,7 +1151,9 @@ TVSIMULATOR_ACVARS =  \
 	ac_cv_func_execv=no \
 	ac_cv_func_execve=no \
 	ac_cv_func_execvp=no \
-	ac_cv_func_signal=no
+	ac_cv_func_signal=no \
+	ac_cv_func_futimens=no \
+	ac_cv_func_utimensat=no \
 
 TVSIMULATOR_ENVIRONMENT =                  \
 	$(TVSIMULATOR_ACVARS)                  \
@@ -1843,13 +1857,15 @@ endif
 
 LLVM_BASE_CONFIGURE_FLAGS=--enable-libcpp --enable-optimized --enable-assertions=no --disable-jit --disable-docs --disable-doxygen
 LLVM_CXXFLAGS=$(CCACHE_CXXFLAGS)
+LLVM_BASE_CONFIGURE_ENVIRONMENT=$(COMMON_ACVARS)
 
 # This is used just for linking with the 32 bit cross compiler
 # FIXME: Avoid building the libs not needed by mono
 .stamp-configure-llvm: $(LLVM_PATH)/configure
 	@mkdir -p llvm/
 	@echo "Configuring llvm"
 	@cd llvm && \
+	$(LLVM_BASE_CONFIGURE_ENVIRONMENT) \
 	$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --build=i386-apple-darwin10.7  --enable-targets="arm" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="$(LLVM_CXXFLAGS)" > [email protected] 2>&1 || (echo "Configuring llvm failed:" && cat [email protected] | sed "s/^/    /" && exit 1)
 	$(Q) @touch $@
 	@echo Configured llvm
@@ -1858,6 +1874,7 @@ LLVM_CXXFLAGS=$(CCACHE_CXXFLAGS)
 	@mkdir -p llvm64/
 	@echo "Configuring llvm64"
 	@cd llvm64 && \
+	$(LLVM_BASE_CONFIGURE_ENVIRONMENT) \
 	$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --enable-targets="arm arm64" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm64.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="-Qunused-arguments" > [email protected] 2>&1 || (echo "Configuring llvm64 failed:" && cat [email protected] | sed "s/^/    /" && exit 1)
 	$(Q) @touch $@
 	@echo "Configured llvm64"

docs/website/mtouch-errors.md

@@ -557,6 +557,18 @@ linker. This will most likely result in native linker errors.
 
 The solution is to remove the `--dynamic-symbol-mode=linker` argument from the additional mtouch arguments in the project's Build options.
 
+<h3><a name="MT0116"/>MT0116: Invalid architecture: {arch}. 32-bit architectures are not supported when deployment target is 11 or later. Make sure the project does not build for a 32-bit architecture.</h3>
+
+iOS 11 does not contain support for 32-bit applications, so it's not supported
+to build for a 32-bit application when the deployment target is iOS 11 or
+later.
+
+Either change the target architecture in the project's iOS build options to
+arm64, or change the deployment target in the project's Info.plist to an
+earlier iOS version.
+
+<h3><a name="MT0117"/>MT0117: Can't launch a 32-bit app on a simulator that only supports 64-bit.</h3>
+
 <!-- 0116 - 0124: free to use -->
 
 <h3><a name="MT0125"/>MT0125: The --assembly-build-target command-line argument is ignored in the simulator.</h3>

mk/xamarin.mk

@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := b4413efc991b853846e142929211b6e519b8672d
+NEEDED_MACCORE_VERSION := e2f9a1744d8fb3dd8012ce48585d76d60dfc512e
 NEEDED_MACCORE_BRANCH := d15-4-xi
 
 MACCORE_DIRECTORY := maccore

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets

@@ -1856,7 +1856,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		</ItemGroup>
 	</Target>
 
-	<Target Name="_CodesignAppBundle" Condition="'$(_RequireCodeSigning)' == 'true' And ('$(IsAppExtension)' == 'false' Or '@(_ResolvedAppExtensionReferences)' != '')" DependsOnTargets="$(_CodesignAppBundleDependsOn)"
+	<Target Name="_CodesignAppBundle" Condition="('$(_CanOutputAppBundle)' == 'true' And '$(_CodeSigningKey)' != '') And ('$(IsAppExtension)' == 'false' Or '@(_ResolvedAppExtensionReferences)' != '')" DependsOnTargets="$(_CodesignAppBundleDependsOn)"
 		Inputs="@(_CodesignAppBundleInputs)" Outputs="$(_AppBundlePath)_CodeSignature\CodeResources">
 
 		<PropertyGroup>

msbuild/tests/MyPhotoEditingExtension/Info.plist

@@ -18,6 +18,8 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>MinimumOSVersion</key>
+	<string>8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

msbuild/tests/MyShareExtension/Info.plist

@@ -18,6 +18,8 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>MinimumOSVersion</key>
+	<string>8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

msbuild/tests/MySingleView/Info.plist

@@ -15,7 +15,7 @@
 	<key>UIMainStoryboardFile</key>
 	<string>MainStoryboard</string>
 	<key>MinimumOSVersion</key>
-	<string>6.1</string>
+	<string>7.0</string>
 	<key>CFBundleDisplayName</key>
 	<string>ApplicationName</string>
 	<key>CFBundleIdentifier</key>

msbuild/tests/MyTodayExtension/Info.plist

@@ -18,6 +18,8 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>MinimumOSVersion</key>
+	<string>8.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

msbuild/tests/Xamarin.iOS.Tasks.Tests/TargetTests/TargetTests.cs

@@ -36,6 +36,7 @@ string[] ExpectedExecutableBundleResources {
 					"[email protected]",
 					"LaunchImage.png",
 					"[email protected]",
+					"Assets.car",
 				};
 				return files.Select (s => Path.Combine (AppBundlePath, s)).ToArray ();
 			}
@@ -435,7 +436,7 @@ public void BundleResources ()
 			var path = Path.Combine (MonoTouchProjectPath, "Info.plist");
 			var plist = PDictionary.FromFile (path);
 
-			plist.SetMinimumOSVersion ("6.1");
+			plist.SetMinimumOSVersion ("7.0");
 			plist.Save (path, true);
 
 			RunTarget (MonoTouchProject, TargetName.CollectBundleResources);
@@ -480,7 +481,7 @@ public void AddAppIcon_NoClean()
 
 			// Start without app icon.
 			plist.Remove("XSAppIconAssets");
-			plist.SetMinimumOSVersion ("6.1");
+			plist.SetMinimumOSVersion ("7.0");
 			plist.Save (path, true);
 
 			RunTarget (project, TargetName.CompileImageAssets);

runtime/Makefile

@@ -41,7 +41,7 @@ Delegates.generated.cs: Delegates.cs.t4 delegates.t4
 	$(Q_GEN) $(TT) $< -o $@
 
 bindings-generator.exe: bindings-generator.cs
-	$(Q) $(SYSTEM_MCS) $< -o:$@
+	$(Q) $(SYSTEM_MCS) $< -o:$@ -debug:full
 
 bindings-generated.m: bindings-generator.exe
 	$(Q_GEN) $(SYSTEM_MONO) --debug $< $@