Skip to content

Commit

Permalink
[xcode15.1] Bump PR to Xcode 15.1 Beta 3
Browse files Browse the repository at this point in the history
  • Loading branch information
dalexsoto committed Nov 30, 2023
1 parent a736e68 commit 51aa294
Show file tree
Hide file tree
Showing 99 changed files with 815 additions and 991 deletions.
6 changes: 3 additions & 3 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
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=15.0
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.0.0.app/Contents/Developer
XCODE_VERSION=15.1
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.1_beta_3.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.1.0-beta3.app/Contents/Developer
XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo " $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)

# We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"
Expand Down
14 changes: 7 additions & 7 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
# line changed in git).
#

IOS_PACKAGE_VERSION=17.1.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.1.0.$(MAC_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=17.1.1.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.1.1.$(MAC_COMMIT_DISTANCE)

#
# ** NuGet package version numbers **
Expand All @@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.1.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)

IOS_NUGET_OS_VERSION=17.0
TVOS_NUGET_OS_VERSION=17.0
WATCHOS_NUGET_OS_VERSION=10.0
MACOS_NUGET_OS_VERSION=14.0
MACCATALYST_NUGET_OS_VERSION=17.0
IOS_NUGET_OS_VERSION=17.2
TVOS_NUGET_OS_VERSION=17.2
WATCHOS_NUGET_OS_VERSION=10.2
MACOS_NUGET_OS_VERSION=14.2
MACCATALYST_NUGET_OS_VERSION=17.2


# Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
Expand Down
8 changes: 8 additions & 0 deletions Versions-ios.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<string>16.2</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
<key>tvOS</key>
<array>
Expand Down Expand Up @@ -68,6 +69,7 @@
<string>16.1</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
<key>watchOS</key>
<array>
Expand All @@ -93,6 +95,7 @@
<string>9.0</string>
<string>9.4</string>
<string>10.0</string>
<string>10.2</string>
</array>
<key>MacCatalyst</key>
<array>
Expand All @@ -112,6 +115,7 @@
<string>16.2</string>
<string>16.4</string>
<string>17.0</string>
<string>17.2</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -146,6 +150,10 @@
<string>13.1</string>
<key>16.4</key>
<string>13.3</string>
<key>17.0</key>
<string>14.0</string>
<key>17.2</key>
<string>14.2</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>
Expand Down
1 change: 1 addition & 0 deletions Versions-mac.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<string>13.1</string>
<string>13.3</string>
<string>14.0</string>
<string>14.2</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
17 changes: 17 additions & 0 deletions src/NetworkExtension/NECompat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
using System;
using System.Threading.Tasks;
using Foundation;
using ObjCRuntime;

#if !NET
using NativeHandle = System.IntPtr;
#endif

namespace NetworkExtension {

Expand Down Expand Up @@ -49,4 +54,16 @@ public partial class NWTcpConnectionAuthenticationDelegate : NSObject {
}
}
#endif

[Obsolete (Constants.ApiRemovedGeneral)]
[Register ("NEFailureHandlerProvider", SkipRegistration = true)]
public class NEFailureHandlerProvider : NEProvider {
public override NativeHandle ClassHandle => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

protected NEFailureHandlerProvider (NSObjectFlag t) : base (t) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
protected internal NEFailureHandlerProvider (NativeHandle handle) : base (handle) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

public unsafe virtual void HandleFailure (NSError error, Action completionHandler) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
public unsafe virtual Task HandleFailureAsync (NSError error) => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
}
}
29 changes: 29 additions & 0 deletions src/Speech/SFCompat.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#nullable enable

using System;
using Foundation;
using ObjCRuntime;
using System.ComponentModel;

#if !NET
using NativeHandle = System.IntPtr;
#endif

namespace Speech {

[Obsolete (Constants.ApiRemovedGeneral)]
public unsafe partial class SFAnalysisContextTag {

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString LeftContext => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString RightContext => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);

[Obsolete (Constants.ApiRemovedGeneral)]
[EditorBrowsable (EditorBrowsableState.Never)]
public static NSString SelectedText => throw new PlatformNotSupportedException (Constants.ApiRemovedGeneral);
}
}
5 changes: 5 additions & 0 deletions src/frameworks.sources
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,11 @@ SOCIAL_SOURCES = \
Social/SLComposeViewController.cs \
Social/SLRequest.cs \

# Speech

SPEECH_SOURCES = \
Speech/SFCompat.cs \

# SpriteKit

