Update Versions info for iOS/tvOS 12.3 & 12.4 + watchOS 5.3 (#6945)
- Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/959179 - Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/956758 * Actually 12.3 & 12.4 are still on the 12.2 SDK * Turns out our version plist check is assuming max version supported = max sdk version
This commit is contained in:
Родитель
15f0af7a1a
Коммит
aac92a1c20
|
@ -87,6 +87,12 @@ OSX_SDK_VERSION=10.14
|
|||
WATCH_SDK_VERSION=5.2
|
||||
TVOS_SDK_VERSION=12.2
|
||||
|
||||
# Temporary max versions because iOS 12.3 and 12.4 are supported by the 12.2 SDK.
|
||||
# When iOS 13 comes out we can revert to checking against the SDK version
|
||||
MAX_IOS_VERSION=12.4
|
||||
MAX_WATCH_VERSION=5.3
|
||||
MAX_TVOS_VERSION=12.4
|
||||
|
||||
# Minimum OS versions for running XI/XM apps.
|
||||
MIN_IOS_SDK_VERSION=6.0
|
||||
MIN_OSX_SDK_VERSION=10.9
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
<string>12.0</string>
|
||||
<string>12.1</string>
|
||||
<string>12.2</string>
|
||||
<string>12.3</string>
|
||||
<string>12.4</string>
|
||||
</array>
|
||||
<key>tvOS</key>
|
||||
<array>
|
||||
|
@ -50,6 +52,8 @@
|
|||
<string>12.0</string>
|
||||
<string>12.1</string>
|
||||
<string>12.2</string>
|
||||
<string>12.3</string>
|
||||
<string>12.4</string>
|
||||
</array>
|
||||
<key>watchOS</key>
|
||||
<array>
|
||||
|
@ -67,6 +71,7 @@
|
|||
<string>5.0</string>
|
||||
<string>5.1</string>
|
||||
<string>5.2</string>
|
||||
<string>5.3</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>RecommendedXcodeVersion</key>
|
||||
|
|
|
@ -618,7 +618,7 @@ $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Version: $(TOP)/Make.config.inc
|
|||
$(Q) echo $(MAC_PACKAGE_VERSION) > $@
|
||||
|
||||
$(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Versions.plist: $(TOP)/Versions-mac.plist.in Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/versions-check.csharp .stamp-$(MONO_BUILD_MODE)
|
||||
$(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
|
||||
$(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(MAX_IOS_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
|
||||
$(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(shell cat $(MONO_MAC_SDK_DESTDIR)/mac-mono-version.txt)/g" -e "s/@MIN_XM_MONO_VERSION@/$(MIN_XM_MONO_VERSION)/g" $< > $@
|
||||
|
||||
$(MAC_COMMON_DIRECTORIES):
|
||||
|
@ -737,7 +737,7 @@ $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/updateinfo: $(TOP)/Make.config.inc
|
|||
$(Q) echo "4569c276-1397-4adb-9485-82a7696df22e $(IOS_PACKAGE_UPDATE_ID)" > $@
|
||||
|
||||
$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/Versions.plist: $(TOP)/Versions-ios.plist.in Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/versions-check.csharp .stamp-$(MONO_BUILD_MODE)
|
||||
$(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
|
||||
$(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(MAX_IOS_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
|
||||
$(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(shell cat $(MONO_IOS_SDK_DESTDIR)/ios-mono-version.txt)/g" $< > $@
|
||||
|
||||
$(IOS_COMMON_DIRECTORIES):
|
||||
|
|
Загрузка…
Ссылка в новой задаче