From dfd10bd5b7e60e1b636da8fdfecddee225b40be4 Mon Sep 17 00:00:00 2001 From: Vincent Dondain Date: Mon, 4 Dec 2017 17:13:07 -0500 Subject: [PATCH 1/2] Bump xcode to 9.2 final --- Make.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Make.config b/Make.config index 135f0e72c7e6..e27cdb4f651a 100644 --- a/Make.config +++ b/Make.config @@ -45,7 +45,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=11.5.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE) +IOS_PACKAGE_VERSION=11.6.$(PACKAGE_VERSION_REV).$(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=$(PACKAGE_VERSION_REV) @@ -53,8 +53,8 @@ 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_VERSION=9.2 -XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2_Beta2.xip -XCODE_DEVELOPER_ROOT=/Applications/Xcode92-beta2.app/Contents/Developer +XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2.xip +XCODE_DEVELOPER_ROOT=/Applications/Xcode92.app/Contents/Developer # Minimum Mono version MIN_MONO_VERSION=5.4.0.201 From 9568331b345e75b2538919856f1a802e995adbaf Mon Sep 17 00:00:00 2001 From: Vincent Dondain Date: Mon, 4 Dec 2017 14:14:50 -0500 Subject: [PATCH 2/2] [storekit] Update for Xcode 9.2 final --- src/StoreKit/Enums.cs | 4 ++-- src/storekit.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/StoreKit/Enums.cs b/src/StoreKit/Enums.cs index 9a6d46e8465d..4f08e16c35fb 100644 --- a/src/StoreKit/Enums.cs +++ b/src/StoreKit/Enums.cs @@ -67,7 +67,7 @@ public enum SKProductStorePromotionVisibility : nint { Hide, } #endif - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [Native] public enum SKProductPeriodUnit : nuint { Day, @@ -76,7 +76,7 @@ public enum SKProductPeriodUnit : nuint { Year, } - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [Native] public enum SKProductDiscountPaymentMode : nuint { PayAsYouGo, diff --git a/src/storekit.cs b/src/storekit.cs index 7a95d6823da4..7faeb55f211f 100644 --- a/src/storekit.cs +++ b/src/storekit.cs @@ -235,11 +235,11 @@ bool Downloadable { #endif string DownloadContentVersion { get; } - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [NullAllowed, Export ("subscriptionPeriod")] SKProductSubscriptionPeriod SubscriptionPeriod { get; } - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [NullAllowed, Export ("introductoryPrice")] SKProductDiscount IntroductoryPrice { get; } } @@ -644,7 +644,7 @@ interface SKProductStorePromotionController { } #endif - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [BaseType (typeof (NSObject))] interface SKProductSubscriptionPeriod { @@ -655,7 +655,7 @@ interface SKProductSubscriptionPeriod { SKProductPeriodUnit Unit { get; } } - [iOS (11,2), TV (11,2), NoMac] + [iOS (11,2), TV (11,2), Mac (10,13,2)] [BaseType (typeof (NSObject))] interface SKProductDiscount {