Merge xcode10 into d15-9

.gitignore

@@ -17,5 +17,4 @@ packages
 .DS_Store
 jenkins-results
 .vs
-
 *.raw

CODEOWNERS

@@ -28,12 +28,15 @@
 /src/audiotoolbox.cs @dalexsoto
 /src/AudioUnit @dalexsoto
 /src/audiounit.cs @dalexsoto
+/src/authenticationservices.cs @spouliot
 /src/AVFoundation @mandel-macaque @dalexsoto
 /src/avfoundation.cs @mandel-macaque @dalexsoto
 /src/AVKit @spouliot @dalexsoto
 /src/avkit.cs @spouliot @dalexsoto
 /src/CallKit @dalexsoto
 /src/callkit.cs @dalexsoto
+/src/CarPlay @dalexsoto
+/src/carplay.cs @dalexsoto
 /src/CFNetwork @spouliot
 /src/cfnetwork.cs @spouliot
 /src/CloudKit @mandel-macaque
@@ -92,6 +95,10 @@
 /src/homekit.cs @VincentDondain
 /src/iad.cs @spouliot
 /src/iAd.framework @spouliot
+/src/identitylookup.cs @dalexsoto
+/src/identitylookupui.cs @dalexsoto
+/src/ituneslibrary.cs @mandel-macaque
+/src/iTunesLibrary @mandel-macaque
 /src/ImageIO @spouliot @chamons
 /src/imageio.cs @spouliot @chamons
 /src/ImageKit @chamons
@@ -124,6 +131,9 @@
 /src/modelio.cs @VincentDondain
 /src/MultipeerConnectivity @spouliot
 /src/multipeerconnectivity.cs @spouliot
+/src/naturallanguage.cs @mandel-macaque
+/src/NaturalLanguage @mandel-macaque
+/src/Network @migueldeicaza
 /src/NetworkExtension @spouliot
 /src/networkextension.cs @spouliot
 /src/NotificationCenter @spouliot

Make.config

@@ -17,29 +17,17 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 #
 # A release branch requires updating:
 #
-# 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)
 #
 
-#
-# PACKAGE_HEAD_BRANCH determines the branch name (for wrench builds) that shows up in the
-# IDE's version information, as well as mtouch/mmp --version and the AssemblyInformationalVersion
-# for product assemblies.
-#
-# For developer builds, we check with git which branch is the current one (we can't do that
-# on wrench, because wrench technically builds hashes, not branches)
-#
-# 
-PACKAGE_HEAD_BRANCH?=d15-9
-ifeq ($(CURRENT_BRANCH),)
-ifeq ($(BUILD_REVISION),)
+ifeq ($(BRANCH_NAME),)
+# BRANCH_NAME is set in Jenkins, so this is for local builds.
 CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 else
-CURRENT_BRANCH:=$(PACKAGE_HEAD_BRANCH)
-endif
+CURRENT_BRANCH:=$(BRANCH_NAME)
 endif
 
 # TODO: reset to 0 after major/minor version bump (SRO) and increment for service releases and previews
@@ -50,16 +38,20 @@ 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=11.16.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=12.2.$(PACKAGE_VERSION_REV).$(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=$(PACKAGE_VERSION_REV)
 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))
+IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
+
+# Xcode version should have both a major and a minor version (even if the minor version is 0)
+XCODE_VERSION=10.0
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_10_GM_seed.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode10GM.app/Contents/Developer
 
-XCODE_VERSION=9.4
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer
+XCODE94_VERSION=9.4
+XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
+XCODE94_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer
 
 # Minimum Mono version
 MIN_MONO_VERSION=5.14.0.136
@@ -69,7 +61,7 @@ MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/201
 # Minimum Visual Studio version
 MIN_VISUAL_STUDIO_URL=https://download.visualstudio.microsoft.com/download/pr/11550896/783d2219a348f93b6988fb415951788a/VisualStudioForMac-Preview-7.4.0.985.dmg
 MIN_VISUAL_STUDIO_VERSION=7.4.0.985
-MAX_VISUAL_STUDIO_VERSION=7.5.99
+MAX_VISUAL_STUDIO_VERSION=7.7.99
 
 # Minimum CMake version
 MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
@@ -85,11 +77,11 @@ MIN_OSX_BUILD_VERSION=10.13
 MIN_OSX_VERSION_FOR_IOS=10.11
 MIN_OSX_VERSION_FOR_MAC=10.11
 
-IOS_SDK_VERSION=11.4
+IOS_SDK_VERSION=12.0
 # When bumping OSX_SDK_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
-OSX_SDK_VERSION=10.13
-WATCH_SDK_VERSION=4.3
-TVOS_SDK_VERSION=11.4
+OSX_SDK_VERSION=10.14
+WATCH_SDK_VERSION=5.0
+TVOS_SDK_VERSION=12.0
 
 MIN_IOS_SDK_VERSION=6.0
 MIN_OSX_SDK_VERSION=10.7
@@ -118,10 +110,14 @@ else
 APPLETLS_DEFINES = -d:XAMARIN_APPLETLS
 endif
 
