Merge pull request dotnet#10606 from dalexsoto/main-d16-9

[d16-9] Merge xcode12.4 into d16-9
mynovelhost · Feb 10, 2021 · 3836759 · 3836759
2 parents 93ee8db + e03c80a
commit 3836759
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Make.config b/Make.config
@@ -119,9 +119,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

diff --git a/Make.versions b/Make.versions
@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=14.14.1.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=7.8.1.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=14.14.2.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=7.8.2.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **
@@ -66,7 +66,7 @@ MAC_PACKAGE_VERSION=7.8.1.$(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

diff --git a/Versions-ios.plist.in b/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>
@@ -103,6 +104,7 @@
 			<string>13.5</string>
 			<string>14.2</string>
 			<string>14.3</string>
+			<string>14.4</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -121,6 +123,8 @@
 		<string>11.0</string>
 		<key>14.3</key>
 		<string>11.1</string>
+		<key>14.4</key>
+		<string>11.2</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

diff --git a/tests/xtro-sharpie/iOS-ExposureNotification.ignore b/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