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

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

Bump to xcode 9.2 final
This commit is contained in:
Sebastien Pouliot 2017-12-04 19:48:44 -05:00 коммит произвёл GitHub
Родитель 4c966e3e71 9568331b34
Коммит 6857dfccf2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -45,7 +45,7 @@ IOS_PRODUCT=Xamarin.iOS
IOS_PACKAGE_NAME=Xamarin.iOS IOS_PACKAGE_NAME=Xamarin.iOS
IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") 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 # 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_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION))) IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV) 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)) 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_VERSION=9.2
XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2_Beta2.xip XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode92-beta2.app/Contents/Developer XCODE_DEVELOPER_ROOT=/Applications/Xcode92.app/Contents/Developer
# Minimum Mono version # Minimum Mono version
MIN_MONO_VERSION=5.4.0.201 MIN_MONO_VERSION=5.4.0.201

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

@ -67,7 +67,7 @@ namespace XamCore.StoreKit {
Hide, Hide,
} }
#endif #endif
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[Native] [Native]
public enum SKProductPeriodUnit : nuint { public enum SKProductPeriodUnit : nuint {
Day, Day,
@ -76,7 +76,7 @@ namespace XamCore.StoreKit {
Year, Year,
} }
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[Native] [Native]
public enum SKProductDiscountPaymentMode : nuint { public enum SKProductDiscountPaymentMode : nuint {
PayAsYouGo, PayAsYouGo,

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

@ -235,11 +235,11 @@ namespace XamCore.StoreKit {
#endif #endif
string DownloadContentVersion { get; } string DownloadContentVersion { get; }
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[NullAllowed, Export ("subscriptionPeriod")] [NullAllowed, Export ("subscriptionPeriod")]
SKProductSubscriptionPeriod SubscriptionPeriod { get; } SKProductSubscriptionPeriod SubscriptionPeriod { get; }
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[NullAllowed, Export ("introductoryPrice")] [NullAllowed, Export ("introductoryPrice")]
SKProductDiscount IntroductoryPrice { get; } SKProductDiscount IntroductoryPrice { get; }
} }
@ -644,7 +644,7 @@ namespace XamCore.StoreKit {
} }
#endif #endif
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
interface SKProductSubscriptionPeriod { interface SKProductSubscriptionPeriod {
@ -655,7 +655,7 @@ namespace XamCore.StoreKit {
SKProductPeriodUnit Unit { get; } SKProductPeriodUnit Unit { get; }
} }
[iOS (11,2), TV (11,2), NoMac] [iOS (11,2), TV (11,2), Mac (10,13,2)]
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
interface SKProductDiscount { interface SKProductDiscount {