From 4b61850243355425f0fd4dcb34d1b19cd9596023 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 20 Aug 2019 10:06:18 -0400 Subject: [PATCH] [xcode11] Bump for beta 6 (#6798) AVFoundation crash added to https://github.com/xamarin/xamarin-macios/issues/6212 --- Make.config | 4 +-- Make.versions | 4 +-- src/avfoundation.cs | 1 + src/callkit.cs | 5 ---- tests/common/TestRuntime.cs | 8 +++++ tests/introspection/iOS/iOSApiProtocolTest.cs | 7 +++-- .../CoreText/FontManagerTest.cs | 2 +- tests/xtro-sharpie/iOS-AVFoundation.todo | 4 +++ tests/xtro-sharpie/iOS-FileProvider.todo | 14 +++++++++ tests/xtro-sharpie/iOS-HealthKit.ignore | 2 -- tests/xtro-sharpie/iOS-UIKit.todo | 13 +++++++++ tests/xtro-sharpie/macOS-AppKit.todo | 3 ++ tests/xtro-sharpie/macOS-FileProvider.todo | 2 ++ .../macOS-MetalPerformanceShaders.todo | 3 ++ tests/xtro-sharpie/macOS-OSLog.ignore | 29 ------------------- .../{macOS-Logging.todo => macOS-OSLog.todo} | 0 tests/xtro-sharpie/watchOS-HealthKit.ignore | 3 -- 17 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 tests/xtro-sharpie/iOS-FileProvider.todo delete mode 100644 tests/xtro-sharpie/iOS-HealthKit.ignore create mode 100644 tests/xtro-sharpie/macOS-FileProvider.todo delete mode 100644 tests/xtro-sharpie/macOS-OSLog.ignore rename tests/xtro-sharpie/{macOS-Logging.todo => macOS-OSLog.todo} (100%) diff --git a/Make.config b/Make.config index 66ff9608ec..90592e4d1a 100644 --- a/Make.config +++ b/Make.config @@ -44,8 +44,8 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M # Xcode version should have both a major and a minor version (even if the minor version is 0) XCODE_VERSION=11.0 -XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11_Beta_5.xip -XCODE_DEVELOPER_ROOT=/Applications/Xcode11-beta5.app/Contents/Developer +XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11_Beta_6.xip +XCODE_DEVELOPER_ROOT=/Applications/Xcode11-beta6.app/Contents/Developer XCODE94_VERSION=9.4 XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip diff --git a/Make.versions b/Make.versions index 0fc94c1f84..708ca8f72c 100644 --- a/Make.versions +++ b/Make.versions @@ -43,5 +43,5 @@ # line changed in git). # -IOS_PACKAGE_VERSION=12.99.2.$(IOS_COMMIT_DISTANCE) -MAC_PACKAGE_VERSION=5.99.2.$(MAC_COMMIT_DISTANCE) +IOS_PACKAGE_VERSION=12.99.3.$(IOS_COMMIT_DISTANCE) +MAC_PACKAGE_VERSION=5.99.3.$(MAC_COMMIT_DISTANCE) diff --git a/src/avfoundation.cs b/src/avfoundation.cs index c070f66b2e..c7dfdc80ca 100644 --- a/src/avfoundation.cs +++ b/src/avfoundation.cs @@ -3243,6 +3243,7 @@ namespace AVFoundation { [NoMac, NoWatch, NoTV, iOS (11,0)] [BaseType (typeof(AVCaptureSynchronizedData))] + [DisableDefaultCtor] interface AVCaptureSynchronizedDepthData { [Export ("depthData")] diff --git a/src/callkit.cs b/src/callkit.cs index 7daad82118..a926ed3f8f 100644 --- a/src/callkit.cs +++ b/src/callkit.cs @@ -481,11 +481,6 @@ namespace CallKit { [Export ("pendingCallActionsOfClass:withCallUUID:")] CXCallAction [] GetPendingCallActions (Class callActionClass, NSUuid callUuid); - - [iOS (13,0)] - [Static] - [Export ("supported")] - bool Supported { [Bind ("isSupported")] get; } } [iOS (10, 0)] diff --git a/tests/common/TestRuntime.cs b/tests/common/TestRuntime.cs index f70e2ab448..630162a068 100644 --- a/tests/common/TestRuntime.cs +++ b/tests/common/TestRuntime.cs @@ -147,12 +147,20 @@ partial class TestRuntime macOS = new { Major = 10, Minor = 15, Build = "?" }, watchOS = new { Major = 6, Minor = 0, Build = "?" }, }; + var elevenb6 = new { + Xcode = new { Major = 11, Minor = 0, Beta = 6 }, + iOS = new { Major = 13, Minor = 0, Build = "17A5565b" }, + tvOS = new { Major = 13, Minor = 0, Build = "?" }, + macOS = new { Major = 10, Minor = 15, Build = "?" }, + watchOS = new { Major = 6, Minor = 0, Build = "?" }, + }; var versions = new [] { nineb1, nineb2, nineb3, elevenb5, + elevenb6, }; foreach (var v in versions) { diff --git a/tests/introspection/iOS/iOSApiProtocolTest.cs b/tests/introspection/iOS/iOSApiProtocolTest.cs index af069e6520..8899b5d442 100644 --- a/tests/introspection/iOS/iOSApiProtocolTest.cs +++ b/tests/introspection/iOS/iOSApiProtocolTest.cs @@ -666,9 +666,10 @@ namespace Introspection { case "HMAction": case "HMCharacteristicWriteAction": case "MLPredictionOptions": - case "HKCumulativeQuantitySample": // Conformance not in headers - case "HKDiscreteQuantitySample": // Conformance not in headers - case "HKAudiogramSample": // Conformance not in headers + case "HKCumulativeQuantitySample": // Conformance not in headers + case "HKDiscreteQuantitySample": // Conformance not in headers + case "HKAudiogramSample": // Conformance not in headers + case "UIImage": // only complains on tvOS beta 6 return true; } break; diff --git a/tests/monotouch-test/CoreText/FontManagerTest.cs b/tests/monotouch-test/CoreText/FontManagerTest.cs index bafcdae851..1e8d747910 100644 --- a/tests/monotouch-test/CoreText/FontManagerTest.cs +++ b/tests/monotouch-test/CoreText/FontManagerTest.cs @@ -223,7 +223,7 @@ namespace MonoTouchFixtures.CoreText { TestRuntime.AssertXcodeVersion (11, 0); #if !__MACOS__ - if (TestRuntime.CheckExactXcodeVersion (11, 0, beta: 5)) + if (TestRuntime.CheckExactXcodeVersion (11, 0, beta: 6)) Assert.Ignore ("This began failing for no aparent reason in Beta 5, check back on a later beta."); #endif diff --git a/tests/xtro-sharpie/iOS-AVFoundation.todo b/tests/xtro-sharpie/iOS-AVFoundation.todo index 5e62c7b740..5395bfc54e 100644 --- a/tests/xtro-sharpie/iOS-AVFoundation.todo +++ b/tests/xtro-sharpie/iOS-AVFoundation.todo @@ -266,3 +266,7 @@ !missing-field! AVAudioUnitComponentManagerRegistrationsChangedNotification not bound !missing-selector! AVSpeechSynthesizer::setUsesApplicationAudioSession: not bound !missing-selector! AVSpeechSynthesizer::usesApplicationAudioSession not bound +## appended from unclassified file +!missing-selector! AVCaptureDevice::isGlobalToneMappingEnabled not bound +!missing-selector! AVCaptureDevice::setGlobalToneMappingEnabled: not bound +!missing-selector! AVCaptureDeviceFormat::isGlobalToneMappingSupported not bound diff --git a/tests/xtro-sharpie/iOS-FileProvider.todo b/tests/xtro-sharpie/iOS-FileProvider.todo new file mode 100644 index 0000000000..1b016478e7 --- /dev/null +++ b/tests/xtro-sharpie/iOS-FileProvider.todo @@ -0,0 +1,14 @@ +!extra-protocol-member! unexpected selector NSFileProviderItem::extendedAttributes found +!extra-protocol-member! unexpected selector NSFileProviderItem::flags found +!extra-protocol-member! unexpected selector NSFileProviderItem::isExcludedFromSync found +!extra-protocol-member! unexpected selector NSFileProviderItem::itemVersion found +!extra-protocol-member! unexpected selector NSFileProviderItemDecorating::decorations found +!unknown-field! NSFileProviderErrorItemKey bound +!unknown-native-enum! NSFileProviderCreateItemOptions bound +!unknown-native-enum! NSFileProviderDeleteItemOptions bound +!unknown-native-enum! NSFileProviderDownloadPolicy bound +!unknown-native-enum! NSFileProviderItemField bound +!unknown-native-enum! NSFileProviderPresenceAuthorizationStatus bound +!unknown-type! NSFileProviderItemVersion bound +!unknown-type! NSFileProviderRequest bound +!unknown-type! NSFileProviderSearchQuery bound diff --git a/tests/xtro-sharpie/iOS-HealthKit.ignore b/tests/xtro-sharpie/iOS-HealthKit.ignore deleted file mode 100644 index 8eaf3058df..0000000000 --- a/tests/xtro-sharpie/iOS-HealthKit.ignore +++ /dev/null @@ -1,2 +0,0 @@ -## type was marked as available in 13.0 - but doesn't exist https://github.com/xamarin/maccore/issues/1899 -!missing-field! HKCharacteristicTypeIdentifierActivityMoveMode not bound diff --git a/tests/xtro-sharpie/iOS-UIKit.todo b/tests/xtro-sharpie/iOS-UIKit.todo index e69de29bb2..484dc71cf7 100644 --- a/tests/xtro-sharpie/iOS-UIKit.todo +++ b/tests/xtro-sharpie/iOS-UIKit.todo @@ -0,0 +1,13 @@ +## appended from unclassified file +!deprecated-attribute-missing! UIContextMenuInteractionDelegate::contextMenuInteraction:willCommitWithAnimator: missing a [Deprecated] attribute +!deprecated-attribute-missing! UIContextMenuInteractionDelegate::contextMenuInteractionDidEnd: missing a [Deprecated] attribute +!deprecated-attribute-missing! UIContextMenuInteractionDelegate::contextMenuInteractionWillPresent: missing a [Deprecated] attribute +!extra-protocol-member! unexpected selector UIContextMenuInteractionCommitAnimating::addAnimations: found +!extra-protocol-member! unexpected selector UIContextMenuInteractionCommitAnimating::addCompletion: found +!extra-protocol-member! unexpected selector UIContextMenuInteractionCommitAnimating::previewViewController found +!missing-protocol! UIContextMenuInteractionAnimating not bound +!missing-protocol-member! UICollectionViewDelegate::collectionView:willPerformPreviewActionForMenuWithConfiguration:animator: not found +!missing-protocol-member! UIContextMenuInteractionDelegate::contextMenuInteraction:willDisplayMenuForConfiguration:animator: not found +!missing-protocol-member! UIContextMenuInteractionDelegate::contextMenuInteraction:willEndForConfiguration:animator: not found +!missing-protocol-member! UIContextMenuInteractionDelegate::contextMenuInteraction:willPerformPreviewActionForMenuWithConfiguration:animator: not found +!missing-protocol-member! UITableViewDelegate::tableView:willPerformPreviewActionForMenuWithConfiguration:animator: not found diff --git a/tests/xtro-sharpie/macOS-AppKit.todo b/tests/xtro-sharpie/macOS-AppKit.todo index 3ecfce71fc..8803758731 100644 --- a/tests/xtro-sharpie/macOS-AppKit.todo +++ b/tests/xtro-sharpie/macOS-AppKit.todo @@ -380,3 +380,6 @@ !missing-selector! NSSharingServicePickerToolbarItem::delegate not bound !missing-selector! NSSharingServicePickerToolbarItem::setDelegate: not bound !missing-type! NSSharingServicePickerToolbarItem not bound +## appended from unclassified file +!missing-selector! NSWorkspaceOpenConfiguration::allowsRunningApplicationSubstitution not bound +!missing-selector! NSWorkspaceOpenConfiguration::setAllowsRunningApplicationSubstitution: not bound diff --git a/tests/xtro-sharpie/macOS-FileProvider.todo b/tests/xtro-sharpie/macOS-FileProvider.todo new file mode 100644 index 0000000000..fb4a7ad907 --- /dev/null +++ b/tests/xtro-sharpie/macOS-FileProvider.todo @@ -0,0 +1,2 @@ +!extra-protocol-member! unexpected selector NSFileProviderEnumerator::didPresentEnumeratorInWindow:frontmost: found +!unknown-native-enum! NSFileProviderPresenceAuthorizationStatus bound diff --git a/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo b/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo index 4d7551537a..e78c59e367 100644 --- a/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo +++ b/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo @@ -595,3 +595,6 @@ !missing-type! MPSTemporaryNDArray not bound !unknown-simd-type-mapping! The Simd type vector_uchar16 does not have a mapping to a managed type. Please add one in SimdCheck.cs !wrong-base-type! MPSTriangleAccelerationStructure expected MPSPolygonAccelerationStructure actual MPSAccelerationStructure +## appended from unclassified file +!missing-selector! MPSMatrix::offset not bound +!missing-selector! MPSVector::offset not bound diff --git a/tests/xtro-sharpie/macOS-OSLog.ignore b/tests/xtro-sharpie/macOS-OSLog.ignore deleted file mode 100644 index 1163acdc8f..0000000000 --- a/tests/xtro-sharpie/macOS-OSLog.ignore +++ /dev/null @@ -1,29 +0,0 @@ -!missing-enum! OSLogEntryLogLevel not bound -!missing-enum! OSLogEntrySignpostType not bound -!missing-enum! OSLogEntryStoreCategory not bound -!missing-enum! OSLogEnumeratorOptions not bound -!missing-enum! OSLogMessageComponentArgumentCategory not bound -!missing-selector! +OSLogStore::localStoreAndReturnError: not bound -!missing-selector! +OSLogStore::storeWithURL:error: not bound -!missing-selector! OSLogEntry::composedMessage not bound -!missing-selector! OSLogEntry::date not bound -!missing-selector! OSLogEntry::storeCategory not bound -!missing-selector! OSLogEntryActivity::parentActivityIdentifier not bound -!missing-selector! OSLogEntryLog::level not bound -!missing-selector! OSLogEntrySignpost::signpostIdentifier not bound -!missing-selector! OSLogEntrySignpost::signpostName not bound -!missing-selector! OSLogEntrySignpost::signpostType not bound -!missing-selector! OSLogMessageComponent::argumentCategory not bound -!missing-selector! OSLogMessageComponent::argumentDataValue not bound -!missing-selector! OSLogMessageComponent::argumentDoubleValue not bound -!missing-selector! OSLogMessageComponent::argumentInt64Value not bound -!missing-selector! OSLogMessageComponent::argumentNumberValue not bound -!missing-selector! OSLogMessageComponent::argumentStringValue not bound -!missing-selector! OSLogMessageComponent::argumentUInt64Value not bound -!missing-selector! OSLogMessageComponent::formatSubstring not bound -!missing-selector! OSLogMessageComponent::placeholder not bound -!missing-selector! OSLogStore::entriesEnumeratorAndReturnError: not bound -!missing-selector! OSLogStore::entriesEnumeratorWithOptions:position:predicate:error: not bound -!missing-selector! OSLogStore::positionWithDate: not bound -!missing-selector! OSLogStore::positionWithTimeIntervalSinceEnd: not bound -!missing-selector! OSLogStore::positionWithTimeIntervalSinceLatestBoot: not bound diff --git a/tests/xtro-sharpie/macOS-Logging.todo b/tests/xtro-sharpie/macOS-OSLog.todo similarity index 100% rename from tests/xtro-sharpie/macOS-Logging.todo rename to tests/xtro-sharpie/macOS-OSLog.todo diff --git a/tests/xtro-sharpie/watchOS-HealthKit.ignore b/tests/xtro-sharpie/watchOS-HealthKit.ignore index a9c1b1148d..8e9897d144 100644 --- a/tests/xtro-sharpie/watchOS-HealthKit.ignore +++ b/tests/xtro-sharpie/watchOS-HealthKit.ignore @@ -18,6 +18,3 @@ ## type was marked as available in 3.0 - but it's now iOS 11 only (even if members are marked with 10.0) !unknown-type! HKCDADocument bound - -## type was marked as available in 6.0 - but doesn't exist https://github.com/xamarin/maccore/issues/1899 -!missing-field! HKCharacteristicTypeIdentifierActivityMoveMode not bound