Merge branch 'main' into iad-removal

src/CloudKit/CKCompat.cs

@@ -3,6 +3,7 @@
 #if !COREBUILD
 
 using System;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 
 #if MONOMAC || IOS
@@ -137,6 +138,32 @@ public partial class CKDiscoveredUserInfo {
  [iOS (9,0)][Mac (10,11)]
  [Obsolete ("Empty stub (not public API).")]
  public virtual CNContact DisplayContact { get; }
+
+#if NET
+ [UnsupportedOSPlatform ("ios15.0")]
+ [UnsupportedOSPlatform ("macos12.0")]
+#else
+ [Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.GivenName'.")]
+ [Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.GivenName'.")]
+ [Obsoleted (PlatformName.MacOSX, 12, 0, message : "Use 'DisplayContact.GivenName'.")]
+ [Obsoleted (PlatformName.iOS, 15, 0, message : "Use 'DisplayContact.GivenName'.")]
+#endif
+ public virtual string FirstName {
+ get { return null; }
+ }
+
+#if NET
+ [UnsupportedOSPlatform ("ios15.0")]
+ [UnsupportedOSPlatform ("macos12.0")]
+#else
+ [Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.FamilyName'.")]
+ [Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.FamilyName'.")]
+ [Obsoleted (PlatformName.MacOSX, 12, 0, message : "Use 'DisplayContact.GivenName'.")]
+ [Obsoleted (PlatformName.iOS, 15, 0, message : "Use 'DisplayContact.GivenName'.")]
+#endif
+ public virtual string LastName {
+ get { return null; }
+ }
  }
 #endif
 

src/CoreMidi/MidiCompat.cs

@@ -12,6 +12,12 @@ namespace CoreMidi {
 
  public partial class MidiCISession {
 
+ [Obsolete ("Always throws 'NotSupportedException' (not a public API).")]
+ public MidiCISession (uint entity, Action handler)
+ {
+ throw new NotSupportedException ();
+ }
+
  [Obsolete ("Always throws 'NotSupportedException' (not a public API).")]
  public virtual void GetProperty (NSData inquiry, byte channel, MidiCIPropertyResponseHandler handler)
  => throw new NotSupportedException ();

src/ObjCRuntime/Selector.cs

@@ -33,29 +33,33 @@ public partial class Selector : IEquatable<Selector>, INativeObject {
  internal const string Release = "release";
  internal const string Retain = "retain";
  internal const string Autorelease = "autorelease";
- internal const string Dealloc = "dealloc";
- internal const string DoesNotRecognizeSelector = "doesNotRecognizeSelector:";
  internal const string PerformSelectorOnMainThreadWithObjectWaitUntilDone = "performSelectorOnMainThread:withObject:waitUntilDone:";
- internal const string PerformSelectorInBackground = "performSelectorInBackground:withObject:";
+#if MONOMAC
+ internal const string DoesNotRecognizeSelector = "doesNotRecognizeSelector:";
  internal const string PerformSelectorWithObjectAfterDelay = "performSelector:withObject:afterDelay:";
+#endif
 
  IntPtr handle;
  string name;
 
  public Selector (IntPtr sel)
- : this (sel, true)
- {
- }
-
- internal unsafe Selector (IntPtr sel, bool check)
  {
- if (check && !sel_isMapped (sel))
- throw new ArgumentException ("sel is not a selector handle.");
+ if (!sel_isMapped (sel))
+ ObjCRuntime.ThrowHelper.ThrowArgumentException (nameof (sel), "Not a selector handle.");
 
  this.handle = sel;
  name = GetName (sel);
  }
 
+ // this .ctor is required, like for any INativeObject implementation
+ // even if selectors are not disposable
+ [Preserve (Conditional = true)]
+ internal Selector (IntPtr handle, bool /* unused */ owns)
+ {
+ this.handle = handle;
+ name = GetName (handle);
+ }
+
  public Selector (string name)
  {
  this.name = name;
@@ -75,12 +79,13 @@ public string Name {
  }
 
  public static bool operator== (Selector left, Selector right) {
- if (((object)left) == null)
- return (((object)right) == null);
- if (((object)right) == null)
+ if (left is null)
+ return (right is null);
+ if (right is null)
  return false;
 
  // note: there's a sel_isEqual function but it's safe to compare pointers
+ // ref: https://opensource.apple.com/source/objc4/objc4-551.1/runtime/objc-sel.mm.auto.html
  return left.handle == right.handle;
  }
 

src/cloudkit.cs

@@ -430,19 +430,6 @@ interface CKDiscoveredUserInfo : NSCoding, NSCopying, NSSecureCoding {
  [NullAllowed]
  [Export ("userRecordID", ArgumentSemantic.Copy)]
  CKRecordID UserRecordId { get; }
-
- [Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.GivenName'.")]
- [Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.GivenName'.")]
- [NullAllowed]
- [Export ("firstName", ArgumentSemantic.Copy)]
- string FirstName { get; }
-
- [Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'DisplayContact.FamilyName'.")]
- [Deprecated (PlatformName.iOS, 9, 0, message : "Use 'DisplayContact.FamilyName'.")]
- [NullAllowed]
- [Export ("lastName", ArgumentSemantic.Copy)]
- string LastName { get; }
-
  }
 
  // CKError.h Fields

src/coremidi.cs

@@ -287,9 +287,6 @@ interface MidiCIProfileState : NSSecureCoding
  [DisableDefaultCtor]
  interface MidiCISession
  {
- [Export ("initWithMIDIEntity:dataReadyHandler:")]
- IntPtr Constructor (uint entity, Action handler);
-
  [Export ("entity")]
  uint Entity { get; }
 

src/mlcompute.cs

@@ -567,7 +567,13 @@ interface MLCTensor : NSCopying {
  MLCDevice Device { get; }
 
  [Export ("optimizerData", ArgumentSemantic.Copy)]
- MLCTensorData[] OptimizerData { get; set; }
+ MLCTensorData[] OptimizerData {
+ get;
+#if !XAMCORE_4_0
+ [NotImplemented]
+ set;
+#endif
+ }
 
  [Export ("optimizerDeviceData", ArgumentSemantic.Copy)]
  MLCTensorOptimizerDeviceData[] OptimizerDeviceData { get; }

src/networkextension.cs

@@ -1686,7 +1686,12 @@ interface NEFilterSocketFlow {
  NWEndpoint LocalEndpoint { get; }
 
  [Export ("socketFamily")]
- int SocketFamily { get; set; }
+ int SocketFamily {
+ get;
+#if !XAMCORE_4_0
+ [NotImplemented] set;
+#endif
+ }
 
  [Export ("socketType")]
  int SocketType {

src/vision.cs

@@ -1707,7 +1707,13 @@ interface VNImageAlignmentObservation {
  interface VNImageTranslationAlignmentObservation {
 
  [Export ("alignmentTransform", ArgumentSemantic.Assign)]
- CGAffineTransform AlignmentTransform { get; set; }
+ CGAffineTransform AlignmentTransform {
+ get;
+#if !XAMCORE_4_0
+ [NotImplemented]
+ set;
+#endif
+ }
  }
 
  [TV (11,0), Mac (10,13), iOS (11,0)]
@@ -1719,8 +1725,10 @@ interface VNImageHomographicAlignmentObservation {
  Matrix3 WarpTransform {
  [MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
  get;
- [MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")]
+#if !XAMCORE_4_0
+ [NotImplemented]
  set;
+#endif
  }
  }
 

tests/dotnet/UnitTests/ProjectTest.cs

@@ -55,6 +55,7 @@ void Clean (string project_path)
  [TestCase ("iossimulator-x86")]
  [TestCase ("iossimulator-x64")]
  [TestCase ("ios-arm64")]
+ [TestCase ("ios-arm")]
  public void BuildMySingleView (string runtimeIdentifier)
  {
  var platform = ApplePlatform.iOS;