[ScreenCaptureKit] Implement Xcode 16.2 beta 1-3 changes.

src/ScreenCaptureKit/SCContentFilter.cs

@@ -21,7 +21,7 @@ namespace ScreenCaptureKit {
 	[UnsupportedOSPlatform ("ios")]
 	[UnsupportedOSPlatform ("tvos")]
 	[SupportedOSPlatform ("macos12.3")]
-	[UnsupportedOSPlatform ("maccatalyst")]
+	[SupportedOSPlatform ("maccatalyst18.2")]
 	public enum SCContentFilterOption {
 		/// <summary>The specified windows or applications are included in the filter.</summary>
 		Include,

src/build/dotnet/generator-frameworks.g.cs

@@ -540,6 +540,7 @@ partial class Frameworks {
 		"ReplayKit",
 		"SafariServices",
 		"SceneKit",
+		"ScreenCaptureKit",
 		"ScreenTime",
 		"Security",
 		"SensitiveContentAnalysis",

src/frameworks.sources

@@ -2523,6 +2523,7 @@ MACCATALYST_FRAMEWORKS = \
 	QuickLookThumbnailing \
 	ReplayKit \
 	SafariServices \
+	ScreenCaptureKit \
 	ScreenTime \
 	Security \
 	SensitiveContentAnalysis \

src/rsp/dotnet/maccatalyst-defines-dotnet.rsp

@@ -100,6 +100,7 @@
 -d:HAS_REPLAYKIT
 -d:HAS_SAFARISERVICES
 -d:HAS_SCENEKIT
+-d:HAS_SCREENCAPTUREKIT
 -d:HAS_SCREENTIME
 -d:HAS_SECURITY
 -d:HAS_SENSITIVECONTENTANALYSIS

src/screencapturekit.cs

@@ -23,7 +23,7 @@
 
 namespace ScreenCaptureKit {
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[ErrorDomain ("SCStreamErrorDomain")]
 	[Native]
 	enum SCStreamErrorCode : long {
@@ -50,7 +50,7 @@ enum SCStreamErrorCode : long {
 		SystemStoppedStream = -3821,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[Native]
 	enum SCFrameStatus : long {
 		Complete,
@@ -61,7 +61,7 @@ enum SCFrameStatus : long {
 		Stopped,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[Native]
 	enum SCStreamOutputType : long {
 		Screen,
@@ -79,23 +79,23 @@ public enum SCStreamType : long {
 		Display,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCPresenterOverlayAlertSetting : long {
 		System,
 		Never,
 		Always,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCCaptureResolutionType : long {
 		Automatic,
 		Best,
 		Nominal,
 	}
 
-	[Flags, NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[Flags, NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCContentSharingPickerMode : ulong {
 		SingleWindow = 1 << 0,
@@ -105,7 +105,7 @@ public enum SCContentSharingPickerMode : ulong {
 		SingleDisplay = 1 << 4,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCShareableContentStyle : long {
 		None,
@@ -114,15 +114,15 @@ public enum SCShareableContentStyle : long {
 		Application,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (15, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (15, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCCaptureDynamicRange : long {
 		Sdr,
 		HdrLocalDisplay,
 		HdrCanonicalDisplay,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (15, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (15, 0), MacCatalyst (18, 2)]
 	[Native]
 	public enum SCStreamConfigurationPreset : long {
 		CaptureHdrStreamLocalDisplay,
@@ -131,7 +131,7 @@ public enum SCStreamConfigurationPreset : long {
 		CaptureHdrScreenshotCanonicalDisplay,
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[Static]
 	interface SCStreamFrameInfoKeys {
 
@@ -166,7 +166,7 @@ interface SCStreamFrameInfoKeys {
 		NSString PresenterOverlayContentRect { get; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCRunningApplication {
@@ -181,7 +181,7 @@ interface SCRunningApplication {
 		int ProcessId { get; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCWindow {
@@ -210,7 +210,7 @@ interface SCWindow {
 	}
 
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCDisplay {
@@ -228,7 +228,7 @@ interface SCDisplay {
 		CGRect Frame { get; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCShareableContent {
@@ -274,7 +274,7 @@ interface SCShareableContent {
 		SCShareableContentInfo GetInfo (SCContentFilter filter);
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCContentFilter {
@@ -301,6 +301,7 @@ interface SCContentFilter {
 		// per docs, the following selectors are available for 12.3+
 		// but return types are SCStreamType and SCShareableContentStyle are 14.0+
 		[Deprecated (PlatformName.MacOSX, 14, 2, message: "Use 'Style' instead.")]
+		[NoMacCatalyst]
 		[Mac (14, 0)]
 		[Export ("streamType")]
 		SCStreamType StreamType { get; }
@@ -320,9 +321,21 @@ interface SCContentFilter {
 		[Mac (14, 2)]
 		[Export ("includeMenuBar")]
 		bool IncludeMenuBar { get; set; }
+
+		[Mac (15, 2), MacCatalyst (18, 2)]
+		[Export ("includedDisplays")]
+		SCDisplay [] IncludedDisplays { get; }
+
+		[Mac (15, 2), MacCatalyst (18, 2)]
+		[Export ("includedApplications")]
+		SCRunningApplication [] IncludedApplications { get; }
+
+		[Mac (15, 2), MacCatalyst (18, 2)]
+		[Export ("includedWindows")]
+		SCWindow [] IncludedWindows { get; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	interface SCStreamConfiguration {
 
@@ -435,6 +448,7 @@ interface SCStreamConfiguration {
 		[Export ("captureMicrophone", ArgumentSemantic.Assign)]
 		bool CaptureMicrophone { get; set; }
 
+		[NoMacCatalyst]
 		[Mac (15, 0)]
 		[Export ("microphoneCaptureDeviceID", ArgumentSemantic.Strong), NullAllowed]
 		string MicrophoneCaptureDeviceId { get; set; }
@@ -449,7 +463,7 @@ interface SCStreamConfiguration {
 		SCStreamConfiguration Create (SCStreamConfigurationPreset preset);
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCStream {
@@ -481,7 +495,8 @@ interface SCStream {
 
 		[Mac (13, 0)]
 		[Export ("synchronizationClock")]
-		CMClock SynchronizationClock { [return: NullAllowed] get; }
+		[NullAllowed]
+		CMClock SynchronizationClock { get; }
 
 		[Mac (15, 0)]
 		[Export ("addRecordingOutput:error:")]
@@ -494,7 +509,7 @@ interface SCStream {
 
 	interface ISCStreamDelegate { }
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[Protocol]
 #if NET
 	[Model]
@@ -512,6 +527,7 @@ interface SCStreamDelegate {
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		[Obsolete ("Do not use this method.")]
 		[Mac (14, 4)]
+		[NoMacCatalyst]
 		[Export ("userDidStopStream:")]
 		void UserDidStop (SCStream stream);
 #endif
@@ -523,19 +539,27 @@ interface SCStreamDelegate {
 		[Mac (14, 0)]
 		[Export ("outputVideoEffectDidStopForStream:")]
 		void OutputVideoEffectDidStop (SCStream stream);
+
+		[Mac (15, 2), MacCatalyst (18, 2)]
+		[Export ("streamDidBecomeActive:")]
+		void StreamDidBecomeActive (SCStream stream);
+
+		[Mac (15, 2), MacCatalyst (18, 2)]
+		[Export ("streamDidBecomeInactive:")]
+		void StreamDidBecomeInactive (SCStream stream);
 	}
 
 	interface ISCStreamOutput { }
 
-	[NoiOS, NoTV, NoWatch, Mac (12, 3), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (12, 3), MacCatalyst (18, 2)]
 	[Protocol]
 	interface SCStreamOutput {
 
 		[Export ("stream:didOutputSampleBuffer:ofType:")]
 		void DidOutputSampleBuffer (SCStream stream, CMSampleBuffer sampleBuffer, SCStreamOutputType type);
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	interface SCContentSharingPickerConfiguration {
 		[Export ("allowedPickerModes", ArgumentSemantic.Assign)]
@@ -551,7 +575,7 @@ interface SCContentSharingPickerConfiguration {
 		bool AllowsChangingSelectedContent { get; set; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCContentSharingPicker {
@@ -594,7 +618,7 @@ interface SCContentSharingPicker {
 
 	interface ISCContentSharingPickerObserver { }
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[Protocol]
 	[Model]
 	[BaseType (typeof (NSObject))]
@@ -612,7 +636,7 @@ interface SCContentSharingPickerObserver {
 		void DidFail (NSError error);
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCShareableContentInfo {
@@ -626,7 +650,9 @@ interface SCShareableContentInfo {
 		CGRect ContentRect { get; }
 	}
 
-	[NoiOS, NoTV, NoWatch, Mac (14, 0), NoMacCatalyst]
+	delegate void SCScreenshotManagerCaptureImageCallback ([NullAllowed] CGImage image, [NullAllowed] NSError error);
+
+	[NoiOS, NoTV, NoWatch, Mac (14, 0), MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCScreenshotManager {
@@ -639,9 +665,15 @@ interface SCScreenshotManager {
 		[Export ("captureImageWithFilter:configuration:completionHandler:")]
 		[Async]
 		void CaptureImage (SCContentFilter contentFilter, SCStreamConfiguration config, [NullAllowed] Action<CGImage, NSError> completionHandler);
+
+		[Mac (15, 2)]
+		[Static]
+		[Export ("captureImageInRect:completionHandler:")]
+		[Async]
+		void CaptureImage (CGRect rect, [NullAllowed] SCScreenshotManagerCaptureImageCallback completionHandler);
 	}
 
-	[Mac (15, 0), NoiOS, NoTV, NoWatch, NoMacCatalyst]
+	[Mac (15, 0), NoiOS, NoTV, NoWatch, MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	interface SCRecordingOutputConfiguration {
 		[Export ("outputURL", ArgumentSemantic.Copy)]
@@ -664,7 +696,7 @@ interface SCRecordingOutputConfiguration {
 		NSString [] AvailableOutputFileTypes { get; }
 	}
 
-	[Mac (15, 0), NoiOS, NoTV, NoWatch, NoMacCatalyst]
+	[Mac (15, 0), NoiOS, NoTV, NoWatch, MacCatalyst (18, 2)]
 	[Protocol (BackwardsCompatibleCodeGeneration = false), Model]
 	[BaseType (typeof (NSObject))]
 	interface SCRecordingOutputDelegate {
@@ -680,7 +712,7 @@ interface SCRecordingOutputDelegate {
 
 	interface ISCRecordingOutputDelegate { }
 
-	[Mac (15, 0), NoiOS, NoTV, NoWatch, NoMacCatalyst]
+	[Mac (15, 0), NoiOS, NoTV, NoWatch, MacCatalyst (18, 2)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface SCRecordingOutput {

tests/cecil-tests/Documentation.KnownFailures.txt

@@ -43044,7 +43044,11 @@ M:ScreenCaptureKit.ISCRecordingOutputDelegate.DidStartRecording(ScreenCaptureKit
 M:ScreenCaptureKit.ISCStreamDelegate.DidStop(ScreenCaptureKit.SCStream,Foundation.NSError)
 M:ScreenCaptureKit.ISCStreamDelegate.OutputVideoEffectDidStart(ScreenCaptureKit.SCStream)
 M:ScreenCaptureKit.ISCStreamDelegate.OutputVideoEffectDidStop(ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.ISCStreamDelegate.StreamDidBecomeActive(ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.ISCStreamDelegate.StreamDidBecomeInactive(ScreenCaptureKit.SCStream)
 M:ScreenCaptureKit.ISCStreamOutput.DidOutputSampleBuffer(ScreenCaptureKit.SCStream,CoreMedia.CMSampleBuffer,ScreenCaptureKit.SCStreamOutputType)
+M:ScreenCaptureKit.SCScreenshotManager.CaptureImage(CoreGraphics.CGRect,ScreenCaptureKit.SCScreenshotManagerCaptureImageCallback)
+M:ScreenCaptureKit.SCScreenshotManager.CaptureImageAsync(CoreGraphics.CGRect)
 M:ScreenCaptureKit.SCScreenshotManager.CaptureImageAsync(ScreenCaptureKit.SCContentFilter,ScreenCaptureKit.SCStreamConfiguration)
 M:ScreenCaptureKit.SCScreenshotManager.CaptureSampleBufferAsync(ScreenCaptureKit.SCContentFilter,ScreenCaptureKit.SCStreamConfiguration)
 M:ScreenCaptureKit.SCShareableContent.GetCurrentProcessShareableContentAsync
@@ -43058,6 +43062,10 @@ M:ScreenCaptureKit.SCStreamConfiguration.Dispose(System.Boolean)
 M:ScreenCaptureKit.SCStreamDelegate_Extensions.DidStop(ScreenCaptureKit.ISCStreamDelegate,ScreenCaptureKit.SCStream,Foundation.NSError)
 M:ScreenCaptureKit.SCStreamDelegate_Extensions.OutputVideoEffectDidStart(ScreenCaptureKit.ISCStreamDelegate,ScreenCaptureKit.SCStream)
 M:ScreenCaptureKit.SCStreamDelegate_Extensions.OutputVideoEffectDidStop(ScreenCaptureKit.ISCStreamDelegate,ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.SCStreamDelegate_Extensions.StreamDidBecomeActive(ScreenCaptureKit.ISCStreamDelegate,ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.SCStreamDelegate_Extensions.StreamDidBecomeInactive(ScreenCaptureKit.ISCStreamDelegate,ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.SCStreamDelegate.StreamDidBecomeActive(ScreenCaptureKit.SCStream)
+M:ScreenCaptureKit.SCStreamDelegate.StreamDidBecomeInactive(ScreenCaptureKit.SCStream)
 M:ScreenCaptureKit.SCStreamOutput_Extensions.DidOutputSampleBuffer(ScreenCaptureKit.ISCStreamOutput,ScreenCaptureKit.SCStream,CoreMedia.CMSampleBuffer,ScreenCaptureKit.SCStreamOutputType)
 M:ScreenTime.STScreenTimeConfiguration.EncodeTo(Foundation.NSCoder)
 M:ScreenTime.STScreenTimeConfigurationObserver.#ctor(CoreFoundation.DispatchQueue)
@@ -67016,6 +67024,9 @@ P:SceneKit.SCNView.JitteringEnabled
 P:SceneKit.SCNView.Playing
 P:SceneKit.SCNView.SceneRendererDelegate
 P:SceneKit.SCNView.TemporalAntialiasingEnabled
+P:ScreenCaptureKit.SCContentFilter.IncludedApplications
+P:ScreenCaptureKit.SCContentFilter.IncludedDisplays
+P:ScreenCaptureKit.SCContentFilter.IncludedWindows
 P:ScreenCaptureKit.SCContentSharingPicker.Active
 P:ScreenCaptureKit.SCStreamFrameInfoKeys.BoundingRect
 P:ScreenCaptureKit.SCStreamFrameInfoKeys.ContentRect
@@ -75630,6 +75641,7 @@ T:ScreenCaptureKit.SCContentSharingPickerObserver
 T:ScreenCaptureKit.SCFrameStatus
 T:ScreenCaptureKit.SCPresenterOverlayAlertSetting
 T:ScreenCaptureKit.SCRecordingOutputDelegate
+T:ScreenCaptureKit.SCScreenshotManagerCaptureImageCallback
 T:ScreenCaptureKit.SCShareableContentStyle
 T:ScreenCaptureKit.SCStreamConfigurationPreset
 T:ScreenCaptureKit.SCStreamDelegate

tests/dotnet/UnitTests/ProjectTest.cs

@@ -2897,6 +2897,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/System/iOSSupport/System/Library/Frameworks/ReplayKit.framework/Versions/A/ReplayKit",
 			"/System/iOSSupport/System/Library/Frameworks/SafariServices.framework/Versions/A/SafariServices",
 			"/System/iOSSupport/System/Library/Frameworks/SceneKit.framework/Versions/A/SceneKit",
+			"/System/iOSSupport/System/Library/Frameworks/ScreenCaptureKit.framework/Versions/A/ScreenCaptureKit",
 			"/System/iOSSupport/System/Library/Frameworks/ScreenTime.framework/Versions/A/ScreenTime",
 			"/System/iOSSupport/System/Library/Frameworks/SharedWithYou.framework/Versions/A/SharedWithYou",
 			"/System/iOSSupport/System/Library/Frameworks/Social.framework/Versions/A/Social",