-XCODE_MAC_SDKROOT=$(XCODE_DEVELOPER_ROOT)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(OSX_SDK_VERSION).sdk
+XCODE_MAC_SDKROOT=$(XCODE_DEVELOPER_ROOT)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+XCODE94_MAC_SDKROOT=$(XCODE94_DEVELOPER_ROOT)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+
+MAC_CC=$(CCACHE)$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -isysroot $(XCODE_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC) -stdlib=libc++
+MAC_CXX=$(CCACHE)$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -isysroot $(XCODE_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC) -stdlib=libc++
 
-MAC_CC=$(CCACHE)$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -isysroot $(XCODE_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC)
-MAC_CXX=$(CCACHE)$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -isysroot $(XCODE_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC)
+MAC32_CC=$(CCACHE)$(XCODE94_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -isysroot $(XCODE94_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC) -stdlib=libc++
+MAC32_CXX=$(CCACHE)$(XCODE94_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -isysroot $(XCODE94_MAC_SDKROOT) -mmacosx-version-min=$(MIN_OSX_VERSION_FOR_MAC) -stdlib=libc++
 
 # This is the temporary directory where the various builds are installed
 BUILD_DESTDIR=$(abspath $(TOP)/builds/install)
@@ -171,7 +167,7 @@ endif
 
 SIMULATOR_SDK=$(XCODE_DEVELOPER_ROOT)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(IOS_SDK_VERSION).sdk
 
-OBJC_CFLAGS=-ObjC++ -std=c++0x -fno-exceptions
+OBJC_CFLAGS=-ObjC++ -std=c++0x -fno-exceptions -stdlib=libc++
 
 COMMON_SIMULATOR_CFLAGS=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION) -isysroot $(SIMULATOR_SDK) $(CFLAGS) -g $(IOS_COMMON_DEFINES)
 SIMULATOR86_CFLAGS=$(COMMON_SIMULATOR_CFLAGS) -arch i386
@@ -264,7 +260,7 @@ MAC_PRODUCT=Xamarin.Mac
 MAC_PACKAGE_NAME=xamarin.mac
 MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 
-MAC_PACKAGE_VERSION=4.8.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=5.0.$(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=$(PACKAGE_VERSION_REV)

Versions-ios.plist.in

@@ -30,6 +30,7 @@
 			<string>11.2</string>
 			<string>11.3</string>
 			<string>11.4</string>
+			<string>12.0</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -44,6 +45,7 @@
 			<string>11.2</string>
 			<string>11.3</string>
 			<string>11.4</string>
+			<string>12.0</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -58,6 +60,7 @@
 			<string>4.1</string>
 			<string>4.2</string>
 			<string>4.3</string>
+			<string>5.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

Versions-mac.plist.in

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

builds/Makefile

@@ -208,9 +208,10 @@ MAC_TARGETS = \
 	$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current \
 	$(MAC_DIRECTORIES) \
 
+#  $(3): specific xcode path
 define MacBuildTemplate
 $(2)_CPPFLAGS = \
-	-isysroot $(XCODE_MAC_SDKROOT) \
+	-isysroot $(5) \
 	-mmacosx-version-min=$(MIN_OSX_SDK_VERSION)
 $(2)_CFLAGS = -O2 -arch $(1)
 $(2)_CXXFLAGS = -O2 -arch $(1)
@@ -237,9 +238,9 @@ $(2)_CONFIGURE_ENVIRONMENT = \
 	CFLAGS="$$($(2)_CFLAGS)" \
 	CXXFLAGS="$$($(2)_CXXFLAGS)" \
 	LDFLAGS="$$($(2)_LDFLAGS)" \
-	CC="$(MAC_CC)" \
-	CXX="$(MAC_CXX)" \
-	DEVELOPER_DIR="$(XCODE_DEVELOPER_ROOT)" \
+	CC="$(MAC$(4)_CC)" \
+	CXX="$(MAC$(4)_CXX)" \
+	DEVELOPER_DIR="$(3)" \
 
 setup:: setup-$(2)
 
@@ -261,8 +262,8 @@ $(BUILD_DESTDIR)/mono-$(2): mono-wrapper.in .stamp-configure-$(2) | $(BUILD_DEST
 build-$(2): .stamp-build-$(2)
 endef
 
-$(eval $(call MacBuildTemplate,i386,mac32))
-$(eval $(call MacBuildTemplate,x86_64,mac64))
+$(eval $(call MacBuildTemplate,i386,mac32,$(XCODE94_DEVELOPER_ROOT),32,$(XCODE94_MAC_SDKROOT)))
+$(eval $(call MacBuildTemplate,x86_64,mac64,$(XCODE_DEVELOPER_ROOT),,$(XCODE_MAC_SDKROOT)))
 
 $(MONO_PATH)/mcs/class/lib/%: .stamp-build-tools64; @true
 
@@ -1548,6 +1549,7 @@ offsets-tool: $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe
 #  $(2): llvm (llvm32 or llvm64)
 #  $(3): cross compiler executable (arm-darwin-mono-sgen)
 #  $(4): cross compiler executable generated by mono sdk
+#  $(5): specific xcode path
 ##
 define iOSCrossTemplate
 
@@ -1564,7 +1566,7 @@ endif
 endif
 
 .stamp-build-$(1): .stamp-build-llvm $(MONO_PATH)/configure $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(MONO_DEPENDENCIES) $(SDK_CONFIG)
-	$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(1) $(SDK_ARGS)
+	$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(1) $(SDK_ARGS) $(if $(5), XCODE_DIR=$(5))
 	$(Q) touch $$@
 
 build-$(1): .stamp-build-$(1)
@@ -1585,6 +1587,6 @@ clean-$(1): $(SDK_CONFIG)
 
 endef
 
-$(eval $(call iOSCrossTemplate,cross32,llvm32,arm-darwin-mono-sgen,arm-darwin-mono-sgen))
+$(eval $(call iOSCrossTemplate,cross32,llvm32,arm-darwin-mono-sgen,arm-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))
 $(eval $(call iOSCrossTemplate,cross64,llvm64,arm64-darwin-mono-sgen,aarch64-darwin-mono-sgen))
-$(eval $(call iOSCrossTemplate,crosswatch,llvm32,armv7k-unknown-darwin-mono-sgen,armv7k-unknown-darwin-mono-sgen))
+$(eval $(call iOSCrossTemplate,crosswatch,llvm32,armv7k-unknown-darwin-mono-sgen,armv7k-unknown-darwin-mono-sgen,$(XCODE94_DEVELOPER_ROOT)))

docs/website/Makefile

@@ -1,21 +1,23 @@
 TOP=../../..
-WEBSITE_DOCS ?= $(TOP)/documentation
+WEBSITE_DOCS ?= $(TOP)/xamarin-docs-pr
 XAMARIN_ANALYSIS ?=$(TOP)/xamarin-analysis/shared/Xamarin.Analysis
 XAMARIN_ANALYSIS_DOC = xamarin-analysis-doc-tool/bin/Debug
 
 all: xamarin-analysis-doc
-	cp mtouch-errors.md $(WEBSITE_DOCS)/guides/ios/troubleshooting/mtouch-errors/index.md
-	cp binding_objc_libs.md $(WEBSITE_DOCS)/guides/cross-platform/macios/binding/objective-c-libraries/index.md
-	cp binding_types_reference_guide.md $(WEBSITE_DOCS)/guides/cross-platform/macios/binding/binding-types-reference/index.md
-	cp xamarin-ios-analysis.md $(WEBSITE_DOCS)/guides/ios/troubleshooting/xamarin-ios-analysis/index.md
-	cp optimizations.md $(WEBSITE_DOCS)/guides/cross-platform/macios/build-optimizations/index.md
+	cp mtouch-errors.md $(WEBSITE_DOCS)/docs/ios/troubleshooting/mtouch-errors.md
+	cp mmp-errors.md $(WEBSITE_DOCS)/docs/mac/troubleshooting/mmp-errors.md
+	cp binding_objc_libs.md $(WEBSITE_DOCS)/docs/cross-platform/macios/binding/objective-c-libraries.md
+	cp binding_types_reference_guide.md $(WEBSITE_DOCS)/docs/cross-platform/macios/binding/binding-types-reference.md
+	cp xamarin-ios-analysis.md $(WEBSITE_DOCS)/ios/troubleshooting/xamarin-ios-analysis.md
+	cp optimizations.md $(WEBSITE_DOCS)/docs/cross-platform/macios/optimizations.md
 
 diff:
-	-diff -u $(WEBSITE_DOCS)/guides/ios/troubleshooting/mtouch-errors/index.md mtouch-errors.md
-	-diff -u $(WEBSITE_DOCS)/guides/cross-platform/macios/binding/objective-c-libraries/index.md binding_objc_libs.md
-	-diff -u $(WEBSITE_DOCS)/guides/cross-platform/macios/binding/binding-types-reference/index.md binding_types_reference_guide.md
-	-diff -u $(WEBSITE_DOCS)/guides/ios/troubleshooting/xamarin-ios-analysis/index.md xamarin-ios-analysis.md
-	-diff -u $(WEBSITE_DOCS)/guides/cross-platform/macios/build-optimizations/index.md optimizations.md
+	-diff -u $(WEBSITE_DOCS)/docs/ios/troubleshooting/mtouch-errors.md mtouch-errors.md
+	-diff -u $(WEBSITE_DOCS)/docs/mac/troubleshooting/mmp-errors.md mmp-errors.md
+	-diff -u $(WEBSITE_DOCS)/docs/cross-platform/macios/binding/objective-c-libraries.md binding_objc_libs.md
+	-diff -u $(WEBSITE_DOCS)/docs/cross-platform/macios/binding/binding-types-reference.md binding_types_reference_guide.md
+	-diff -u $(WEBSITE_DOCS)/docs/ios/troubleshooting/xamarin-ios-analysis.md xamarin-ios-analysis.md
+	-diff -u $(WEBSITE_DOCS)/docs/cross-platform/macios/optimizations.md optimizations.md
 
 xamarin-analysis-doc:
 	msbuild xamarin-analysis-doc-tool/xamarin-analysis-doc.sln