Skip to content

Bump Xcode to 8.2 and update API files to match C8SR1 #1096

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.

Sign up for GitHub

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

Merged
spouliot merged 2 commits into from
Nov 2, 2016
Merged

Bump Xcode to 8.2 and update API files to match C8SR1 #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d3cbdb
Bump Xcode to 8.2 and update API files to match C8SR1
spouliot Nov 2, 2016
91eed4d
[tests] Tweak tests so there's no failure when running against Xcode …
spouliot Nov 2, 2016
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
14 changes: 7 additions & 7 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ 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.2.1.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=10.2.99.$(IOS_COMMIT_DISTANCE)
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)))
IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))

# Xcode 8.1
XCODE_VERSION=8.1
XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.1.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode81.app/Contents/Developer
# Xcode 8.2
XCODE_VERSION=8.2
XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.2_beta.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode82-beta1.app/Contents/Developer

# Minimum Mono version
MIN_MONO_VERSION=4.4.0.148
Expand All @@ -67,10 +67,10 @@ MIN_OSX_BUILD_VERSION=10.11
MIN_OSX_VERSION_FOR_IOS=10.10
MIN_OSX_VERSION_FOR_MAC=10.10

IOS_SDK_VERSION=10.1
IOS_SDK_VERSION=10.2
OSX_SDK_VERSION=10.12
WATCH_SDK_VERSION=3.1
TVOS_SDK_VERSION=10.0
TVOS_SDK_VERSION=10.1

