Apply XM audit fixes from xcode10 (#4986)

Backport of b40230c
dotnet · Oct 16, 2018 · b2a596d · b2a596d · xamarin-release-manager · Oct 16, 2018
1 parent 1082ce7
commit b2a596d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs
@@ -2542,7 +2542,7 @@ public enum NSVisualEffectMaterial : long {
 		[Mac (10,14)]
 		WindowBackground = 12,
 		[Mac (10,14)]
-		HUDWindow = 13,
+		HudWindow = 13,
 		[Mac (10,14)]
 		FullScreenUI = 15,
 		[Mac (10,14)]

diff --git a/src/appkit.cs b/src/appkit.cs
@@ -4123,7 +4123,7 @@ partial interface NSColor : NSCoding, NSCopying, NSSecureCoding, NSPasteboardRea
 
 		[Mac (10,14, onlyOn64: true)]
 		[Export ("colorWithSystemEffect:")]
-		NSColor WithSystemEffect (NSColorSystemEffect systemEffect);
+		NSColor FromSystemEffect (NSColorSystemEffect systemEffect);
 
 		[Mac (10, 13)]
 		[Static]
@@ -7938,16 +7938,13 @@ partial interface NSMenu : NSCoding, NSCopying, NSAccessibility, NSAccessibility
 		[PostSnippet ("__mt_items_var = ItemArray();")]
 		void RemoveAllItems ();
 
-#if XAMCORE_4_0
 		[Export ("itemArray", ArgumentSemantic.Copy)]
-		NSMenuItem[] ItemArray { get; [Mac (10, 14, onlyOn64: true)] set; }
-#else
-		[Export ("itemArray")]
-		NSMenuItem [] ItemArray ();
+		NSMenuItem[] Items { get; [Mac (10, 14, onlyOn64: true)] set; }
 
-		[Mac (10, 14, onlyOn64: true)]
-		[Export ("setItemArray:")]
-		void SetItemArray (NSMenuItem [] items);
+#if !XAMCORE_4_0
+		[Obsolete ("Use 'Items' instead.")]
+		[Wrap ("Items", IsVirtual = true)]
+		NSMenuItem [] ItemArray ();
 #endif
 
 		[Export ("numberOfItems")]

diff --git a/src/foundation.cs b/src/foundation.cs
@@ -12369,7 +12369,11 @@ interface NSFileManager_NSUserInformation {
 	partial interface NSFilePresenter {
 		[Abstract]
 		[Export ("presentedItemURL", ArgumentSemantic.Retain)]
+#if XAMCORE_4_0
+		NSUrl PresentedItemUrl { get; }
+#else
 		NSUrl PresentedItemURL { get; }
+#endif
 
 #if XAMCORE_2_0
 		[Abstract]