Merge pull request #10634 from dalexsoto/main-xcode12.4-bump

[main] Merge xcode12.4 into main

Make.config

@@ -126,9 +126,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)-$(NUGET_PRERE
 MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=12.3
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.3.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.3.0.app/Contents/Developer
+XCODE_VERSION=12.4
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.4.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.4.0.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)
 
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
@@ -169,7 +169,7 @@ IOS_SDK_VERSION=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION))).$(word 2, $(subst .
 OSX_SDK_VERSION=$(word 1, $(subst ., ,$(MACOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(MACOS_NUGET_VERSION)))
 WATCH_SDK_VERSION=$(word 1, $(subst ., ,$(WATCHOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(WATCHOS_NUGET_VERSION)))
 TVOS_SDK_VERSION=$(word 1, $(subst ., ,$(TVOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(TVOS_NUGET_VERSION)))
-MACCATALYST_SDK_VERSION=$(IOS_SDK_VERSION)
+MACCATALYST_SDK_VERSION=$(word 1, $(subst ., ,$(MACCATALYST_NUGET_VERSION))).$(word 2, $(subst ., ,$(MACCATALYST_NUGET_VERSION)))
 MACCATALYST_MAC_SDK_VERSION=$(OSX_SDK_VERSION)
 
 MAX_IOS_DEPLOYMENT_TARGET=$(IOS_SDK_VERSION)

Make.versions

@@ -66,7 +66,7 @@ MAC_PACKAGE_VERSION=7.11.0.$(MAC_COMMIT_DISTANCE)
 # WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
 # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
 
-IOS_NUGET_VERSION=14.3.100
+IOS_NUGET_VERSION=14.4.100
 TVOS_NUGET_VERSION=14.3.100
 WATCHOS_NUGET_VERSION=7.2.100
 MACOS_NUGET_VERSION=11.1.100

Makefile

@@ -1,8 +1,12 @@
 TOP=.
-SUBDIRS=builds runtime fsharp src msbuild tools dotnet
+SUBDIRS=builds runtime fsharp src msbuild tools
 include $(TOP)/Make.config
 include $(TOP)/mk/versions.mk
 
+ifdef ENABLE_DOTNET
+SUBDIRS += dotnet
+endif
+
 #
 # Common
 #

Versions-ios.plist.in

@@ -44,6 +44,7 @@
 			<string>14.1</string>
 			<string>14.2</string>
 			<string>14.3</string>
+			<string>14.4</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -121,6 +122,8 @@
 		<string>11.0</string>
 		<key>14.3</key>
 		<string>11.1</string>
+		<key>14.4</key>
+		<string>11.1</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

tests/Makefile

@@ -1,11 +1,15 @@
 TOP = ..
-SUBDIRS=test-libraries dotnet
+SUBDIRS=test-libraries
 
 # disabled for now: mac-test
 
 include $(TOP)/Make.config
 include $(TOP)/mk/rules.mk
 
+ifdef ENABLE_DOTNET
+SUBDIRS += dotnet
+endif
+
 MTOUCH=$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/mtouch
 UNIT_SERVER_DIR=$(TOUCH_UNIT_PATH)/Touch.Server
 UNIT_SERVER=$(UNIT_SERVER_DIR)/bin/Debug/Touch.Server.exe

tests/xtro-sharpie/iOS-ExposureNotification.ignore

@@ -121,3 +121,10 @@
 !missing-selector! ENManager::setInvalidationHandler: not bound
 !missing-selector! +ENManager::authorizationStatus not bound
 !missing-selector! ENManager::exposureNotificationEnabled not bound
+!missing-enum! ENActivityFlags not bound
+!missing-selector! ENManager::activityHandler not bound
+!missing-selector! ENManager::diagnosisKeysAvailableHandler not bound
+!missing-selector! ENManager::preAuthorizeDiagnosisKeysWithCompletionHandler: not bound
+!missing-selector! ENManager::requestPreAuthorizedDiagnosisKeysWithCompletionHandler: not bound
+!missing-selector! ENManager::setActivityHandler: not bound
+!missing-selector! ENManager::setDiagnosisKeysAvailableHandler: not bound