MIN_IOS_SDK_VERSION=6.0
MIN_OSX_SDK_VERSION=10.7
Expand Down
2 changes: 2 additions & 0 deletions src/intents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2836,6 +2836,7 @@ interface INRideCompletionStatus : NSCopying, NSSecureCoding {
[Introduced (PlatformName.iOS, 10, 0)]
[Unavailable (PlatformName.MacOSX)] // xtro mac !unknown-type! INRideDriver bound
[BaseType (typeof (INPerson))]
[DisableDefaultCtor] // xcode 8.2 beta 1 -> NSInvalidArgumentException Reason: *** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[1]
interface INRideDriver : NSCopying, NSSecureCoding {

[Export ("initWithPersonHandle:nameComponents:displayName:image:rating:phoneNumber:")]
Expand Down Expand Up @@ -2941,6 +2942,7 @@ interface INRidePartySizeOption : NSCopying, NSSecureCoding {
[Introduced (PlatformName.WatchOS, 3, 0)]
[Unavailable (PlatformName.MacOSX)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor] // xcode 8.2 beta 1 -> NSInvalidArgumentException Reason: *** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[1]
interface INRideStatus : NSCopying, NSSecureCoding {

[NullAllowed, Export ("rideIdentifier")]
Expand Down
12 changes: 12 additions & 0 deletions tests/common/TestRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ public static bool CheckXcodeVersion (int major, int minor, int build = 0)
return CheckMacSystemVersion (10, 12, 1);
#else
throw new NotImplementedException ();
#endif
case 2:
#if __WATCHOS__
return CheckWatchOSSystemVersion (3, 1);
#elif __TVOS__
return ChecktvOSSystemVersion (10, 1);
#elif __IOS__
return CheckiOSSystemVersion (10, 2);
#elif MONOMAC
return CheckMacSystemVersion (10, 12, 2);
#else
throw new NotImplementedException ();
#endif
default:
throw new NotImplementedException ();
Expand Down
25 changes: 20 additions & 5 deletions tests/monotouch-test/ModelIO/MDLMesh.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ public void CreatePlaneTest ()
Assert.IsNotNull (obj, "obj");
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (1.5f, 0, 1.5f), MinBounds = new Vector3 (-1.5f, 0, -1.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
var vb = TestRuntime.CheckXcodeVersion (8,0) ? 3 : 1;
int vb = 1;
if (TestRuntime.CheckXcodeVersion (8, 2))
vb = 31;
else if (TestRuntime.CheckXcodeVersion (8, 0))
vb = 1;
Assert.AreEqual (vb, obj.VertexBuffers.Length, "VertexBuffers Count");
Assert.AreEqual (16, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Expand Down Expand Up @@ -146,7 +150,10 @@ public void CreateCylindroidTest ()

using (var obj = MDLMesh.CreateCylindroid (1, V2, 3, 1, MDLGeometryType.Triangles, true, null)) {
Assert.IsNotNull (obj, "obj");
if (TestRuntime.CheckXcodeVersion (8, 0)) {
if (TestRuntime.CheckXcodeVersion (8, 2)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.866025448f, 0.5f, 1f), MinBounds = new Vector3 (-0.866025388f, -0.5f, -0.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (31, obj.VertexBuffers.Length, "VertexBuffers Count");
} else if (TestRuntime.CheckXcodeVersion (8, 0)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.866025448f, 1.0f, 1f), MinBounds = new Vector3 (-0.866025388f, -1.0f, -0.5f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (3, obj.VertexBuffers.Length, "VertexBuffers Count");
} else {
Expand All @@ -167,7 +174,10 @@ public void CreateEllipticalConeTest ()

using (var obj = MDLMesh.CreateEllipticalCone (5, V2, 3, 1, MDLGeometryType.Triangles, true, null)) {
Assert.IsNotNull (obj, "obj");
if (TestRuntime.CheckXcodeVersion (8, 0)) {
if (TestRuntime.CheckXcodeVersion (8, 2)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.433012783f, 4.5f, 0.5f), MinBounds = new Vector3 (-0.433012783f, -0.5f, -0.25f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (31, obj.VertexBuffers.Length, "VertexBuffers Count");
} else if (TestRuntime.CheckXcodeVersion (8, 0)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.433012783f, 4.5f, 0.5f), MinBounds = new Vector3 (-0.433012783f, -0.5f, -0.25f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (3, obj.VertexBuffers.Length, "VertexBuffers Count");
} else {
Expand Down Expand Up @@ -223,10 +233,15 @@ public void CreateCapsuleTest ()

using (var obj = MDLMesh.CreateCapsule (V3, V2i, MDLGeometryType.Triangles, true, 10, null)) {
Assert.IsNotNull (obj, "obj");
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.6f, 1.333333f, 1.8f), MinBounds = new Vector3 (-0.6f, -1, -1.8f) }, obj.BoundingBox, "BoundingBox");
if (TestRuntime.CheckXcodeVersion (8, 2)) {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.6f, 1.166666f, 1.8f), MinBounds = new Vector3 (-0.6f, -0.83333f, -1.8f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (122, obj.VertexCount, "VertexCount");
} else {
Asserts.AreEqual (new MDLAxisAlignedBoundingBox { MaxBounds = new Vector3 (0.6f, 1.333333f, 1.8f), MinBounds = new Vector3 (-0.6f, -1, -1.8f) }, obj.BoundingBox, "BoundingBox");
Assert.AreEqual (152, obj.VertexCount, "VertexCount");
}
Assert.AreEqual (1, obj.Submeshes.Count, "Submeshes Count");
Assert.AreEqual (3, obj.VertexBuffers.Length, "VertexBuffers Count");
Assert.AreEqual (152, obj.VertexCount, "VertexCount");
Assert.AreEqual (31, obj.VertexDescriptor.Attributes.Count, "VertexDescriptor Attributes Count");
Assert.AreEqual (31, obj.VertexDescriptor.Layouts.Count, "VertexDescriptor Layouts Count");
}
Expand Down
31 changes: 28 additions & 3 deletions tools/apidiff/references/xi/Xamarin.TVOS/Xamarin.TVOS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</attribute>
<attribute name="System.Reflection.AssemblyInformationalVersionAttribute">
<properties>
<property name="InformationalVersion" value="10.0.0.2; git-rev-head:cc365e603249217ec5ce3f37410c154ad779ce43; git-branch:xcode8" />
<property name="InformationalVersion" value="10.2.99.4; git-rev-head:316e5330cf10a191b23abcc700d2dd6d3c834bda; git-branch:xcode8.2" />
</properties>
</attribute>
<attribute name="System.Reflection.AssemblyProductAttribute">
Expand Down Expand Up @@ -118442,6 +118442,7 @@
<property name="Selector" value="render:toCVPixelBuffer:" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand All @@ -118456,6 +118457,7 @@
<property name="Selector" value="render:toCVPixelBuffer:bounds:colorSpace:" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand Down Expand Up @@ -125589,6 +125591,7 @@
<property name="Selector" value="initWithCVPixelBuffer:" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand Down Expand Up @@ -125730,6 +125733,7 @@
</constructor>
<constructor name=".ctor(CoreVideo.CVPixelBuffer, CoreImage.CIImageInitializationOptions)" attrib="6278">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand All @@ -125744,6 +125748,7 @@
<property name="Selector" value="initWithCVPixelBuffer:options:" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand Down Expand Up @@ -126747,6 +126752,7 @@
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
Expand Down Expand Up @@ -131723,6 +131729,7 @@
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
<interfaces>
<interface name="Foundation.INSObjectProtocol" />
Expand Down Expand Up @@ -135530,6 +135537,7 @@
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
<interfaces>
<interface name="Foundation.INSObjectProtocol" />
Expand Down Expand Up @@ -136875,6 +136883,7 @@
<properties>
<property name="AffineTransform" attrib="0" ptype="CoreGraphics.CGAffineTransform">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<methods>
Expand All @@ -136885,6 +136894,7 @@
<property name="Selector" value="CGAffineTransformValue" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
<parameters />
</method>
Expand Down Expand Up @@ -136916,6 +136926,7 @@
</property>
<property name="Point" attrib="0" ptype="CoreGraphics.CGPoint">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<methods>
Expand All @@ -136926,13 +136937,15 @@
<property name="Selector" value="CGPointValue" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
<parameters />
</method>
</methods>
</property>
<property name="Rectangle" attrib="0" ptype="CoreGraphics.CGRect">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<methods>
Expand All @@ -136943,6 +136956,7 @@
<property name="Selector" value="CGRectValue" />
</properties>
</attribute>
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
<parameters />
</method>
Expand Down Expand Up @@ -289910,6 +289924,11 @@
<interface name="System.IFormattable" />
</interfaces>
<fields>
<field name="Cancelled" attrib="32854" fieldtype="MediaPlayer.MPErrorCode" value="6">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
</attributes>
</field>
<field name="CloudServiceCapabilityMissing" attrib="32854" fieldtype="MediaPlayer.MPErrorCode" value="2" />
<field name="NetworkConnectionFailed" attrib="32854" fieldtype="MediaPlayer.MPErrorCode" value="3" />
<field name="NotFound" attrib="32854" fieldtype="MediaPlayer.MPErrorCode" value="4" />
Expand Down Expand Up @@ -335680,7 +335699,7 @@
<field name="QuartzLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/QuartzCore.framework/QuartzCore" />
<field name="ReplayKitLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/ReplayKit.framework/ReplayKit" />
<field name="SceneKitLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/SceneKit.framework/SceneKit" />
<field name="SdkVersion" attrib="32854" fieldtype="System.String" value="10.0" />
<field name="SdkVersion" attrib="32854" fieldtype="System.String" value="10.1" />
<field name="SecurityLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/Security.framework/Security" />
<field name="SpriteKitLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/SpriteKit.framework/SpriteKit" />
<field name="StoreKitLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/StoreKit.framework/StoreKit" />
Expand All @@ -335689,7 +335708,7 @@
<field name="TVServicesLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/TVServices.framework/TVServices" />
<field name="UIKitLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/UIKit.framework/UIKit" />
<field name="UserNotificationsLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/UserNotifications.framework/UserNotifications" />
<field name="Version" attrib="32854" fieldtype="System.String" value="10.0.0" />
<field name="Version" attrib="32854" fieldtype="System.String" value="10.2.99" />
<field name="VideoSubscriberAccountLibrary" attrib="32854" fieldtype="System.String" value="/System/Library/Frameworks/VideoSubscriberAccount.framework/VideoSubscriberAccount" />
<field name="libSystemLibrary" attrib="32854" fieldtype="System.String" value="/usr/lib/libSystem.dylib" />
<field name="libcLibrary" attrib="32854" fieldtype="System.String" value="/usr/lib/libc.dylib" />
Expand Down Expand Up @@ -414202,6 +414221,12 @@
<fields>
<field name="AddToCloudMusicLibrary" attrib="32854" fieldtype="StoreKit.SKCloudServiceCapability" value="256" />
<field name="MusicCatalogPlayback" attrib="32854" fieldtype="StoreKit.SKCloudServiceCapability" value="1" />
<field name="MusicCatalogSubscriptionEligible" attrib="32854" fieldtype="StoreKit.SKCloudServiceCapability" value="2">
<attributes>
<attribute name="ObjCRuntime.IntroducedAttribute" />
<attribute name="ObjCRuntime.UnavailableAttribute" />
</attributes>
</field>
<field name="None" attrib="32854" fieldtype="StoreKit.SKCloudServiceCapability" value="0" />
</fields>
</class>
Expand Down
Loading