xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bump Xcode requirement to 8.0 beta 3 (#418)

This commit is contained in:
Sebastien Pouliot 2016-07-18 23:16:44 -04:00 коммит произвёл GitHub
Родитель 7c22f4af9a
Коммит 980e71bc10
9 изменённых файлов: 27 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
Make.config
Просмотреть файл

@ -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=9.99.0.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=9.99.1.$(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.0 beta 2
# Xcode 8.0 beta 3
XCODE_VERSION=8.0
XCODE_URL=http://storage.bos.xamarin.com/bot-provisioning/Xcode_8_beta.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode8-beta2.app/Contents/Developer
XCODE_URL=http://storage.bos.xamarin.com/bot-provisioning/Xcode_8_beta_3.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode8-beta3.app/Contents/Developer
# Minimum Mono version
MIN_MONO_VERSION=4.4.0.148
@ -241,7 +241,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=2.99.0.$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=2.99.1.$(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)))

4
src/gamekit.cs
Просмотреть файл

@ -429,8 +429,8 @@ namespace XamCore.GameKit {
interface GKCloudPlayer
{
[Static]
[Export ("getCurrentSignedInPlayer:")]
void GetCurrentSignedInPlayer (Action<GKCloudPlayer, NSError> handler);
[Export ("getCurrentSignedInPlayerForContainer:completionHandler:")]
void GetCurrentSignedInPlayer ([NullAllowed] string containerName, Action<GKCloudPlayer, NSError> handler);
}
[Since (4,2)]

9
src/intents.cs
Просмотреть файл

@ -618,8 +618,6 @@ namespace XamCore.Intents {
SetClimateSettingsInCar,
[Field ("INSetDefrosterSettingsInCarIntentIdentifier")]
SetDefrosterSettingsInCar,
[Field ("INSetSeatTemperatureInCarIntentIdentifier")]
SetSeatTemperatureInCar,
[Field ("INStartWorkoutIntentIdentifier")]
StartWorkout,
[Field ("INPauseWorkoutIntentIdentifier")]
@ -1651,9 +1649,9 @@ namespace XamCore.Intents {
[DisableDefaultCtor]
interface INPaymentMethod : NSCopying, NSSecureCoding {
[Export ("initWithType:name:icon:")]
[Export ("initWithType:name:identificationHint:icon:")]
[DesignatedInitializer]
IntPtr Constructor (INPaymentMethodType type, [NullAllowed] string name, [NullAllowed] INImage icon);
IntPtr Constructor (INPaymentMethodType type, [NullAllowed] string name, [NullAllowed] string identificationHint, [NullAllowed] INImage icon);
[Export ("type", ArgumentSemantic.Assign)]
INPaymentMethodType Type { get; }
@ -2345,9 +2343,6 @@ namespace XamCore.Intents {
[Export ("name")]
string Name { get; set; }
[NullAllowed, Export ("subtitle")]
string Subtitle { get; set; }
[Export ("estimatedPickupDate", ArgumentSemantic.Copy)]
NSDate EstimatedPickupDate { get; set; }

19
src/metalkit.cs
Просмотреть файл

@ -11,13 +11,6 @@ using OpenTK;
namespace XamCore.MetalKit {
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Native]
public enum MTKDisplayGamut : nuint {
Srgb = 0,
DisplayP3 = 1
}
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
[Static]
interface MTKModel {
@ -278,11 +271,11 @@ namespace XamCore.MetalKit {
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Export ("newTextureWithName:scaleFactor:displayGamut:bundle:options:completionHandler:")]
void FromName (string name, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
void FromName (string name, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Wrap ("FromName (name, scaleFactor, displayGamut, bundle, options == null ? null : options.Dictionary, completionHandler)")]
void FromName (string name, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
void FromName (string name, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Export ("newTexturesWithNames:scaleFactor:bundle:options:completionHandler:")]
@ -294,20 +287,20 @@ namespace XamCore.MetalKit {
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Export ("newTexturesWithNames:scaleFactor:displayGamut:bundle:options:completionHandler:")]
void FromNames (string[] names, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderArrayCallback completionHandler);
void FromNames (string[] names, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderArrayCallback completionHandler);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Wrap ("FromNames (names, scaleFactor, displayGamut, bundle, options == null ? null : options.Dictionary, completionHandler)")]
void FromNames (string[] names, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderArrayCallback completionHandler);
void FromNames (string[] names, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderArrayCallback completionHandler);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Export ("newTextureWithName:scaleFactor:displayGamut:bundle:options:error:")]
[return: NullAllowed]
IMTLTexture FromName (string name, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, out NSError error);
IMTLTexture FromName (string name, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, out NSError error);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Wrap ("FromName (name, scaleFactor, displayGamut, bundle, options == null ? null : options.Dictionary, out error)")]
void FromName (string name, nfloat scaleFactor, MTKDisplayGamut displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, out NSError error);
void FromName (string name, nfloat scaleFactor, CGColorSpace displayGamut, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, out NSError error);
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[Export ("newTextureWithMDLTexture:options:completionHandler:")]

12
src/wkwebkit.cs
Просмотреть файл

@ -612,13 +612,6 @@ namespace XamCore.WebKit
NSNumber height { get; }
}
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
[BaseType (typeof (NSObject))]
interface WKElementInfo : NSCopying {
[Export ("linkURL")]
NSUrl LinkUrl { get; }
}
#if !MONOMAC
interface IWKPreviewActionItem {}
@ -647,9 +640,8 @@ namespace XamCore.WebKit
NSString Share { get; }
}
// @interface WKPreviewElementInfo : WKElementInfo
[iOS (10,0)][NoMac]
[BaseType (typeof (WKElementInfo))]
interface WKPreviewElementInfo {
[BaseType (typeof (NSObject))]
interface WKPreviewElementInfo : NSCopying {
}
}

2
tests/introspection/ApiProtocolTest.cs
Просмотреть файл

@ -81,6 +81,8 @@ namespace Introspection {
case "NSLayoutDimension":
case "NSLayoutXAxisAnchor":
case "NSLayoutYAxisAnchor":
// iOS 10 beta 3
case "GKCloudPlayer":
return true; // skip
}
break;

2
tests/introspection/iOS/iOSApiCtorInitTest.cs
Просмотреть файл

@ -295,6 +295,8 @@ namespace Introspection {
case "AVAudioSessionPortDescription":
case "CLBeacon":
case "CLCircularRegion":
// beta 3
case "CNContainer":
if (TestRuntime.CheckXcodeVersion (8, 0))
return;
break;

4
tests/monotouch-test/MediaPlayer/MoviePlayerControllerTest.cs
Просмотреть файл

@ -47,6 +47,10 @@ namespace MonoTouchFixtures.MediaPlayer {
if (!UIDevice.CurrentDevice.CheckSystemVersion (7,0))
Assert.Inconclusive ("Requires 7.0+");
// NSInvalidArgumentException +[MPMoviePlayerController preparePrerollAds]: unrecognized selector sent to class 0x109c46b48
if (UIDevice.CurrentDevice.CheckSystemVersion (10, 0))
Assert.Ignore ("Broken on iOS 10 beta 3");
MPMoviePlayerController.PrepareForPrerollAds ();
}
}

4
tests/monotouch-test/Security/TrustTest.cs
Просмотреть файл

@ -208,7 +208,7 @@ namespace MonoTouchFixtures.Security {
Assert.That (trust.Count, Is.EqualTo (ios9 ? 2 : 3), "Count");
using (SecKey pkey = trust.GetPublicKey ()) {
Assert.That (CFGetRetainCount (pkey.Handle), Is.EqualTo ((nint) 2), "RetainCount(pkey)");
Assert.That (CFGetRetainCount (pkey.Handle), Is.GreaterThan ((nint) 1), "RetainCount(pkey)");
}
}
}
@ -309,7 +309,7 @@ namespace MonoTouchFixtures.Security {
Assert.That (trust.Count, Is.EqualTo (3), "Count");
using (SecKey pkey = trust.GetPublicKey ()) {
Assert.That (CFGetRetainCount (pkey.Handle), Is.EqualTo ((nint) 2), "RetainCount(pkey)");
Assert.That (CFGetRetainCount (pkey.Handle), Is.GreaterThan ((nint) 1), "RetainCount(pkey)");
}
}
}