diff --git a/Make.config b/Make.config index e99c8c0d56..2aa9f85ecd 100644 --- a/Make.config +++ b/Make.config @@ -44,7 +44,7 @@ endif # TODO: reset to 0 after major/minor version bump (SRO) and increment for service releases and previews # Note: if not reseted to 0 we can skip a version and start with .1 or .2 -PACKAGE_VERSION_REV=1 +PACKAGE_VERSION_REV=2 IOS_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV) IOS_PRODUCT=Xamarin.iOS @@ -59,8 +59,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=10.0 -XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_10_Beta_3.xip -XCODE_DEVELOPER_ROOT=/Applications/Xcode10-beta3.app/Contents/Developer +XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_10_Beta_4.xip +XCODE_DEVELOPER_ROOT=/Applications/Xcode10-beta4.app/Contents/Developer XCODE94_VERSION=9.4 XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip diff --git a/src/arkit.cs b/src/arkit.cs index f70cf9ab2c..ede9626ea9 100644 --- a/src/arkit.cs +++ b/src/arkit.cs @@ -701,11 +701,6 @@ namespace ARKit { [Export ("maximumNumberOfTrackedImages")] nint MaximumNumberOfTrackedImages { get; set; } - [iOS (12,0)] - [Static] - [Export ("objectDetectionSupported")] - bool ObjectDetectionSupported { [Bind ("isObjectDetectionSupported")] get; } - [iOS (12,0)] [Export ("detectionObjects", ArgumentSemantic.Copy)] NSSet DetectionObjects { get; set; } diff --git a/src/carplay.cs b/src/carplay.cs index e70467b2a5..c77a68622b 100644 --- a/src/carplay.cs +++ b/src/carplay.cs @@ -263,11 +263,11 @@ namespace CarPlay { [Abstract] [Export ("application:didConnectCarInterfaceController:toWindow:")] - void DidConnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPMapContentWindow window); + void DidConnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPWindow window); [Abstract] [Export ("application:didDisconnectCarInterfaceController:fromWindow:")] - void DidDisconnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPMapContentWindow window); + void DidDisconnectCarInterfaceController (UIApplication application, CPInterfaceController interfaceController, CPWindow window); [Export ("application:didSelectNavigationAlert:")] void DidSelectNavigationAlert (UIApplication application, CPNavigationAlert navigationAlert); @@ -335,8 +335,8 @@ namespace CarPlay { [DisableDefaultCtor] interface CPListTemplate : CPBarButtonProviding { - [Export ("initWithSections:")] - IntPtr Constructor (CPListSection [] sections); + [Export ("initWithTitle:sections:")] + IntPtr Constructor ([NullAllowed] string title, CPListSection[] sections); [Wrap ("WeakDelegate")] [NullAllowed] @@ -349,7 +349,7 @@ namespace CarPlay { CPListSection [] Sections { get; } [NullAllowed, Export ("title")] - string Title { get; set; } + string Title { get; } [Export ("updateSections:")] void UpdateSections (CPListSection [] sections); @@ -766,7 +766,7 @@ namespace CarPlay { [NoWatch, NoTV, NoMac, iOS (12,0)] [BaseType (typeof (UIWindow))] - interface CPMapContentWindow { + interface CPWindow { [Export ("initWithFrame:")] IntPtr Constructor (CGRect frame); diff --git a/src/metalperformanceshaders.cs b/src/metalperformanceshaders.cs index 2c50184a44..be6bdbc2e1 100644 --- a/src/metalperformanceshaders.cs +++ b/src/metalperformanceshaders.cs @@ -1253,7 +1253,7 @@ namespace MetalPerformanceShaders { [iOS (10,0)][TV (10,0)][Mac (10, 13, onlyOn64: true)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] - interface MPSImageDescriptor { + interface MPSImageDescriptor : NSCopying { [Export ("width")] nuint Width { get; set; } @@ -3240,7 +3240,7 @@ namespace MetalPerformanceShaders { [TV (11,0), Mac (10, 13, onlyOn64: true), iOS (11,0)] [Protocol, Model] [BaseType (typeof (NSObject), Name = "MPSCNNConvolutionDataSource")] - interface MPSCnnConvolutionDataSource { + interface MPSCnnConvolutionDataSource : NSCopying { [Abstract] [Export ("dataType")] MPSDataType DataType { get; } diff --git a/tests/introspection/ApiCoreImageFiltersTest.cs b/tests/introspection/ApiCoreImageFiltersTest.cs index c15233d47f..cdf8ed0f99 100644 --- a/tests/introspection/ApiCoreImageFiltersTest.cs +++ b/tests/introspection/ApiCoreImageFiltersTest.cs @@ -69,6 +69,8 @@ namespace Introspection { // FIXME: Remove if fixed. Doesn't appear to exist in El Capitan. Reported in radar #22099780 // case "CIMaskedVariableBlur": // cd .. return true; + case "CISaliencyMapFilter": // Appears in 10.14/iOS 12 but not documented + return true; default: return false; } diff --git a/tests/introspection/iOS/iOSCoreImageFiltersTest.cs b/tests/introspection/iOS/iOSCoreImageFiltersTest.cs index 2542b797df..feadfad248 100644 --- a/tests/introspection/iOS/iOSCoreImageFiltersTest.cs +++ b/tests/introspection/iOS/iOSCoreImageFiltersTest.cs @@ -33,15 +33,7 @@ namespace Introspection { protected override bool Skip (Type type) { switch (type.Name) { - // iOS 12 beta 1 ?removed? some filters - // https://github.com/xamarin/xamarin-macios/issues/4189 - case "CIAztecCodeGenerator": - case "CIBarcodeGenerator": - case "CICode128BarcodeGenerator": - case "CIPdf417BarcodeGenerator": - case "CIQRCodeGenerator": - if (TestRuntime.CheckXcodeVersion (10,0)) - return true; + default: break; } return base.Skip (type); diff --git a/tests/xtro-sharpie/iOS-ARKit.todo b/tests/xtro-sharpie/iOS-ARKit.todo new file mode 100644 index 0000000000..63bbceb48c --- /dev/null +++ b/tests/xtro-sharpie/iOS-ARKit.todo @@ -0,0 +1,2 @@ +!missing-protocol! ARAnchorCopying not bound +!missing-protocol-conformance! ARAnchor should conform to ARAnchorCopying diff --git a/tests/xtro-sharpie/iOS-Contacts.todo b/tests/xtro-sharpie/iOS-Contacts.todo new file mode 100644 index 0000000000..9660a1097f --- /dev/null +++ b/tests/xtro-sharpie/iOS-Contacts.todo @@ -0,0 +1,2 @@ +!missing-selector! +CNContact::predicateForContactsMatchingEmailAddress: not bound +!missing-selector! +CNContact::predicateForContactsMatchingPhoneNumber: not bound diff --git a/tests/xtro-sharpie/iOS-CoreImage.todo b/tests/xtro-sharpie/iOS-CoreImage.todo index 1e638f27c3..2688a1a7e4 100644 --- a/tests/xtro-sharpie/iOS-CoreImage.todo +++ b/tests/xtro-sharpie/iOS-CoreImage.todo @@ -16,3 +16,4 @@ ## appended from unclassified file !missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:orientation:options: not bound !missing-selector! CIContext::depthBlurEffectFilterForImageURL:options: not bound +!missing-selector! CIContext::depthBlurEffectFilterForImageData:options: not bound diff --git a/tests/xtro-sharpie/iOS-CoreMedia.todo b/tests/xtro-sharpie/iOS-CoreMedia.todo index 9be2e73b6a..1c6c1d606d 100644 --- a/tests/xtro-sharpie/iOS-CoreMedia.todo +++ b/tests/xtro-sharpie/iOS-CoreMedia.todo @@ -1 +1,2 @@ !missing-pinvoke! CMTimeFoldIntoRange is not bound +!missing-field! kCMFormatDescriptionTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/iOS-ImageIO.todo b/tests/xtro-sharpie/iOS-ImageIO.todo index 7b1d214737..2750518d1c 100644 --- a/tests/xtro-sharpie/iOS-ImageIO.todo +++ b/tests/xtro-sharpie/iOS-ImageIO.todo @@ -69,3 +69,5 @@ !missing-field! kCGImagePropertyPNGDisclaimer not bound !missing-field! kCGImagePropertyPNGSource not bound !missing-field! kCGImagePropertyPNGWarning not bound +!missing-field! kCGImagePropertyPrimaryImage not bound +!missing-pinvoke! CGImageSourceGetPrimaryImageIndex is not bound diff --git a/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo b/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo index acf6a3d07d..549033c52a 100644 --- a/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo +++ b/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo @@ -242,7 +242,6 @@ !missing-type! MPSRNNMatrixTrainingLayer not bound !missing-type! MPSRNNMatrixTrainingState not bound ## appended from unclassified file -!missing-protocol-member! MPSCNNConvolutionDataSource::copyWithZone: not found !missing-protocol-member! MPSCNNConvolutionDataSource::copyWithZone:device: not found !missing-selector! MPSCNNBatchNormalization::initWithDevice:dataSource:fusedNeuronDescriptor: not bound !missing-selector! MPSCNNBatchNormalizationStatisticsGradient::initWithCoder:device: not bound @@ -288,3 +287,7 @@ !missing-selector! MPSNNOptimizerRMSProp::encodeToCommandBuffer:batchNormalizationState:inputSumOfSquaresVectors:resultState: not bound !missing-selector! MPSNNOptimizerStochasticGradientDescent::encodeToCommandBuffer:batchNormalizationState:inputMomentumVectors:resultState: not bound !missing-type! MPSImageNormalizedHistogram not bound +!missing-protocol-member! MPSImageAllocator::imageBatchForCommandBuffer:imageDescriptor:kernel:count: not found +!missing-selector! MPSNNFilterNode::trainingGraphWithSourceGradient:nodeHandler: not bound +!missing-selector! MPSNNImageNode::setStopGradient: not bound +!missing-selector! MPSNNImageNode::stopGradient not bound diff --git a/tests/xtro-sharpie/macOS-AppKit.ignore b/tests/xtro-sharpie/macOS-AppKit.ignore index 47c5c16ae5..3a0e7ea740 100644 --- a/tests/xtro-sharpie/macOS-AppKit.ignore +++ b/tests/xtro-sharpie/macOS-AppKit.ignore @@ -1144,9 +1144,6 @@ !missing-protocol-conformance! NSTextView should conform to NSStandardKeyBindingResponding !missing-protocol-conformance! NSResponder should conform to NSStandardKeyBindingResponding (defined in 'NSStandardKeyBindingMethods' category) -## 41367075 NSSecureTextField header claims NSViewToolTipOwner but does not respond to selector -!missing-protocol-conformance! NSSecureTextField should conform to NSViewToolTipOwner - ## DoCommandBySelector conflicts with NSTextViewDelegate in generated code !missing-protocol-member! NSTextInput::doCommandBySelector: not found diff --git a/tests/xtro-sharpie/macOS-AppKit.todo b/tests/xtro-sharpie/macOS-AppKit.todo index cee7037eb2..cdf446db96 100644 --- a/tests/xtro-sharpie/macOS-AppKit.todo +++ b/tests/xtro-sharpie/macOS-AppKit.todo @@ -4,3 +4,5 @@ !missing-selector! +NSColor::findHighlightColor not bound !missing-selector! +NSColor::placeholderTextColor not bound !missing-selector! NSSliderCell::setImage: not bound +!missing-selector! NSLayoutManager::limitsLayoutForSuspiciousContents not bound +!missing-selector! NSLayoutManager::setLimitsLayoutForSuspiciousContents: not bound diff --git a/tests/xtro-sharpie/macOS-Contacts.todo b/tests/xtro-sharpie/macOS-Contacts.todo new file mode 100644 index 0000000000..9660a1097f --- /dev/null +++ b/tests/xtro-sharpie/macOS-Contacts.todo @@ -0,0 +1,2 @@ +!missing-selector! +CNContact::predicateForContactsMatchingEmailAddress: not bound +!missing-selector! +CNContact::predicateForContactsMatchingPhoneNumber: not bound diff --git a/tests/xtro-sharpie/macOS-CoreImage.todo b/tests/xtro-sharpie/macOS-CoreImage.todo index 1e638f27c3..2688a1a7e4 100644 --- a/tests/xtro-sharpie/macOS-CoreImage.todo +++ b/tests/xtro-sharpie/macOS-CoreImage.todo @@ -16,3 +16,4 @@ ## appended from unclassified file !missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:orientation:options: not bound !missing-selector! CIContext::depthBlurEffectFilterForImageURL:options: not bound +!missing-selector! CIContext::depthBlurEffectFilterForImageData:options: not bound diff --git a/tests/xtro-sharpie/macOS-CoreMedia.todo b/tests/xtro-sharpie/macOS-CoreMedia.todo index e48f99c4d2..bd9bde4202 100644 --- a/tests/xtro-sharpie/macOS-CoreMedia.todo +++ b/tests/xtro-sharpie/macOS-CoreMedia.todo @@ -5,3 +5,4 @@ !missing-field! kCMSampleBufferLensStabilizationInfo_OutOfRange not bound !missing-field! kCMSampleBufferLensStabilizationInfo_Unavailable not bound !missing-pinvoke! CMTimeFoldIntoRange is not bound +!missing-field! kCMFormatDescriptionTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/macOS-FinderSync.todo b/tests/xtro-sharpie/macOS-FinderSync.todo new file mode 100644 index 0000000000..b8d2fd6e02 --- /dev/null +++ b/tests/xtro-sharpie/macOS-FinderSync.todo @@ -0,0 +1 @@ +!missing-selector! +FIFinderSyncController::isExtensionEnabled not bound diff --git a/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo b/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo index acf6a3d07d..549033c52a 100644 --- a/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo +++ b/tests/xtro-sharpie/macOS-MetalPerformanceShaders.todo @@ -242,7 +242,6 @@ !missing-type! MPSRNNMatrixTrainingLayer not bound !missing-type! MPSRNNMatrixTrainingState not bound ## appended from unclassified file -!missing-protocol-member! MPSCNNConvolutionDataSource::copyWithZone: not found !missing-protocol-member! MPSCNNConvolutionDataSource::copyWithZone:device: not found !missing-selector! MPSCNNBatchNormalization::initWithDevice:dataSource:fusedNeuronDescriptor: not bound !missing-selector! MPSCNNBatchNormalizationStatisticsGradient::initWithCoder:device: not bound @@ -288,3 +287,7 @@ !missing-selector! MPSNNOptimizerRMSProp::encodeToCommandBuffer:batchNormalizationState:inputSumOfSquaresVectors:resultState: not bound !missing-selector! MPSNNOptimizerStochasticGradientDescent::encodeToCommandBuffer:batchNormalizationState:inputMomentumVectors:resultState: not bound !missing-type! MPSImageNormalizedHistogram not bound +!missing-protocol-member! MPSImageAllocator::imageBatchForCommandBuffer:imageDescriptor:kernel:count: not found +!missing-selector! MPSNNFilterNode::trainingGraphWithSourceGradient:nodeHandler: not bound +!missing-selector! MPSNNImageNode::setStopGradient: not bound +!missing-selector! MPSNNImageNode::stopGradient not bound diff --git a/tests/xtro-sharpie/macOS-Photos.todo b/tests/xtro-sharpie/macOS-Photos.todo new file mode 100644 index 0000000000..7de6ae7703 --- /dev/null +++ b/tests/xtro-sharpie/macOS-Photos.todo @@ -0,0 +1 @@ +!missing-selector! PHProjectChangeRequest::removeAssets: not bound diff --git a/tests/xtro-sharpie/macOS-QuartzComposer.ignore b/tests/xtro-sharpie/macOS-QuartzComposer.ignore index dd7d2f490a..0ed9a6a147 100644 --- a/tests/xtro-sharpie/macOS-QuartzComposer.ignore +++ b/tests/xtro-sharpie/macOS-QuartzComposer.ignore @@ -2,11 +2,6 @@ !missing-selector! QCRenderer::initWithCGLContext:pixelFormat:colorSpace:composition: not bound !missing-selector! QCRenderer::initWithOpenGLContext:pixelFormat:file: not bound -## Xcode 10 beta 1 removed some constants (without ever deprecating them) https://trello.com/c/oTIKcwum/119-41125938-constant-removal-in-quartzcomposerframework -!unknown-field! QCCompositionInputRSSArticleDurationKey bound -!unknown-field! QCCompositionInputRSSFeedURLKey bound -!unknown-field! QCCompositionProtocolRSSVisualizer bound - ## unsorted !missing-field! QCCompositionPickerPanelDidSelectCompositionNotification not bound diff --git a/tests/xtro-sharpie/macOS-UserNotifications.todo b/tests/xtro-sharpie/macOS-UserNotifications.todo new file mode 100644 index 0000000000..9eff87e6b6 --- /dev/null +++ b/tests/xtro-sharpie/macOS-UserNotifications.todo @@ -0,0 +1 @@ +!unknown-type! UNLocationNotificationTrigger bound diff --git a/tests/xtro-sharpie/tvOS-CoreImage.todo b/tests/xtro-sharpie/tvOS-CoreImage.todo index 1e638f27c3..2688a1a7e4 100644 --- a/tests/xtro-sharpie/tvOS-CoreImage.todo +++ b/tests/xtro-sharpie/tvOS-CoreImage.todo @@ -16,3 +16,4 @@ ## appended from unclassified file !missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:orientation:options: not bound !missing-selector! CIContext::depthBlurEffectFilterForImageURL:options: not bound +!missing-selector! CIContext::depthBlurEffectFilterForImageData:options: not bound diff --git a/tests/xtro-sharpie/tvOS-CoreMedia.todo b/tests/xtro-sharpie/tvOS-CoreMedia.todo index 9be2e73b6a..1c6c1d606d 100644 --- a/tests/xtro-sharpie/tvOS-CoreMedia.todo +++ b/tests/xtro-sharpie/tvOS-CoreMedia.todo @@ -1 +1,2 @@ !missing-pinvoke! CMTimeFoldIntoRange is not bound +!missing-field! kCMFormatDescriptionTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/tvOS-TVMLKit.todo b/tests/xtro-sharpie/tvOS-TVMLKit.todo new file mode 100644 index 0000000000..7acad9d75f --- /dev/null +++ b/tests/xtro-sharpie/tvOS-TVMLKit.todo @@ -0,0 +1 @@ +!missing-selector! TVMediaItem::isExplicitContent not bound diff --git a/tests/xtro-sharpie/watchOS-Contacts.todo b/tests/xtro-sharpie/watchOS-Contacts.todo new file mode 100644 index 0000000000..9660a1097f --- /dev/null +++ b/tests/xtro-sharpie/watchOS-Contacts.todo @@ -0,0 +1,2 @@ +!missing-selector! +CNContact::predicateForContactsMatchingEmailAddress: not bound +!missing-selector! +CNContact::predicateForContactsMatchingPhoneNumber: not bound