Skip to content

Commit

Permalink
[xcode10] XM/AppKit audit (#4883)
Browse files Browse the repository at this point in the history
  • Loading branch information
spouliot authored and chamons committed Sep 27, 2018
1 parent 84552a4 commit b40230c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/AppKit/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
15 changes: 6 additions & 9 deletions src/appkit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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")]
Expand Down
4 changes: 4 additions & 0 deletions src/foundation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

1 comment on commit b40230c

@xamarin-release-manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jenkins job (on internal Jenkins) succeeded

Build succeeded
API Diff (from stable)
API Diff (from PR only) (🔥 breaking changes 🔥)
Generator Diff (please review changes)
Test run succeeded

Please sign in to comment.