Merge pull request #3081 from VincentDondain/storekit-xc92-final

Bump to xcode 9.2 final
xamarin · Dec 5, 2017 · 6857dfc · 6857dfc
2 parents 4c966e3 + 9568331
commit 6857dfc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Make.config b/Make.config
@@ -45,16 +45,16 @@ 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)
 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

diff --git 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
@@ -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 {