diff --git a/Make.config b/Make.config index a98c1fc557b0..7974fb4135a0 100644 --- a/Make.config +++ b/Make.config @@ -32,7 +32,7 @@ endif # TODO: reset to 0 after major/minor version bump (SRO) and increment for service releases and previews # Note: if not reseted to 0 we can skip a version and start with .1 or .2 -PACKAGE_VERSION_REV=3 +PACKAGE_VERSION_REV=0 IOS_PACKAGE_VERSION_REV=0 IOS_PRODUCT=Xamarin.iOS @@ -261,7 +261,7 @@ MAC_PRODUCT=Xamarin.Mac MAC_PACKAGE_NAME=xamarin.mac MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") -MAC_PACKAGE_VERSION=4.99.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE) +MAC_PACKAGE_VERSION=5.0.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE) MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV) diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index db15b7ed77c3..e4460421e2a8 100644 --- 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 index c6961bcdbf6f..3813dfaccced 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -4120,7 +4120,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] @@ -7925,16 +7925,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 index 521babea1fdd..0c5d3f01d521 100644 --- a/src/foundation.cs +++ b/src/foundation.cs @@ -12324,7 +12324,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]