Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ 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=16.0
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16.xip
XCODE_IOS_SIMULATOR_FILENAME=iOS_18_Simulator_Runtime.dmg
XCODE_IOS_SIMULATOR_VERSION=22A3351
XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.0.0.app/Contents/Developer
XCODE_VERSION=16.1
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16.1_beta_3.xip
XCODE_IOS_SIMULATOR_FILENAME=iOS_18.1_beta_6_Simulator_Runtime.dmg
XCODE_IOS_SIMULATOR_VERSION=22B5069a
XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.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
10 changes: 5 additions & 5 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.99.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=18.0
TVOS_NUGET_OS_VERSION=18.0
WATCHOS_NUGET_OS_VERSION=11.0
MACOS_NUGET_OS_VERSION=15.0
MACCATALYST_NUGET_OS_VERSION=18.0
IOS_NUGET_OS_VERSION=18.1
TVOS_NUGET_OS_VERSION=18.1
WATCHOS_NUGET_OS_VERSION=11.1
MACOS_NUGET_OS_VERSION=15.1
MACCATALYST_NUGET_OS_VERSION=18.1


# In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
Expand Down
6 changes: 6 additions & 0 deletions Versions-ios.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
<key>tvOS</key>
<array>
Expand Down Expand Up @@ -76,6 +77,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
<key>watchOS</key>
<array>
Expand Down Expand Up @@ -105,6 +107,7 @@
<string>10.4</string>
<string>10.5</string>
<string>11.0</string>
<string>11.1</string>
</array>
<key>MacCatalyst</key>
<array>
Expand All @@ -119,6 +122,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -163,6 +167,8 @@
<string>14.5</string>
<key>18.0</key>
<string>15.0</string>
<key>18.1</key>
<string>15.1</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>
Expand Down
4 changes: 4 additions & 0 deletions builds/Versions-MacCatalyst.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -48,6 +49,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
Expand Down Expand Up @@ -92,6 +94,8 @@
<string>14.5</string>
<key>18.0</key>
<string>15.0</string>
<key>18.1</key>
<string>15.1</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-iOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -84,6 +85,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-macOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<string>14.4</string>
<string>14.5</string>
<string>15.0</string>
<string>15.1</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -48,6 +49,7 @@
<string>14.4</string>
<string>14.5</string>
<string>15.0</string>
<string>15.1</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
2 changes: 2 additions & 0 deletions builds/Versions-tvOS.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>SupportedTargetPlatformVersions</key>
Expand Down Expand Up @@ -74,6 +75,7 @@
<string>17.4</string>
<string>17.5</string>
<string>18.0</string>
<string>18.1</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>
Expand Down
12 changes: 12 additions & 0 deletions src/coreimage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10274,6 +10274,18 @@ interface CIAreaBoundsRed : CIAreaBoundsRedProtocol {
[Protocol (Name = "CIAreaBoundsRed")]
interface CIAreaBoundsRedProtocol : CIAreaReductionFilterProtocol {
}

[CoreImageFilter]
[TV (18, 1), Mac (15, 1), iOS (18, 1), MacCatalyst (18, 1)]
[BaseType (typeof (CIFilter))]
interface CIDistanceGradientFromRedMask : CIFilterProtocol {

[CoreImageFilterProperty ("inputImage")]
CIImage InputImage { get; set; }

[CoreImageFilterProperty ("inputMaximumDistance")]
int MaximumDistance { get; set; }
}
#endregion

}
2 changes: 1 addition & 1 deletion src/scenekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@ interface SCNSceneLoadingOptions {
[MacCatalyst (13, 1)]
[BaseType (typeof (NSObject))]
interface SCNNode : SCNAnimatable, SCNBoundingVolume, SCNActionable, NSCopying, NSSecureCoding
#if IOS || TVOS
#if (IOS || TVOS) && !XAMCORE_5_0 // Conformance Removed in Xcode 16.1
, UIFocusItem
#endif
{
Expand Down
11 changes: 11 additions & 0 deletions tests/cecil-tests/Documentation.KnownFailures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32183,6 +32183,10 @@ M:CoreImage.CIDissolveTransition.#ctor
M:CoreImage.CIDissolveTransition.#ctor(Foundation.NSCoder)
M:CoreImage.CIDissolveTransition.#ctor(Foundation.NSObjectFlag)
M:CoreImage.CIDissolveTransition.#ctor(ObjCRuntime.NativeHandle)
M:CoreImage.CIDistanceGradientFromRedMask.#ctor
M:CoreImage.CIDistanceGradientFromRedMask.#ctor(Foundation.NSCoder)
M:CoreImage.CIDistanceGradientFromRedMask.#ctor(Foundation.NSObjectFlag)
M:CoreImage.CIDistanceGradientFromRedMask.#ctor(ObjCRuntime.NativeHandle)
M:CoreImage.CIDistortionFilter.#ctor(Foundation.NSCoder)
M:CoreImage.CIDistortionFilter.#ctor(Foundation.NSObjectFlag)
M:CoreImage.CIDistortionFilter.#ctor(ObjCRuntime.NativeHandle)
Expand Down Expand Up @@ -63149,6 +63153,9 @@ P:CoreImage.CIDisplacementDistortion.DisplacementImage
P:CoreImage.CIDisplacementDistortion.InputImage
P:CoreImage.CIDisplacementDistortion.OutputImage
P:CoreImage.CIDisplacementDistortion.Scale
P:CoreImage.CIDistanceGradientFromRedMask.InputImage
P:CoreImage.CIDistanceGradientFromRedMask.MaximumDistance
P:CoreImage.CIDistanceGradientFromRedMask.OutputImage
P:CoreImage.CIDistortionFilter.InputImage
P:CoreImage.CIDistortionFilter.Radius
P:CoreImage.CIDither.InputImage
Expand Down Expand Up @@ -67892,6 +67899,7 @@ P:Foundation.NSUserActivity.EligibleForSearch
P:Foundation.NSUserActivity.IsClassKitDeepLink
P:Foundation.NSUserActivity.ReadableTypeIdentifiers
P:Foundation.NSUserActivity.SuggestedInvocationPhrase
P:Foundation.NSUserActivity.TargetContentIdentifier
P:Foundation.NSUserActivity.WritableTypeIdentifiers
P:Foundation.NSUserActivity.WritableTypeIdentifiersForItemProvider
P:Foundation.NSUserActivityContinuation.Arg1
Expand Down Expand Up @@ -77940,6 +77948,7 @@ P:UIKit.UIMenu.SelectedElements
P:UIKit.UIMenuController.DidHideMenuNotification
P:UIKit.UIMenuController.DidShowMenuNotification
P:UIKit.UIMenuController.MenuFrameDidChangeNotification
P:UIKit.UIMenuController.MenuVisible
P:UIKit.UIMenuController.WillHideMenuNotification
P:UIKit.UIMenuController.WillShowMenuNotification
P:UIKit.UIMenuElement.AccessibilityIdentifier
Expand Down Expand Up @@ -78022,6 +78031,7 @@ P:UIKit.UIPasteboard.Automatic
P:UIKit.UIPasteboard.ChangedNotification
P:UIKit.UIPasteboard.ChangedTypesAddedKey
P:UIKit.UIPasteboard.ChangedTypesRemovedKey
P:UIKit.UIPasteboard.Persistent
P:UIKit.UIPasteboard.RemovedNotification
P:UIKit.UIPasteboard.TypeListColor
P:UIKit.UIPasteboard.TypeListImage
Expand Down Expand Up @@ -82335,6 +82345,7 @@ T:CoreImage.CIDepthDisparityConverter
T:CoreImage.CIDepthToDisparity
T:CoreImage.CIDetectorOptions
T:CoreImage.CIDisparityToDepth
T:CoreImage.CIDistanceGradientFromRedMask
T:CoreImage.CIDither
T:CoreImage.CIDocumentEnhancer
T:CoreImage.CIEdgePreserveUpsampleFilter
Expand Down
12 changes: 12 additions & 0 deletions tests/common/TestRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,18 @@ public static bool CheckXcodeVersion (int major, int minor, int build = 0)
return CheckMacSystemVersion (15, 0);
#else
throw new NotImplementedException ($"Missing platform case for Xcode {major}.{minor}");
#endif
case 1:
#if __WATCHOS__
return CheckWatchOSSystemVersion (11, 1);
#elif __TVOS__
return ChecktvOSSystemVersion (18, 1);
#elif __IOS__
return CheckiOSSystemVersion (18, 1);
#elif MONOMAC
return CheckMacSystemVersion (15, 1);
#else
throw new NotImplementedException ($"Missing platform case for Xcode {major}.{minor}");
#endif
default:
throw new NotImplementedException ($"Missing version logic for checking for Xcode {major}.{minor}");
Expand Down
4 changes: 2 additions & 2 deletions tests/introspection/iOS/iOSApiProtocolTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ protected override bool Skip (Type type, string protocolName)
return !TestRuntime.CheckXcodeVersion (8, 0);
case "SCNNode":
case "SCNReferenceNode":
return !TestRuntime.CheckXcodeVersion (9, 0);
return TestRuntime.CheckXcodeVersion (16, 1); // Conformance removed in Xcode 16.1 will be removed in XAMCORE_5_0
}
break;

Expand Down Expand Up @@ -1095,7 +1095,7 @@ protected override bool Skip (Type type, string protocolName)
return !TestRuntime.CheckXcodeVersion (8, 0);
case "SCNNode":
case "SCNReferenceNode":
return !TestRuntime.CheckXcodeVersion (9, 0);
return TestRuntime.CheckXcodeVersion (16, 1); // Conformance removed in Xcode 16.1 will be removed in XAMCORE_5_0
}
break;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!missing-field! kCGUseLegacyHDREcosystem not bound
!missing-pinvoke! CGColorConversionInfoConvertData is not bound
!missing-pinvoke! CGColorConversionInfoCreateForToneMapping is not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
!missing-enum! HKAudiogramConductionType not bound
!missing-enum! HKAudiogramSensitivityTestSide not bound
!missing-selector! +HKAudiogramSample::audiogramSampleWithSensitivityPoints:startDate:endDate:device:metadata: not bound
!missing-selector! +HKAudiogramSensitivityPoint::sensitivityPointWithFrequency:tests:error: not bound
!missing-selector! +HKAudiogramSensitivityPointClampingRange::clampingRangeWithLowerBound:upperBound:error: not bound
!missing-selector! HKAudiogramSensitivityPoint::tests not bound
!missing-selector! HKAudiogramSensitivityPointClampingRange::lowerBound not bound
!missing-selector! HKAudiogramSensitivityPointClampingRange::upperBound not bound
!missing-selector! HKAudiogramSensitivityTest::clampingRange not bound
!missing-selector! HKAudiogramSensitivityTest::initWithSensitivity:type:masked:side:clampingRange:error: not bound
!missing-selector! HKAudiogramSensitivityTest::masked not bound
!missing-selector! HKAudiogramSensitivityTest::sensitivity not bound
!missing-selector! HKAudiogramSensitivityTest::side not bound
!missing-selector! HKAudiogramSensitivityTest::type not bound
!missing-type! HKAudiogramSensitivityPointClampingRange not bound
!missing-type! HKAudiogramSensitivityTest not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-enum-value! NEProviderStopReason native value NEProviderStopReasonInternalError = 17 not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
!missing-enum-value! UIPressType native value UIPressTypeTVRemoteFourColors = 33 not bound
!missing-enum-value! UIPressType native value UIPressTypeTVRemoteOneTwoThree = 32 not bound
!missing-field! UIMenuOpen not bound
!missing-selector! NSObject::accessibilityTextInputResponder not bound
!missing-selector! NSObject::accessibilityTextInputResponderBlock not bound
!missing-selector! NSObject::setAccessibilityTextInputResponder: not bound
!missing-selector! NSObject::setAccessibilityTextInputResponderBlock: not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!missing-field! kCGUseLegacyHDREcosystem not bound
!missing-pinvoke! CGColorConversionInfoConvertData is not bound
!missing-pinvoke! CGColorConversionInfoCreateForToneMapping is not bound
18 changes: 18 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
!deprecated-attribute-missing! HKAudiogramSensitivityPoint::leftEarSensitivity missing a [Deprecated] attribute
!deprecated-attribute-missing! HKAudiogramSensitivityPoint::rightEarSensitivity missing a [Deprecated] attribute
!missing-enum! HKAudiogramConductionType not bound
!missing-enum! HKAudiogramSensitivityTestSide not bound
!missing-selector! +HKAudiogramSample::audiogramSampleWithSensitivityPoints:startDate:endDate:device:metadata: not bound
!missing-selector! +HKAudiogramSensitivityPoint::sensitivityPointWithFrequency:tests:error: not bound
!missing-selector! +HKAudiogramSensitivityPointClampingRange::clampingRangeWithLowerBound:upperBound:error: not bound
!missing-selector! HKAudiogramSensitivityPoint::tests not bound
!missing-selector! HKAudiogramSensitivityPointClampingRange::lowerBound not bound
!missing-selector! HKAudiogramSensitivityPointClampingRange::upperBound not bound
!missing-selector! HKAudiogramSensitivityTest::clampingRange not bound
!missing-selector! HKAudiogramSensitivityTest::initWithSensitivity:type:masked:side:clampingRange:error: not bound
!missing-selector! HKAudiogramSensitivityTest::masked not bound
!missing-selector! HKAudiogramSensitivityTest::sensitivity not bound
!missing-selector! HKAudiogramSensitivityTest::side not bound
!missing-selector! HKAudiogramSensitivityTest::type not bound
!missing-type! HKAudiogramSensitivityPointClampingRange not bound
!missing-type! HKAudiogramSensitivityTest not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-enum-value! NEProviderStopReason native value NEProviderStopReasonInternalError = 17 not bound
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-protocol-member! PKCanvasViewDelegate::canvasView:didRefineStrokes:withNewStrokes: not found
7 changes: 7 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
!missing-enum-value! UIPressType native value UIPressTypeTVRemoteFourColors = 33 not bound
!missing-enum-value! UIPressType native value UIPressTypeTVRemoteOneTwoThree = 32 not bound
!missing-field! UIMenuOpen not bound
!missing-selector! NSObject::accessibilityTextInputResponder not bound
!missing-selector! NSObject::accessibilityTextInputResponderBlock not bound
!missing-selector! NSObject::setAccessibilityTextInputResponder: not bound
!missing-selector! NSObject::setAccessibilityTextInputResponderBlock: not bound
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -1679,5 +1679,3 @@
!incorrect-protocol-member! NSAccessibility::setAccessibilityUserInputLabels: is REQUIRED and should be abstract

# introduced and deprecated in the same version
!missing-protocol-member! NSTextInputTraits::setWritingToolsAllowedInputOptions: not found
!missing-protocol-member! NSTextInputTraits::writingToolsAllowedInputOptions not found
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!missing-field! kCGUseLegacyHDREcosystem not bound
!missing-pinvoke! CGColorConversionInfoConvertData is not bound
!missing-pinvoke! CGColorConversionInfoCreateForToneMapping is not bound
Loading