Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Foundation] Update to xcode9 beta 1 #2235

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ef27775
[Foundation] Update for xcode9
Jun 20, 2017
edbd1f9
Rest of the foundation bindings
Jun 20, 2017
91336b0
Remove a couple CWLs
Jun 20, 2017
d1afbda
PR fixes
Jun 22, 2017
0afb364
Add bindas attributes
Jun 23, 2017
7a894c2
Add missing foundation bindings for xcode 9 beta 1
Jun 27, 2017
126b501
Rename NSXPCFoo to NSXpcFoo
Jun 27, 2017
eaf7a74
WIP Foundation bindings
Jun 28, 2017
a63c745
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jun 28, 2017
bc5cd8d
Remove duplicate
Jun 28, 2017
56b1509
Update NSMetadataItem.cs for new mac-only keys
Jun 29, 2017
f837bfc
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jun 29, 2017
6b39e0b
Fix enum name
Jun 29, 2017
ecdda28
More pr fixes
Jun 29, 2017
00a3b32
One more fix
Jun 30, 2017
3ae3115
Update to beta 2
Jul 5, 2017
92a1e2f
Minor fixes
Jul 5, 2017
8fb5a01
More fixes
Jul 7, 2017
a60cd73
Introspection fixes
Jul 11, 2017
7712600
More add some introspection skips
Jul 11, 2017
70762ed
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jul 11, 2017
34deb20
Actually add skips
Jul 11, 2017
004c11d
REmove NSXpcConnectionOptions enum as well
Jul 11, 2017
d37300e
Update to Beta 3
Jul 13, 2017
e470146
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jul 14, 2017
1b33bc4
Add NSItemProviderWriting
Jul 18, 2017
ce902ea
Fix whitespace
Jul 18, 2017
f0462f3
Missed a couple tags
Jul 18, 2017
53249f5
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jul 19, 2017
def22c5
Use string instead of NSString, remove some uneeded [NullAllowed]
Jul 19, 2017
1cff74c
Accidentally changed one existing property
Jul 19, 2017
23fc172
Remove selector based on failed introspection test
Jul 20, 2017
7459245
Fix more intro tests
Jul 20, 2017
5578f59
Add missing bindings
Jul 21, 2017
0d502a4
Fix some test failures
Jul 24, 2017
cf7143d
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into Found…
Jul 25, 2017
4fffc80
Fix Introspection tests
Jul 26, 2017
e20b4f0
More introspection fixes
Jul 26, 2017
97c260e
Adde xception to typo test
Jul 26, 2017
5d87388
Update to beta 4
Jul 31, 2017
bbfdbe1
[arkit] Update for beta 4 (#2370)
spouliot Jul 25, 2017
c012f23
Bump version before preview 3 (#2375)
spouliot Jul 26, 2017
da67aec
[generator] Fix smart enum FieldAttribute LibraryName generation (#2376)
dalexsoto Jul 26, 2017
47ff43e
[FinderSync] Update to beta 4 (#2377)
Jul 27, 2017
8039c24
[ImageIO] Update to Xcode 9 (#2353)
Jul 27, 2017
557d0d0
[PhotosUI] Move macOS photosui bindings out of photos.cs into photosu…
Jul 27, 2017
cfdbe98
[quicklook] Update up to beta 4 (#2374)
spouliot Jul 27, 2017
513e4b3
[uikit] UIDragInteraction & UIDragInteractionDelegate (Xcode 9 b1,2,3…
VincentDondain Jul 28, 2017
041fb98
[safariservices] Update up to beta 4 (#2380)
spouliot Jul 28, 2017
6e54067
[coreanimation] Update to beta 4 (#2382)
spouliot Jul 28, 2017
944d29d
[storekit] Update up to beta 4 (#2379)
spouliot Jul 31, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ IOS_PRODUCT=Xamarin.iOS
IOS_PACKAGE_NAME=Xamarin.iOS
IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
# NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
IOS_PACKAGE_VERSION=10.99.1.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=10.99.2.$(IOS_COMMIT_DISTANCE)
Copy link
Member

Choose a reason for hiding this comment

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

This looks wrong, I think you need to merge in the xcode9 branch.

IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
Expand Down Expand Up @@ -248,7 +248,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=3.99.1.$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=3.99.2.$(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=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))
Expand Down
12 changes: 12 additions & 0 deletions runtime/bindings-generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,18 @@ static IEnumerable<FunctionData> GetFunctionData ()
}
);

data.Add (
new FunctionData {
Comment = " // Matrix4 func (/* UIInterfaceOrientation */ nint)",
Prefix = "simd__",
Variants = Variants.All,
ReturnType = Types.Matrix4f,
Parameters = new ParameterData[] {
new ParameterData { TypeData = Types.NInt },
},
}
);

// We must expand functions with native types to their actual type as well.
for (int i = data.Count - 1; i >= 0; i--) {
if (!data [i].HasNativeType)
Expand Down
1 change: 1 addition & 0 deletions src/Constants.mac.cs.in
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,6 @@ namespace MonoMac {
// macOS 10.13
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public const string PhotosUILibrary = "/System/Library/Frameworks/Photos.framework/PhotosUI";
}
}
11 changes: 11 additions & 0 deletions src/CoreAnimation/CAEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
using XamCore.Foundation;
using System.Runtime.InteropServices;
using XamCore.CoreGraphics;
using XamCore.ObjCRuntime;

namespace XamCore.CoreAnimation {

Expand All @@ -47,6 +48,16 @@ public enum CAEdgeAntialiasingMask : uint_compat_int {
TopBottomEdges = TopEdge | BottomEdge
}

[NoWatch] // headers not updated
[iOS (11,0)][TV (11,0)][Mac (10,13)]
[Native][Flags]
public enum CACornerMask : nuint {
MinXMinYCorner = 1 << 0,
MaxXMinYCorner = 1 << 1,
MinXMaxYCorner = 1 << 2,
MaxXMaxYCorner = 1 << 3,
}

#if MONOMAC
// untyped enum -> CALayer.h (only on OSX headers)
// note: autoresizingMask is an `unsigned int` @property
Expand Down
46 changes: 45 additions & 1 deletion src/Foundation/Enum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ public enum NSCocoaError : int {

CoderReadCorruptError = 4864,
CoderValueNotFoundError = 4865,
[Mac (10,13), iOS (11,0), Watch (4,0), TV (11,0)]
CoderInvalidValueError = 4866,
CoderErrorMinimum = 4864,
CoderErrorMaximum = 4991,

Expand Down Expand Up @@ -722,7 +724,8 @@ public enum NSJsonReadingOptions : nuint_compat_int {
[Flags]
[Native]
public enum NSJsonWritingOptions : nuint_compat_int {
PrettyPrinted = 1
PrettyPrinted = 1,
SortedKeys = (1 << 1),
}

[Native]
Expand Down Expand Up @@ -1258,4 +1261,45 @@ public enum NSMeasurementFormatterUnitOptions : nuint {
TemperatureWithoutUnit = (1 << 2)
Copy link
Member

Choose a reason for hiding this comment

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

Minor, add ',' at the end of the last enum value.

}


[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)]
[Native]
public enum NSItemProviderRepresentationVisibility : nint {
All = 0,
Team = 1,
Group = 2,
OwnProcess = 3,
}

[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)]
[Native]
public enum NSItemProviderFileOptions : nint {
OpenInPlace = 1,
}

[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)]
[Native]
public enum NSLinguisticTaggerUnit : nint {
Word,
Sentence,
Paragraph,
Document,
}

[NoWatch, NoTV, NoMac, iOS (11, 0)]
[Native]
public enum NSUrlSessionMultipathServiceType : nint {
None = 0,
Handover = 1,
Interactive = 2,
Aggregate = 3,
}

[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)]
[Native]
public enum NSUrlSessionDelayedRequestDisposition : nint {
ContinueLoading = 0,
UseNewRequest = 1,
Cancel = 2,
}
}
Loading