SPRITEKIT_API_SOURCES = \
Expand Down
10 changes: 0 additions & 10 deletions src/networkextension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2612,14 +2612,4 @@ interface NERelayManager {
[Async]
void LoadAllManagersFromPreferences (Action<NSArray<NERelayManager>, NSError> completionHandler);
}

[NoWatch, NoTV, Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[BaseType (typeof (NEProvider))]
[DisableDefaultCtor]
interface NEFailureHandlerProvider {
[NoWatch, NoTV, Mac (14, 0), iOS (17, 0)]
[Export ("handleFailure:completionHandler:")]
[Async]
void HandleFailure (NSError error, Action completionHandler);
}
}
13 changes: 0 additions & 13 deletions src/speech.cs
Original file line number Diff line number Diff line change
Expand Up @@ -391,17 +391,4 @@ interface SFSpeechLanguageModel {
[Async]
void PrepareCustomModel (NSUrl asset, string clientIdentifier, SFSpeechLanguageModelConfiguration configuration, bool ignoresCache, Action<NSError> completion);
}

[Partial]
[Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
interface SFAnalysisContextTag {
[Field ("SFAnalysisContextTagLeftContext")]
NSString LeftContext { get; }

[Field ("SFAnalysisContextTagRightContext")]
NSString RightContext { get; }

[Field ("SFAnalysisContextTagSelectedText")]
NSString SelectedText { get; }
}
}
2 changes: 2 additions & 0 deletions tests/introspection/ApiProtocolTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ protected virtual bool Skip (Type type, string protocolName)
case "GKBasePlayer":
case "GKLocalPlayer":
case "GKPlayer":
case "PKDisbursementRequest":
case "PKContact":
return true;
}
break;
Expand Down
3 changes: 3 additions & 0 deletions tests/xtro-sharpie/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ XIOS_RID = ios-arm64

$(XIOS_PCH): .stamp-check-sharpie
$(SHARPIE) sdk-db --xcode $(XCODE) -s iphoneos$(IOS_SDK_VERSION) -a $(XIOS_ARCH) \
-exclude FactoryOTAWifiUtils \
-exclude FactoryOTALogger \
-exclude FactoryOTANetworkUtils \
-i ThreadNetwork/THClient.h \
$(CORETELEPHONY_HEADERS) \

