[devops] Provision older simulators for the tests.

This also involved bumping the older simulator versions to iOS/tvOS 15, because that's the earliest that will run on macOS 14. And that exposed a few missing availability attributes, so add those as well.
xamarin · Jul 9, 2024 · 417fc42 · 417fc42
1 parent e51a63c
commit 417fc42
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/Make.config b/Make.config
@@ -300,13 +300,13 @@ DOTNET_MIN_MACCATALYST_SDK_VERSION=13.1
 DOTNET_MIN_MACOS_SDK_VERSION=10.15
 
 # The min simulator version available in the Xcode we're using
-MIN_IOS_SIMULATOR_VERSION=14.3
-MIN_WATCHOS_SIMULATOR_VERSION=7.1
+MIN_IOS_SIMULATOR_VERSION=15.0
+MIN_WATCHOS_SIMULATOR_VERSION=8.0
 # This is the iOS version that matches the watchOS version (i.e same Xcode)
-MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=14.5
-MIN_TVOS_SIMULATOR_VERSION=14.0
+MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=15.0
+MIN_TVOS_SIMULATOR_VERSION=15.0
 # These are the simulator package ids for the versions above
-EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK14_3 com.apple.pkg.AppleTVSimulatorSDK14_0 com.apple.pkg.iPhoneSimulatorSDK14_5 com.apple.pkg.WatchSimulatorSDK7_1
+EXTRA_SIMULATORS=com.apple.pkg.AppleTVSimulatorSDK15_0 com.apple.pkg.iPhoneSimulatorSDK15_0 com.apple.pkg.WatchSimulatorSDK8_0
 
 INCLUDE_IOS=1
 INCLUDE_MAC=1

diff --git a/src/gamekit.cs b/src/gamekit.cs
@@ -1387,15 +1387,15 @@ interface GKMatchRequest {
 		[Export ("restrictToAutomatch")]
 		bool RestrictToAutomatch { get; set; }
 
-		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
+		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2), Watch (10, 2)]
 		[NullAllowed, Export ("queueName")]
 		string QueueName { get; set; }
 
-		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
+		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2), Watch (10, 2)]
 		[NullAllowed, Export ("properties", ArgumentSemantic.Copy)]
 		NSDictionary<NSString, NSObject> Properties { get; set; }
 
-		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2)]
+		[TV (17, 2), Mac (14, 2), iOS (17, 2), MacCatalyst (17, 2), Watch (10, 2)]
 		[NullAllowed, Export ("recipientProperties", ArgumentSemantic.Copy)]
 		NSDictionary<GKPlayer, NSDictionary<NSString, NSObject>> RecipientProperties { get; set; }
 	}

diff --git a/src/networkextension.cs b/src/networkextension.cs
@@ -1357,7 +1357,7 @@ interface NEVpnManager {
 		NSString ConfigurationChangeNotification { get; }
 	}
 
-	[MacCatalyst (13, 1)]
+	[MacCatalyst (13, 1), TV (17, 0)]
 	[BaseType (typeof (NSObject), Name = "NEVPNConnection")]
 	interface NEVpnConnection {
 
@@ -2495,7 +2495,7 @@ interface NEAppPushProvider {
 		void Start ();
 	}
 
-	[NoWatch, Mac (11, 0), iOS (14, 0)]
+	[NoWatch, Mac (11, 0), iOS (14, 0), TV (17, 0)]
 	[MacCatalyst (14, 0)]
 	[BaseType (typeof (NEDnsSettings), Name = "NEDNSOverHTTPSSettings")]
 	interface NEDnsOverHttpsSettings {
@@ -2509,7 +2509,7 @@ interface NEDnsOverHttpsSettings {
 		NSData IdentityReference { get; set; }
 	}
 
-	[NoWatch, Mac (11, 0), iOS (14, 0)]
+	[NoWatch, Mac (11, 0), iOS (14, 0), TV (17, 0)]
 	[MacCatalyst (14, 0)]
 	[BaseType (typeof (NEDnsSettings), Name = "NEDNSOverTLSSettings")]
 	interface NEDnsOverTlsSettings {

diff --git a/src/uikit.cs b/src/uikit.cs
@@ -17335,7 +17335,7 @@ interface UIView : UIAppearance, UIAppearanceContainer, UIAccessibility, UIDynam
 		UIHoverStyle HoverStyle { get; set; }
 
 		[Async]
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Static]
 		[Export ("animateWithSpringDuration:bounce:initialSpringVelocity:delay:options:animations:completion:")]
 		void Animate (double duration, nfloat bounce, nfloat velocity, double delay, UIViewAnimationOptions options, Action animations, [NullAllowed] Action<bool> completion);
@@ -19086,55 +19086,55 @@ interface UITextContentType {
 		[Field ("UITextContentTypeDateTime")]
 		NSString DateTime { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeBirthdate")]
 		NSString Birthdate { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeBirthdateDay")]
 		NSString BirthdateDay { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeBirthdateMonth")]
 		NSString BirthdateMonth { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeBirthdateYear")]
 		NSString BirthdateYear { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardSecurityCode")]
 		NSString CreditCardSecurityCode { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardName")]
 		NSString CreditCardName { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardGivenName")]
 		NSString CreditCardGivenName { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardMiddleName")]
 		NSString CreditCardMiddleName { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardFamilyName")]
 		NSString CreditCardFamilyName { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardExpiration")]
 		NSString CreditCardExpiration { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardExpirationMonth")]
 		NSString CreditCardExpirationMonth { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardExpirationYear")]
 		NSString CreditCardExpirationYear { get; }
 
-		[iOS (17, 0), MacCatalyst (17, 0)]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0)]
 		[Field ("UITextContentTypeCreditCardType")]
 		NSString CreditCardType { get; }
 	}

diff --git a/tools/common/SdkVersions.cs b/tools/common/SdkVersions.cs
@@ -43,10 +43,10 @@ static class SdkVersions {
 		public const string LegacyMinWatchOS = "4.0";
 		public const string LegacyMinTVOS = "11.0";
 
-		public const string MiniOSSimulator = "14.3";
-		public const string MinWatchOSSimulator = "7.1";
-		public const string MinWatchOSCompanionSimulator = "14.5";
-		public const string MinTVOSSimulator = "14.0";
+		public const string MiniOSSimulator = "15.0";
+		public const string MinWatchOSSimulator = "8.0";
+		public const string MinWatchOSCompanionSimulator = "15.0";
+		public const string MinTVOSSimulator = "15.0";
 
 		public const string MaxiOSSimulator = "18.0";
 		public const string MaxWatchOSSimulator = "11.0";

diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml
@@ -279,7 +279,7 @@ steps:
 - bash: |
     set -x
     set -e
-    $(Build.SourcesDirectory)/xamarin-macios/system-dependencies.sh --provision-simulators --ignore-shellcheck --ignore-yamllint
+    $(Build.SourcesDirectory)/xamarin-macios/system-dependencies.sh --provision-simulators --provision-old-simulators --ignore-shellcheck --ignore-yamllint
   displayName: 'Provision simulators'
   timeoutInMinutes: 250