From d8081bb228b6f966b35118cfe7a8cda79455069b Mon Sep 17 00:00:00 2001
From: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
Date: Thu, 31 Mar 2022 12:00:48 -0500
Subject: [PATCH] [UIKit] Remove unnecessary conditional defines from uikit.cs
 (#14539)

Co-authored-by: tj_devel709 <antlambe@microsoft.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
---
 src/uikit.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/uikit.cs b/src/uikit.cs
index ab24a2e60f..9a2ca41b84 100644
--- a/src/uikit.cs
+++ b/src/uikit.cs
@@ -18,6 +18,8 @@ using UIKit;
 using CloudKit;
 #if !TVOS
 using Contacts;
+#else
+using CNContact = System.Object;
 #endif
 #if !WATCH
 using MediaPlayer;
@@ -2647,11 +2649,11 @@ namespace UIKit {
 		[Export ("iconWithSystemImageName:")]
 		UIApplicationShortcutIcon FromSystemImageName (string systemImageName);
 
-#if IOS // This is inside ContactsUI.framework
+		// This is inside ContactsUI.framework
+		[NoMac][NoTV][NoWatch]
 		[NoMacCatalyst]
 		[Static, Export ("iconWithContact:")]
 		UIApplicationShortcutIcon FromContact (CNContact contact);
-#endif // IOS
 	}
 
 	[NoTV]
@@ -10314,11 +10316,11 @@ namespace UIKit {
 		[Export ("setItems:options:")]
 		void SetItems (NSDictionary<NSString, NSObject>[] items, NSDictionary options);
 		
-#if !TVOS
+		[NoTV]
 		[iOS (10,0)]
 		[Wrap ("SetItems (items, pasteboardOptions.GetDictionary ()!)")]
 		void SetItems (NSDictionary<NSString, NSObject> [] items, UIPasteboardOptions pasteboardOptions);
-#endif
+
 		[NoWatch, NoTV, iOS (10, 0)]
 		[Export ("hasStrings")]
 		bool HasStrings { get; }
@@ -10383,14 +10385,13 @@ namespace UIKit {
 		NSString Find { get; }
 	}
 
-#if !TVOS
 	[NoWatch, NoTV, iOS (10, 0)]
 	[StrongDictionary ("UIPasteboardOptionKeys")]
 	interface UIPasteboardOptions {
 		NSDate ExpirationDate { get; set; }
 		bool LocalOnly { get; set; }
 	}
-#endif
+
 	[NoWatch, NoTV, iOS (10,0)]
 	[Static]
 	interface UIPasteboardOptionKeys {