Expand Down
31 changes: 31 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-AVFoundation.todo
Original file line number Diff line number Diff line change
Expand Up @@ -494,3 +494,34 @@
!missing-selector! AVExternalStorageDeviceDiscoverySession::externalStorageDevices not bound
!missing-type! AVExternalStorageDevice not bound
!missing-type! AVExternalStorageDeviceDiscoverySession not bound
!missing-enum! AVAudioSessionRenderingMode not bound
!missing-enum! CMTagCollectionVideoOutputPreset not bound
!missing-field! AVAudioSessionRenderingCapabilitiesChangeNotification not bound
!missing-field! AVAudioSessionRenderingModeChangeNotification not bound
!missing-field! AVAudioSessionRenderingModeNewRenderingModeKey not bound
!missing-field! AVVideoDecompressionPropertiesKey not bound
!missing-pinvoke! CMTagCollectionCreateWithVideoOutputPreset is not bound
!missing-selector! AVAudioSession::renderingMode not bound
!missing-selector! AVAudioSession::supportedOutputChannelLayouts not bound
!missing-selector! AVPlayer::setVideoOutput: not bound
!missing-selector! AVPlayer::videoOutput not bound
!missing-selector! AVPlayerVideoOutput::copyTaggedBufferGroupForHostTime:presentationTimeStamp:activeConfiguration: not bound
!missing-selector! AVPlayerVideoOutput::initWithSpecification: not bound
!missing-selector! AVPlayerVideoOutputConfiguration::activationTime not bound
!missing-selector! AVPlayerVideoOutputConfiguration::dataChannelDescriptions not bound
!missing-selector! AVPlayerVideoOutputConfiguration::sourcePlayerItem not bound
!missing-selector! AVVideoOutputSpecification::defaultPixelBufferAttributes not bound
!missing-selector! AVVideoOutputSpecification::initWithTagCollections: not bound
!missing-selector! AVVideoOutputSpecification::preferredTagCollections not bound
!missing-selector! AVVideoOutputSpecification::setDefaultPixelBufferAttributes: not bound
!missing-selector! AVVideoOutputSpecification::setOutputPixelBufferAttributes:forTagCollection: not bound
!missing-type! AVPlayerVideoOutput not bound
!missing-type! AVPlayerVideoOutputConfiguration not bound
!missing-type! AVVideoOutputSpecification not bound
!missing-selector! AVCaptureDeviceFormat::supportedVideoZoomRangesForDepthDataDelivery not bound
!missing-selector! AVCaptureDeviceFormat::zoomFactorsOutsideOfVideoZoomRangesForDepthDeliverySupported not bound
!missing-selector! AVPlayerItemErrorLogEvent::allHTTPResponseHeaderFields not bound
!missing-selector! AVZoomRange::containsZoomFactor: not bound
!missing-selector! AVZoomRange::maxZoomFactor not bound
!missing-selector! AVZoomRange::minZoomFactor not bound
!missing-type! AVZoomRange not bound
8 changes: 8 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-AVKit.todo
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@
!missing-selector! AVPlayerViewController::setVideoFrameAnalysisTypes: not bound
!missing-selector! AVPlayerViewController::toggleLookupAction not bound
!missing-selector! AVPlayerViewController::videoFrameAnalysisTypes not bound
!missing-enum! AVCaptureEventPhase not bound
!missing-selector! AVCaptureEvent::phase not bound
!missing-selector! AVCaptureEventInteraction::initWithEventHandler: not bound
!missing-selector! AVCaptureEventInteraction::initWithPrimaryEventHandler:secondaryEventHandler: not bound
!missing-selector! AVCaptureEventInteraction::isEnabled not bound
!missing-selector! AVCaptureEventInteraction::setEnabled: not bound
!missing-type! AVCaptureEvent not bound
!missing-type! AVCaptureEventInteraction not bound
3 changes: 3 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-CloudKit.todo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!missing-selector! CKSyncEngineDidFetchChangesEvent::context not bound
!missing-selector! CKSyncEngineFetchChangesScope::containsZoneID: not bound
!missing-selector! CKSyncEngineWillFetchChangesEvent::context not bound
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
!missing-type! CARenderer not bound
!missing-protocol! CAMetalDisplayLinkDelegate not bound
!missing-selector! +CAEDRMetadata::HLGMetadataWithAmbientViewingEnvironment: not bound
!missing-selector! +CATransaction::batch not bound
!missing-selector! CALayer::setWantsExtendedDynamicRangeContent: not bound
!missing-selector! CALayer::wantsExtendedDynamicRangeContent not bound
!missing-selector! CAMetalDisplayLink::addToRunLoop:forMode: not bound
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-enum-value! CLMonitoringState native value CLMonitoringStateUnmonitored = 3 not bound
5 changes: 5 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreMedia.todo
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,8 @@
!missing-pinvoke! CMTagMakeWithOSTypeValue is not bound
!missing-pinvoke! CMTagMakeWithSInt64Value is not bound
!missing-pinvoke! CMVideoFormatDescriptionCopyTagCollectionArray is not bound
!missing-field! kCMFormatDescriptionExtension_HasAdditionalViews not bound
!missing-field! kCMFormatDescriptionExtension_HasLeftStereoEyeView not bound
!missing-field! kCMFormatDescriptionExtension_HasRightStereoEyeView not bound
!missing-field! kCMFormatDescriptionExtension_LogTransferFunction not bound
!missing-field! kCMFormatDescriptionLogTransferFunction_AppleLog not bound
2 changes: 2 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreVideo.todo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
!missing-field! kCVImageBufferLogTransferFunction_AppleLog not bound
!missing-field! kCVImageBufferLogTransferFunctionKey not bound
17 changes: 17 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-GameKit.todo
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
!missing-protocol-member! GKMatchmakerViewControllerDelegate::matchmakerViewController:getMatchPropertiesForRecipient:withCompletionHandler: not found
!missing-selector! GKMatch::playerProperties not bound
!missing-selector! GKMatch::properties not bound
!missing-selector! GKMatchedPlayers::playerProperties not bound
!missing-selector! GKMatchedPlayers::players not bound
!missing-selector! GKMatchedPlayers::properties not bound
!missing-selector! GKMatchmaker::findMatchedPlayers:withCompletionHandler: not bound
!missing-selector! GKMatchmaker::queryQueueActivity:withCompletionHandler: not bound
!missing-selector! GKMatchRequest::properties not bound
!missing-selector! GKMatchRequest::queueName not bound
!missing-selector! GKMatchRequest::recipientProperties not bound
!missing-selector! GKMatchRequest::setProperties: not bound
!missing-selector! GKMatchRequest::setQueueName: not bound
!missing-selector! GKMatchRequest::setRecipientProperties: not bound
!missing-type! GKMatchedPlayers not bound
!missing-enum-value! GKError native value GKErrorICloudUnavailable = 35 not bound
!missing-enum-value! GKError native value GKErrorLockdownMode = 36 not bound
Loading

0 comments on commit 51aa294

Please sign in to comment.