Merge remote-tracking branch 'origin/main' into darc-main-2c3dc6cd-c2…

…45-4d20-9461-75a98d067b3b
xamarin · Jul 21, 2021 · 5c30c01 · 5c30c01 · vs-mobiletools-engineering-service2 · Jul 21, 2021
2 parents c0e9ca9 + b082e6b
commit 5c30c01
Show file tree

Hide file tree

Showing 17 changed files with 509 additions and 780 deletions.
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -7,7 +7,7 @@ MONO_BRANCH    := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
 endif
 
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 99ad0341f436c31dcd85abcb7375c3f71072eda3
+NEEDED_MACCORE_VERSION := 536fd9a01b50df943445b057b961469da11ee1f2
 NEEDED_MACCORE_BRANCH := main
 
 MACCORE_DIRECTORY := maccore

diff --git a/src/AppKit/NSCollectionLayoutAnchor.cs b/src/AppKit/NSCollectionLayoutAnchor.cs
@@ -17,8 +17,8 @@ public partial class NSCollectionLayoutAnchor {
 		public static NSCollectionLayoutAnchor Create (NSDirectionalRectEdge edges, NSCollectionLayoutAnchorOffsetType offsetType, CGPoint offset) =>
 		    offsetType switch
 		    {
-			    NSCollectionLayoutAnchorOffsetType.Absolute   => _LayoutAnchorWithEdgesAbsoluteOffset (edges, offset),
-			    NSCollectionLayoutAnchorOffsetType.Fractional => _LayoutAnchorWithEdgesFractionalOffset (edges, offset),
+			    NSCollectionLayoutAnchorOffsetType.Absolute   => CreateFromAbsoluteOffset (edges, offset),
+			    NSCollectionLayoutAnchorOffsetType.Fractional => CreateFromFractionalOffset (edges, offset),
 			    _                                             => throw new ArgumentException (message: "Invalid enum value", paramName: nameof (offsetType)),
 		    };
 	}