diff --git a/src/HealthKit/Enums.cs b/src/HealthKit/Enums.cs
index d09d45c7062f..2f8638a58f20 100644
--- a/src/HealthKit/Enums.cs
+++ b/src/HealthKit/Enums.cs
@@ -369,6 +369,11 @@ public enum HKCategoryValueCervicalMucusQuality : long {
[Mac (13, 0)]
[MacCatalyst (13, 1)]
[Native]
+ [Deprecated (PlatformName.iOS, 18, 0, message: "Use 'HKCategoryValueVaginalBleeding' instead.")]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0, message: "Use 'HKCategoryValueVaginalBleeding' instead.")]
+ [Deprecated (PlatformName.TvOS, 18, 0, message: "Use 'HKCategoryValueVaginalBleeding' instead.")]
+ [Deprecated (PlatformName.WatchOS, 11, 0, message: "Use 'HKCategoryValueVaginalBleeding' instead.")]
+ [Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'HKCategoryValueVaginalBleeding' instead.")]
public enum HKCategoryValueMenstrualFlow : long {
NotApplicable = 0,
Unspecified = 1,
@@ -381,6 +386,16 @@ public enum HKCategoryValueMenstrualFlow : long {
None,
}
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKCategoryValueVaginalBleeding : long {
+ Unspecified = 1,
+ Light = 2,
+ Medium = 3,
+ Heavy = 4,
+ None = 5,
+ }
+
/// Enumerates the results of an ovulation test.
[Mac (13, 0)]
[MacCatalyst (13, 1)]
diff --git a/src/HealthKit/HKSupportFunctions.cs b/src/HealthKit/HKSupportFunctions.cs
new file mode 100644
index 000000000000..c16608697d39
--- /dev/null
+++ b/src/HealthKit/HKSupportFunctions.cs
@@ -0,0 +1,34 @@
+#nullable enable
+
+using System;
+using System.Runtime.InteropServices;
+
+using Foundation;
+using ObjCRuntime;
+
+namespace HealthKit {
+ /// This class contains helper functions for the enum.
+#if NET
+ [SupportedOSPlatform ("ios18.0")]
+ [SupportedOSPlatform ("maccatalyst18.0")]
+ [SupportedOSPlatform ("macos15.0")]
+ [UnsupportedOSPlatform ("tvos")]
+#else
+ [Watch (11, 0), NoTV, Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+#endif
+ public static class HKStateOfMindValence {
+ [DllImport (Constants.HealthKitLibrary)]
+ static extern IntPtr HKStateOfMindValenceClassificationForValence (double valence);
+
+ /// Gets the valence classification appropriate for a given valence value.
+ /// The valence value whose classification to get.
+ /// The valence classification, or null if the specified valence is outside of the supported range of valence values.
+ public static HKStateOfMindValenceClassification? GetClassification (double valence)
+ {
+ var nsnumber = Runtime.GetNSObject (HKStateOfMindValenceClassificationForValence (valence), owns: false);
+ if (nsnumber is null)
+ return null;
+ return (HKStateOfMindValenceClassification) (long) nsnumber.LongValue;
+ }
+ }
+}
diff --git a/src/frameworks.sources b/src/frameworks.sources
index cdbd8eabe1a8..d4f419857b62 100644
--- a/src/frameworks.sources
+++ b/src/frameworks.sources
@@ -1008,6 +1008,7 @@ HEALTHKIT_SOURCES = \
HealthKit/HKObjectType.cs \
HealthKit/HKObsolete.cs \
HealthKit/HKSampleQuery.cs \
+ HealthKit/HKSupportFunctions.cs \
HealthKit/HKUnit.cs \
# HealthKitUI
diff --git a/src/healthkit.cs b/src/healthkit.cs
index d02d91e63703..150124aadd85 100644
--- a/src/healthkit.cs
+++ b/src/healthkit.cs
@@ -61,6 +61,7 @@ public enum HKErrorCode : long {
WorkoutActivityNotAllowed,
DataSizeExceeded,
BackgroundWorkoutSessionNotAllowed,
+ NotPermissibleForGuestUserMode,
}
/// Enumerates workout locations.
@@ -185,6 +186,26 @@ public enum HKVerifiableClinicalRecordCredentialType {
Recovery,
}
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ [NativeName ("HKGAD7AssessmentRisk")]
+ public enum HKGad7AssessmentRisk : long {
+ NoneToMinimal = 1,
+ Mild,
+ Moderate,
+ Severe,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ [NativeName ("HKGAD7AssessmentAnswer")]
+ public enum HKGad7AssessmentAnswer : long {
+ NotAtAll = 0,
+ SeveralDays,
+ MoreThanHalfTheDays,
+ NearlyEveryDay,
+ }
+
#if NET
/// The completion handler for .
/// Completion handler for anchored object queries.
@@ -276,15 +297,30 @@ interface HKPredicateKeyPath {
[Field ("HKPredicateKeyPathWorkoutDuration")]
NSString WorkoutDuration { get; }
+ [Deprecated (PlatformName.iOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for the desired distance type.")]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for the desired distance type.")]
+ [Deprecated (PlatformName.TvOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for the desired distance type.")]
+ [Deprecated (PlatformName.WatchOS, 11, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for the desired distance type.")]
+ [Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for the desired distance type.")]
[Field ("HKPredicateKeyPathWorkoutTotalDistance")]
NSString WorkoutTotalDistance { get; }
+ [Deprecated (PlatformName.iOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.ActiveEnergyBurned.")]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.ActiveEnergyBurned.")]
+ [Deprecated (PlatformName.TvOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.ActiveEnergyBurned.")]
+ [Deprecated (PlatformName.WatchOS, 11, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.ActiveEnergyBurned.")]
+ [Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.ActiveEnergyBurned.")]
[Field ("HKPredicateKeyPathWorkoutTotalEnergyBurned")]
NSString WorkoutTotalEnergyBurned { get; }
[Field ("HKPredicateKeyPathWorkoutType")]
NSString WorkoutType { get; }
+ [Deprecated (PlatformName.iOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.SwimmingStrokeCount.")]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.SwimmingStrokeCount.")]
+ [Deprecated (PlatformName.TvOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.SwimmingStrokeCount.")]
+ [Deprecated (PlatformName.WatchOS, 11, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.SwimmingStrokeCount.")]
+ [Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.SwimmingStrokeCount.")]
[MacCatalyst (13, 1)]
[Field ("HKPredicateKeyPathWorkoutTotalSwimmingStrokeCount")]
NSString WorkoutTotalSwimmingStrokeCount { get; }
@@ -317,6 +353,11 @@ interface HKPredicateKeyPath {
[Field ("HKPredicateKeyPathCDACustodianName")]
NSString CdaCustodianName { get; }
+ [Deprecated (PlatformName.iOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.FlightsClimbed.")]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.FlightsClimbed.")]
+ [Deprecated (PlatformName.TvOS, 18, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.FlightsClimbed.")]
+ [Deprecated (PlatformName.WatchOS, 11, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.FlightsClimbed.")]
+ [Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'HKQuery.GetSumQuantityPredicateForWorkoutActivities' instead, passing the HKQuantityType for HKQuantityTypeIdentifier.FlightsClimbed.")]
[MacCatalyst (13, 1)]
[Field ("HKPredicateKeyPathWorkoutTotalFlightsClimbed")]
NSString TotalFlightsClimbed { get; }
@@ -442,6 +483,10 @@ interface HKPredicateKeyPath {
[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0), NoTV]
[Field ("HKPredicateKeyPathWorkoutActivity")]
NSString WorkoutActivity { get; }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Field ("HKPredicateKeyPathWorkoutEffortRelationship")]
+ NSString WorkoutEffortRelationship { get; }
}
[NoWatch] // headers says it's available but it's only usable from another, unavailable, type
@@ -836,7 +881,10 @@ interface HKHealthStore {
void RequestPerObjectReadAuthorization (HKObjectType objectType, [NullAllowed] NSPredicate predicate, HKHealthStoreCompletionHandler completion);
[NullAllowed]
- [iOS (17, 0), NoMac, NoWatch, NoTV, NoMacCatalyst]
+ // xtro says this exists on macOS, introspection disagrees.
+ // Headers doesn't say neither that it's available nor that it's not on macOS, which is probably why xtro picks it up.
+ // Assuming that the lack of unavailability in the headers is a mistake, so remove from macOS.
+ [iOS (17, 0), NoMac, Watch (10, 0), NoTV, MacCatalyst (17, 0)]
[Export ("workoutSessionMirroringStartHandler", ArgumentSemantic.Copy)]
Action WorkoutSessionMirroringStartHandler { get; set; }
@@ -1476,6 +1524,17 @@ interface HKObjectType : NSSecureCoding, NSCopying {
[iOS (16, 0), Mac (13, 0), Watch (9, 0), NoTV, MacCatalyst (16, 0)]
[Export ("requiresPerObjectAuthorization")]
bool RequiresPerObjectAuthorization { get; }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Static]
+ [return: NullAllowed]
+ [Export ("scoredAssessmentTypeForIdentifier:")]
+ HKScoredAssessmentType GetScoredAssessmentType ([BindAs (typeof (HKScoredAssessmentTypeIdentifier))] NSString identifier);
+
+ [Static]
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Export ("stateOfMindType")]
+ HKStateOfMindType StateOfMindType { get; }
}
[Watch (7, 0), iOS (14, 0), Mac (13, 0)]
@@ -1909,6 +1968,35 @@ interface HKQuery {
[Static]
[Export ("predicateForWorkoutsWithActivityPredicate:")]
NSPredicate GetPredicateForWorkouts (NSPredicate activityPredicate);
+
+ [Static]
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Export ("predicateForWorkoutEffortSamplesRelatedToWorkout:activity:")]
+ NSPredicate GetPredicateForWorkoutEffortSamplesRelatedToWorkout (HKWorkout workout, [NullAllowed] HKWorkoutActivity activity);
+
+ // Category HKQuery (HKStateOfMind)
+ [Static]
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Export ("predicateForStatesOfMindWithValence:operatorType:")]
+ NSPredicate GetPredicateForStatesOfMind (double valence, NSPredicateOperatorType operatorType);
+
+ // Category HKQuery (HKStateOfMind)
+ [Static]
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Export ("predicateForStatesOfMindWithKind:")]
+ NSPredicate GetPredicateForStatesOfMind (HKStateOfMindKind kind);
+
+ // Category HKQuery (HKStateOfMind)
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Static]
+ [Export ("predicateForStatesOfMindWithLabel:")]
+ NSPredicate GetPredicateForStatesOfMind (HKStateOfMindLabel label);
+
+ // Category HKQuery (HKStateOfMind)
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Static]
+ [Export ("predicateForStatesOfMindWithAssociation:")]
+ NSPredicate GetPredicateForStatesOfMind (HKStateOfMindAssociation association);
}
/// A measurement of health information. Base class for and .
@@ -2572,6 +2660,42 @@ enum HKQuantityTypeIdentifier {
[Watch (10, 0), MacCatalyst (17, 0), Mac (14, 0), iOS (17, 0)]
[Field ("HKQuantityTypeIdentifierTimeInDaylight")]
TimeInDaylight,
+
+ [Watch (11, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Field ("HKQuantityTypeIdentifierWorkoutEffortScore")]
+ WorkoutEffortScore,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierCrossCountrySkiingSpeed")]
+ CrossCountrySkiingSpeed,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierDistanceCrossCountrySkiing")]
+ DistanceCrossCountrySkiing,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierDistancePaddleSports")]
+ DistancePaddleSports,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierDistanceRowing")]
+ DistanceRowing,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierDistanceSkatingSports")]
+ DistanceSkatingSports,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierEstimatedWorkoutEffortScore")]
+ EstimatedWorkoutEffortScore,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierPaddleSportsSpeed")]
+ PaddleSportsSpeed,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKQuantityTypeIdentifierRowingSpeed")]
+ RowingSpeed,
}
/// Contains constants that identify HealthKit correlation types.
@@ -2590,6 +2714,10 @@ enum HKCorrelationTypeIdentifier {
enum HKDataTypeIdentifier {
[Field ("HKDataTypeIdentifierHeartbeatSeries")]
HeartbeatSeries,
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Field ("HKDataTypeIdentifierStateOfMind")]
+ StateOfMind,
}
/// Enumerates the types of T:HealthKit.HKCategory; currently there is only the one form (Sleep Analysis).
@@ -2912,6 +3040,14 @@ enum HKCategoryTypeIdentifier {
[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
[Field ("HKCategoryTypeIdentifierProlongedMenstrualPeriods")]
ProlongedMenstrualPeriods,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKCategoryTypeIdentifierBleedingAfterPregnancy")]
+ BleedingAfterPregnancy,
+
+ [iOS (18, 0), MacCatalyst (18, 0), Mac (15, 0), Watch (11, 0)]
+ [Field ("HKCategoryTypeIdentifierBleedingDuringPregnancy")]
+ BleedingDuringPregnancy,
}
/// Enumerates the forms of .
@@ -3293,6 +3429,12 @@ interface HKUnit : NSCopying, NSSecureCoding {
[Static]
[Export ("luxUnit")]
HKUnit Lux { get; }
+
+ // HKUnit (UnitLess)
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Static]
+ [Export ("appleEffortScoreUnit")]
+ HKUnit AppleEffortScoreUnit { get; }
}
/// An that represents a physical workout.
@@ -3312,21 +3454,21 @@ interface HKWorkout {
[Export ("duration", ArgumentSemantic.UnsafeUnretained)]
double Duration { get; }
- [Deprecated (PlatformName.MacOSX, 13, 0)]
- [Deprecated (PlatformName.iOS, 16, 0)]
- [Deprecated (PlatformName.MacCatalyst, 16, 0)]
+ [Deprecated (PlatformName.MacOSX, 15, 0)]
+ [Deprecated (PlatformName.iOS, 18, 0)]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0)]
[NullAllowed, Export ("totalEnergyBurned", ArgumentSemantic.Retain)]
HKQuantity TotalEnergyBurned { get; }
- [Deprecated (PlatformName.MacOSX, 13, 0)]
- [Deprecated (PlatformName.iOS, 16, 0)]
- [Deprecated (PlatformName.MacCatalyst, 16, 0)]
+ [Deprecated (PlatformName.MacOSX, 15, 0)]
+ [Deprecated (PlatformName.iOS, 18, 0)]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0)]
[NullAllowed, Export ("totalDistance", ArgumentSemantic.Retain)]
HKQuantity TotalDistance { get; }
- [Deprecated (PlatformName.MacOSX, 13, 0)]
- [Deprecated (PlatformName.iOS, 16, 0)]
- [Deprecated (PlatformName.MacCatalyst, 16, 0)]
+ [Deprecated (PlatformName.MacOSX, 15, 0)]
+ [Deprecated (PlatformName.iOS, 18, 0)]
+ [Deprecated (PlatformName.MacCatalyst, 18, 0)]
[MacCatalyst (13, 1)]
[NullAllowed, Export ("totalSwimmingStrokeCount", ArgumentSemantic.Strong)]
HKQuantity TotalSwimmingStrokeCount { get; }
@@ -3908,6 +4050,11 @@ interface HKActivitySummary : NSSecureCoding, NSCopying {
[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0), NoTV]
[NullAllowed, Export ("standHoursGoal", ArgumentSemantic.Strong)]
HKQuantity StandHoursGoal { get; set; }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Export ("paused", ArgumentSemantic.Assign)]
+ bool Paused { [Bind ("isPaused")] get; set; }
+
}
/// Gets instances that match an .
@@ -4382,7 +4529,7 @@ interface HKLiveWorkoutBuilder {
[MacCatalyst (13, 1)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
- interface HKAudiogramSensitivityPoint {
+ interface HKAudiogramSensitivityPoint : NSSecureCoding {
[Export ("frequency", ArgumentSemantic.Copy)]
HKQuantity Frequency { get; }
@@ -4915,4 +5062,253 @@ interface HKWorkoutActivity : NSSecureCoding, NSCopying {
[DisableDefaultCtor] // NSInvalidArgumentException Reason: The -init method is not available on HKPrescriptionType
interface HKPrescriptionType {
}
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKScoredAssessment), Name = "HKGAD7Assessment")]
+ [DisableDefaultCtor]
+ interface HKGad7Assessment {
+ [Export ("answers", ArgumentSemantic.Copy)]
+ [BindAs (typeof (HKGad7AssessmentAnswer []))]
+ NSNumber [] Answers { get; }
+
+ [Export ("risk", ArgumentSemantic.Assign)]
+ HKGad7AssessmentRisk Risk { get; }
+
+ [Static]
+ [Export ("assessmentWithDate:answers:")]
+ HKGad7Assessment Create (NSDate date, [BindAs (typeof (HKGad7AssessmentAnswer []))] NSNumber [] answers);
+
+ [Static]
+ [Export ("assessmentWithDate:answers:metadata:")]
+ HKGad7Assessment Create (NSDate date, [BindAs (typeof (HKGad7AssessmentAnswer []))] NSNumber [] answers, [NullAllowed] NSDictionary metadata);
+ }
+
+ delegate void HKWorkoutRelationshipCallback (bool success, [NullAllowed] NSError error);
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Category]
+ [BaseType (typeof (HKHealthStore))]
+ interface HKHealthStore_HKWorkoutRelationship {
+ [Export ("relateWorkoutEffortSample:withWorkout:activity:completion:")]
+ void RelateWorkoutEffortSample (HKSample sample, HKWorkout workout, [NullAllowed] HKWorkoutActivity activity, HKWorkoutRelationshipCallback completion);
+
+ [Export ("unrelateWorkoutEffortSample:fromWorkout:activity:completion:")]
+ void UnrelateWorkoutEffortSample (HKSample sample, HKWorkout workout, [NullAllowed] HKWorkoutActivity activity, HKWorkoutRelationshipCallback completion);
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKSampleType))]
+ [DisableDefaultCtor]
+ interface HKScoredAssessmentType {
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKSampleType))]
+ [DisableDefaultCtor]
+ interface HKStateOfMindType {
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ [NativeName ("HKPHQ9AssessmentRisk")]
+ public enum HKPhq9AssessmentRisk : long {
+ NoneToMinimal = 1,
+ Mild,
+ Moderate,
+ ModeratelySevere,
+ Severe,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ [NativeName ("HKPHQ9AssessmentAnswer")]
+ public enum HKPhq9AssessmentAnswer : long {
+ NotAtAll = 0,
+ SeveralDays,
+ MoreThanHalfTheDays,
+ NearlyEveryDay,
+ PreferNotToAnswer,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKScoredAssessment), Name = "HKPHQ9Assessment")]
+ [DisableDefaultCtor]
+ interface HKPhq9Assessment {
+ [Export ("answers", ArgumentSemantic.Copy)]
+ [BindAs (typeof (HKPhq9AssessmentAnswer []))]
+ NSNumber [] Answers { get; }
+
+ [Export ("risk", ArgumentSemantic.Assign)]
+ HKPhq9AssessmentRisk Risk { get; }
+
+ [Static]
+ [Export ("assessmentWithDate:answers:")]
+ HKPhq9Assessment Create (NSDate date, [BindAs (typeof (HKPhq9AssessmentAnswer []))] NSNumber [] answers);
+
+ [Static]
+ [Export ("assessmentWithDate:answers:metadata:")]
+ HKPhq9Assessment Create (NSDate date, [BindAs (typeof (HKPhq9AssessmentAnswer []))] NSNumber [] answers, [NullAllowed] NSDictionary metadata);
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKSample))]
+ [DisableDefaultCtor]
+ interface HKScoredAssessment : NSSecureCoding, NSCopying {
+ [Export ("score", ArgumentSemantic.Assign)]
+ nint Score { get; }
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKStateOfMindValenceClassification : long {
+ VeryUnpleasant = 1,
+ Unpleasant,
+ SlightlyUnpleasant,
+ Neutral,
+ SlightlyPleasant,
+ Pleasant,
+ VeryPleasant,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKStateOfMindLabel : long {
+ Amazed = 1,
+ Amused,
+ Angry,
+ Anxious,
+ Ashamed,
+ Brave,
+ Calm,
+ Content,
+ Disappointed,
+ Discouraged,
+ Disgusted,
+ Embarrassed,
+ Excited,
+ Frustrated,
+ Grateful,
+ Guilty,
+ Happy,
+ Hopeless,
+ Irritated,
+ Jealous,
+ Joyful,
+ Lonely,
+ Passionate,
+ Peaceful,
+ Proud,
+ Relieved,
+ Sad,
+ Scared,
+ Stressed,
+ Surprised,
+ Worried,
+ Annoyed,
+ Confident,
+ Drained,
+ Hopeful,
+ Indifferent,
+ Overwhelmed,
+ Satisfied,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKStateOfMindAssociation : long {
+ Community = 1,
+ CurrentEvents,
+ Dating,
+ Education,
+ Family,
+ Fitness,
+ Friends,
+ Health,
+ Hobbies,
+ Identity,
+ Money,
+ Partner,
+ SelfCare,
+ Spirituality,
+ Tasks,
+ Travel,
+ Work,
+ Weather,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKStateOfMindKind : long {
+ MomentaryEmotion = 1,
+ DailyMood = 2,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKSample))]
+ [DisableDefaultCtor]
+ interface HKStateOfMind : NSSecureCoding, NSCopying {
+ [Export ("kind", ArgumentSemantic.Assign)]
+ HKStateOfMindKind Kind { get; }
+
+ [Export ("valence", ArgumentSemantic.Assign)]
+ double Valence { get; }
+
+ [Export ("valenceClassification", ArgumentSemantic.Assign)]
+ HKStateOfMindValenceClassification ValenceClassification { get; }
+
+ [Export ("labels", ArgumentSemantic.Copy)]
+ [BindAs (typeof (HKStateOfMindLabel []))]
+ NSNumber [] Labels { get; }
+
+ [Export ("associations", ArgumentSemantic.Copy)]
+ [BindAs (typeof (HKStateOfMindAssociation []))]
+ NSNumber [] Associations { get; }
+
+ [Static]
+ [Export ("stateOfMindWithDate:kind:valence:labels:associations:")]
+ HKStateOfMind Create (NSDate date, HKStateOfMindKind kind, double valence, [BindAs (typeof (HKStateOfMindLabel []))] NSNumber [] labels, [BindAs (typeof (HKStateOfMindAssociation []))] NSNumber [] associations);
+
+ [Static]
+ [Export ("stateOfMindWithDate:kind:valence:labels:associations:metadata:")]
+ HKStateOfMind Create (NSDate date, HKStateOfMindKind kind, double valence, [BindAs (typeof (HKStateOfMindLabel []))] NSNumber [] labels, [BindAs (typeof (HKStateOfMindAssociation []))] NSNumber [] associations, [NullAllowed] NSDictionary metadata);
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ enum HKScoredAssessmentTypeIdentifier {
+ [Field ("HKScoredAssessmentTypeIdentifierGAD7")]
+ Gad7,
+ [Field ("HKScoredAssessmentTypeIdentifierPHQ9")]
+ Phq9,
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (NSObject))]
+ [DisableDefaultCtor]
+ interface HKWorkoutEffortRelationship : NSSecureCoding, NSCopying {
+ [Export ("workout", ArgumentSemantic.Copy)]
+ HKWorkout Workout { get; }
+
+ [Export ("activity", ArgumentSemantic.Copy), NullAllowed]
+ HKWorkoutActivity Activity { get; }
+
+ [Export ("samples", ArgumentSemantic.Copy), NullAllowed]
+ HKSample [] Samples { get; }
+ }
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Native]
+ public enum HKWorkoutEffortRelationshipQueryOptions : long {
+ Default = 0,
+ MostRelevant = 1 << 0,
+ }
+
+ delegate void HKWorkoutEffortRelationshipQueryResultsHandler (HKWorkoutEffortRelationshipQuery query, [NullAllowed] HKWorkoutEffortRelationship [] relationships, [NullAllowed] HKQueryAnchor newAnchor, [NullAllowed] NSError error);
+
+ [Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [BaseType (typeof (HKQuery))]
+ [DisableDefaultCtor]
+ interface HKWorkoutEffortRelationshipQuery {
+ [Export ("initWithPredicate:anchor:options:resultsHandler:")]
+ NativeHandle Constructor ([NullAllowed] NSPredicate predicate, [NullAllowed] HKQueryAnchor anchor, HKWorkoutEffortRelationshipQueryOptions options, HKWorkoutEffortRelationshipQueryResultsHandler resultsHandler);
+ }
}
diff --git a/tests/cecil-tests/Documentation.KnownFailures.txt b/tests/cecil-tests/Documentation.KnownFailures.txt
index 7b395998052e..1c66ed4ed0f6 100644
--- a/tests/cecil-tests/Documentation.KnownFailures.txt
+++ b/tests/cecil-tests/Documentation.KnownFailures.txt
@@ -10733,6 +10733,8 @@ F:HealthKit.HKCategoryTypeIdentifier.AppleStandHour
F:HealthKit.HKCategoryTypeIdentifier.AppleWalkingSteadinessEvent
F:HealthKit.HKCategoryTypeIdentifier.AudioExposureEvent
F:HealthKit.HKCategoryTypeIdentifier.BladderIncontinence
+F:HealthKit.HKCategoryTypeIdentifier.BleedingAfterPregnancy
+F:HealthKit.HKCategoryTypeIdentifier.BleedingDuringPregnancy
F:HealthKit.HKCategoryTypeIdentifier.Bloating
F:HealthKit.HKCategoryTypeIdentifier.BreastPain
F:HealthKit.HKCategoryTypeIdentifier.CervicalMucusQuality
@@ -10851,6 +10853,11 @@ F:HealthKit.HKCategoryValueSleepAnalysis.AsleepDeep
F:HealthKit.HKCategoryValueSleepAnalysis.AsleepREM
F:HealthKit.HKCategoryValueSleepAnalysis.Awake
F:HealthKit.HKCategoryValueSleepAnalysis.InBed
+F:HealthKit.HKCategoryValueVaginalBleeding.Heavy
+F:HealthKit.HKCategoryValueVaginalBleeding.Light
+F:HealthKit.HKCategoryValueVaginalBleeding.Medium
+F:HealthKit.HKCategoryValueVaginalBleeding.None
+F:HealthKit.HKCategoryValueVaginalBleeding.Unspecified
F:HealthKit.HKCharacteristicTypeIdentifier.ActivityMoveMode
F:HealthKit.HKCharacteristicTypeIdentifier.BiologicalSex
F:HealthKit.HKCharacteristicTypeIdentifier.BloodType
@@ -10873,6 +10880,7 @@ F:HealthKit.HKCyclingFunctionalThresholdPowerTestType.MaxExercise60Minute
F:HealthKit.HKCyclingFunctionalThresholdPowerTestType.PredictionExercise
F:HealthKit.HKCyclingFunctionalThresholdPowerTestType.RampTest
F:HealthKit.HKDataTypeIdentifier.HeartbeatSeries
+F:HealthKit.HKDataTypeIdentifier.StateOfMind
F:HealthKit.HKDevicePlacementSide.Central
F:HealthKit.HKDevicePlacementSide.Left
F:HealthKit.HKDevicePlacementSide.Right
@@ -10901,6 +10909,7 @@ F:HealthKit.HKErrorCode.HealthDataUnavailable
F:HealthKit.HKErrorCode.InvalidArgument
F:HealthKit.HKErrorCode.NoData
F:HealthKit.HKErrorCode.NoError
+F:HealthKit.HKErrorCode.NotPermissibleForGuestUserMode
F:HealthKit.HKErrorCode.RequiredAuthorizationDenied
F:HealthKit.HKErrorCode.UserCanceled
F:HealthKit.HKErrorCode.UserExitedWorkoutSession
@@ -10927,6 +10936,14 @@ F:HealthKit.HKFitzpatrickSkinType.IV
F:HealthKit.HKFitzpatrickSkinType.NotSet
F:HealthKit.HKFitzpatrickSkinType.V
F:HealthKit.HKFitzpatrickSkinType.VI
+F:HealthKit.HKGad7AssessmentAnswer.MoreThanHalfTheDays
+F:HealthKit.HKGad7AssessmentAnswer.NearlyEveryDay
+F:HealthKit.HKGad7AssessmentAnswer.NotAtAll
+F:HealthKit.HKGad7AssessmentAnswer.SeveralDays
+F:HealthKit.HKGad7AssessmentRisk.Mild
+F:HealthKit.HKGad7AssessmentRisk.Moderate
+F:HealthKit.HKGad7AssessmentRisk.NoneToMinimal
+F:HealthKit.HKGad7AssessmentRisk.Severe
F:HealthKit.HKHeartRateMotionContext.Active
F:HealthKit.HKHeartRateMotionContext.NotSet
F:HealthKit.HKHeartRateMotionContext.Sedentary
@@ -10956,6 +10973,16 @@ F:HealthKit.HKMetricPrefix.Nano
F:HealthKit.HKMetricPrefix.None
F:HealthKit.HKMetricPrefix.Pico
F:HealthKit.HKMetricPrefix.Tera
+F:HealthKit.HKPhq9AssessmentAnswer.MoreThanHalfTheDays
+F:HealthKit.HKPhq9AssessmentAnswer.NearlyEveryDay
+F:HealthKit.HKPhq9AssessmentAnswer.NotAtAll
+F:HealthKit.HKPhq9AssessmentAnswer.PreferNotToAnswer
+F:HealthKit.HKPhq9AssessmentAnswer.SeveralDays
+F:HealthKit.HKPhq9AssessmentRisk.Mild
+F:HealthKit.HKPhq9AssessmentRisk.Moderate
+F:HealthKit.HKPhq9AssessmentRisk.ModeratelySevere
+F:HealthKit.HKPhq9AssessmentRisk.NoneToMinimal
+F:HealthKit.HKPhq9AssessmentRisk.Severe
F:HealthKit.HKPhysicalEffortEstimationType.ActivityLookup
F:HealthKit.HKPhysicalEffortEstimationType.DeviceSensed
F:HealthKit.HKPrismBase.Down
@@ -10985,6 +11012,7 @@ F:HealthKit.HKQuantityTypeIdentifier.BodyFatPercentage
F:HealthKit.HKQuantityTypeIdentifier.BodyMass
F:HealthKit.HKQuantityTypeIdentifier.BodyMassIndex
F:HealthKit.HKQuantityTypeIdentifier.BodyTemperature
+F:HealthKit.HKQuantityTypeIdentifier.CrossCountrySkiingSpeed
F:HealthKit.HKQuantityTypeIdentifier.CyclingCadence
F:HealthKit.HKQuantityTypeIdentifier.CyclingFunctionalThresholdPower
F:HealthKit.HKQuantityTypeIdentifier.CyclingPower
@@ -11028,14 +11056,19 @@ F:HealthKit.HKQuantityTypeIdentifier.DietaryVitaminE
F:HealthKit.HKQuantityTypeIdentifier.DietaryVitaminK
F:HealthKit.HKQuantityTypeIdentifier.DietaryWater
F:HealthKit.HKQuantityTypeIdentifier.DietaryZinc
+F:HealthKit.HKQuantityTypeIdentifier.DistanceCrossCountrySkiing
F:HealthKit.HKQuantityTypeIdentifier.DistanceCycling
F:HealthKit.HKQuantityTypeIdentifier.DistanceDownhillSnowSports
+F:HealthKit.HKQuantityTypeIdentifier.DistancePaddleSports
+F:HealthKit.HKQuantityTypeIdentifier.DistanceRowing
+F:HealthKit.HKQuantityTypeIdentifier.DistanceSkatingSports
F:HealthKit.HKQuantityTypeIdentifier.DistanceSwimming
F:HealthKit.HKQuantityTypeIdentifier.DistanceWalkingRunning
F:HealthKit.HKQuantityTypeIdentifier.DistanceWheelchair
F:HealthKit.HKQuantityTypeIdentifier.ElectrodermalActivity
F:HealthKit.HKQuantityTypeIdentifier.EnvironmentalAudioExposure
F:HealthKit.HKQuantityTypeIdentifier.EnvironmentalSoundReduction
+F:HealthKit.HKQuantityTypeIdentifier.EstimatedWorkoutEffortScore
F:HealthKit.HKQuantityTypeIdentifier.FlightsClimbed
F:HealthKit.HKQuantityTypeIdentifier.ForcedExpiratoryVolume1
F:HealthKit.HKQuantityTypeIdentifier.ForcedVitalCapacity
@@ -11051,12 +11084,14 @@ F:HealthKit.HKQuantityTypeIdentifier.NikeFuel
F:HealthKit.HKQuantityTypeIdentifier.NumberOfAlcoholicBeverages
F:HealthKit.HKQuantityTypeIdentifier.NumberOfTimesFallen
F:HealthKit.HKQuantityTypeIdentifier.OxygenSaturation
+F:HealthKit.HKQuantityTypeIdentifier.PaddleSportsSpeed
F:HealthKit.HKQuantityTypeIdentifier.PeakExpiratoryFlowRate
F:HealthKit.HKQuantityTypeIdentifier.PeripheralPerfusionIndex
F:HealthKit.HKQuantityTypeIdentifier.PhysicalEffort
F:HealthKit.HKQuantityTypeIdentifier.PushCount
F:HealthKit.HKQuantityTypeIdentifier.RespiratoryRate
F:HealthKit.HKQuantityTypeIdentifier.RestingHeartRate
+F:HealthKit.HKQuantityTypeIdentifier.RowingSpeed
F:HealthKit.HKQuantityTypeIdentifier.RunningGroundContactTime
F:HealthKit.HKQuantityTypeIdentifier.RunningPower
F:HealthKit.HKQuantityTypeIdentifier.RunningSpeed
@@ -11078,10 +11113,78 @@ F:HealthKit.HKQuantityTypeIdentifier.WalkingHeartRateAverage
F:HealthKit.HKQuantityTypeIdentifier.WalkingSpeed
F:HealthKit.HKQuantityTypeIdentifier.WalkingStepLength
F:HealthKit.HKQuantityTypeIdentifier.WaterTemperature
+F:HealthKit.HKQuantityTypeIdentifier.WorkoutEffortScore
F:HealthKit.HKQueryOptions.None
F:HealthKit.HKQueryOptions.StrictEndDate
F:HealthKit.HKQueryOptions.StrictStartDate
F:HealthKit.HKSampleQuery.NoLimit
+F:HealthKit.HKScoredAssessmentTypeIdentifier.Gad7
+F:HealthKit.HKScoredAssessmentTypeIdentifier.Phq9
+F:HealthKit.HKStateOfMindAssociation.Community
+F:HealthKit.HKStateOfMindAssociation.CurrentEvents
+F:HealthKit.HKStateOfMindAssociation.Dating
+F:HealthKit.HKStateOfMindAssociation.Education
+F:HealthKit.HKStateOfMindAssociation.Family
+F:HealthKit.HKStateOfMindAssociation.Fitness
+F:HealthKit.HKStateOfMindAssociation.Friends
+F:HealthKit.HKStateOfMindAssociation.Health
+F:HealthKit.HKStateOfMindAssociation.Hobbies
+F:HealthKit.HKStateOfMindAssociation.Identity
+F:HealthKit.HKStateOfMindAssociation.Money
+F:HealthKit.HKStateOfMindAssociation.Partner
+F:HealthKit.HKStateOfMindAssociation.SelfCare
+F:HealthKit.HKStateOfMindAssociation.Spirituality
+F:HealthKit.HKStateOfMindAssociation.Tasks
+F:HealthKit.HKStateOfMindAssociation.Travel
+F:HealthKit.HKStateOfMindAssociation.Weather
+F:HealthKit.HKStateOfMindAssociation.Work
+F:HealthKit.HKStateOfMindKind.DailyMood
+F:HealthKit.HKStateOfMindKind.MomentaryEmotion
+F:HealthKit.HKStateOfMindLabel.Amazed
+F:HealthKit.HKStateOfMindLabel.Amused
+F:HealthKit.HKStateOfMindLabel.Angry
+F:HealthKit.HKStateOfMindLabel.Annoyed
+F:HealthKit.HKStateOfMindLabel.Anxious
+F:HealthKit.HKStateOfMindLabel.Ashamed
+F:HealthKit.HKStateOfMindLabel.Brave
+F:HealthKit.HKStateOfMindLabel.Calm
+F:HealthKit.HKStateOfMindLabel.Confident
+F:HealthKit.HKStateOfMindLabel.Content
+F:HealthKit.HKStateOfMindLabel.Disappointed
+F:HealthKit.HKStateOfMindLabel.Discouraged
+F:HealthKit.HKStateOfMindLabel.Disgusted
+F:HealthKit.HKStateOfMindLabel.Drained
+F:HealthKit.HKStateOfMindLabel.Embarrassed
+F:HealthKit.HKStateOfMindLabel.Excited
+F:HealthKit.HKStateOfMindLabel.Frustrated
+F:HealthKit.HKStateOfMindLabel.Grateful
+F:HealthKit.HKStateOfMindLabel.Guilty
+F:HealthKit.HKStateOfMindLabel.Happy
+F:HealthKit.HKStateOfMindLabel.Hopeful
+F:HealthKit.HKStateOfMindLabel.Hopeless
+F:HealthKit.HKStateOfMindLabel.Indifferent
+F:HealthKit.HKStateOfMindLabel.Irritated
+F:HealthKit.HKStateOfMindLabel.Jealous
+F:HealthKit.HKStateOfMindLabel.Joyful
+F:HealthKit.HKStateOfMindLabel.Lonely
+F:HealthKit.HKStateOfMindLabel.Overwhelmed
+F:HealthKit.HKStateOfMindLabel.Passionate
+F:HealthKit.HKStateOfMindLabel.Peaceful
+F:HealthKit.HKStateOfMindLabel.Proud
+F:HealthKit.HKStateOfMindLabel.Relieved
+F:HealthKit.HKStateOfMindLabel.Sad
+F:HealthKit.HKStateOfMindLabel.Satisfied
+F:HealthKit.HKStateOfMindLabel.Scared
+F:HealthKit.HKStateOfMindLabel.Stressed
+F:HealthKit.HKStateOfMindLabel.Surprised
+F:HealthKit.HKStateOfMindLabel.Worried
+F:HealthKit.HKStateOfMindValenceClassification.Neutral
+F:HealthKit.HKStateOfMindValenceClassification.Pleasant
+F:HealthKit.HKStateOfMindValenceClassification.SlightlyPleasant
+F:HealthKit.HKStateOfMindValenceClassification.SlightlyUnpleasant
+F:HealthKit.HKStateOfMindValenceClassification.Unpleasant
+F:HealthKit.HKStateOfMindValenceClassification.VeryPleasant
+F:HealthKit.HKStateOfMindValenceClassification.VeryUnpleasant
F:HealthKit.HKStatisticsOptions.CumulativeSum
F:HealthKit.HKStatisticsOptions.DiscreteAverage
F:HealthKit.HKStatisticsOptions.DiscreteMax
@@ -11237,6 +11340,8 @@ F:HealthKit.HKWorkoutActivityType.WheelchairRunPace
F:HealthKit.HKWorkoutActivityType.WheelchairWalkPace
F:HealthKit.HKWorkoutActivityType.Wrestling
F:HealthKit.HKWorkoutActivityType.Yoga
+F:HealthKit.HKWorkoutEffortRelationshipQueryOptions.Default
+F:HealthKit.HKWorkoutEffortRelationshipQueryOptions.MostRelevant
F:HealthKit.HKWorkoutEventType.Lap
F:HealthKit.HKWorkoutEventType.Marker
F:HealthKit.HKWorkoutEventType.MotionPaused
@@ -37000,6 +37105,7 @@ M:HealthKit.HKAttachmentStore.GetAttachmentsAsync(HealthKit.HKObject)
M:HealthKit.HKAttachmentStore.GetDataAsync(HealthKit.HKAttachment,Foundation.NSProgress@)
M:HealthKit.HKAttachmentStore.GetDataAsync(HealthKit.HKAttachment)
M:HealthKit.HKAttachmentStore.RemoveAttachmentAsync(HealthKit.HKAttachment,HealthKit.HKObject)
+M:HealthKit.HKAudiogramSensitivityPoint.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKBiologicalSexObject.Copy(Foundation.NSZone)
M:HealthKit.HKBiologicalSexObject.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKBloodTypeObject.Copy(Foundation.NSZone)
@@ -37036,6 +37142,8 @@ M:HealthKit.HKGlassesLensSpecification.Copy(Foundation.NSZone)
M:HealthKit.HKGlassesLensSpecification.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKGlassesPrescription.Copy(Foundation.NSZone)
M:HealthKit.HKGlassesPrescription.EncodeTo(Foundation.NSCoder)
+M:HealthKit.HKHealthStore_HKWorkoutRelationship.RelateWorkoutEffortSample(HealthKit.HKHealthStore,HealthKit.HKSample,HealthKit.HKWorkout,HealthKit.HKWorkoutActivity,HealthKit.HKWorkoutRelationshipCallback)
+M:HealthKit.HKHealthStore_HKWorkoutRelationship.UnrelateWorkoutEffortSample(HealthKit.HKHealthStore,HealthKit.HKSample,HealthKit.HKWorkout,HealthKit.HKWorkoutActivity,HealthKit.HKWorkoutRelationshipCallback)
M:HealthKit.HKHealthStore.DeleteObjectAsync(HealthKit.HKObject)
M:HealthKit.HKHealthStore.DeleteObjectsAsync(HealthKit.HKObject[])
M:HealthKit.HKHealthStore.DisableAllBackgroundDeliveryAsync
@@ -37084,12 +37192,16 @@ M:HealthKit.HKQueryAnchor.Copy(Foundation.NSZone)
M:HealthKit.HKQueryAnchor.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKQueryDescriptor.Copy(Foundation.NSZone)
M:HealthKit.HKQueryDescriptor.EncodeTo(Foundation.NSCoder)
+M:HealthKit.HKScoredAssessment.Copy(Foundation.NSZone)
+M:HealthKit.HKScoredAssessment.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKSeriesBuilder.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKSeriesSample.Copy(Foundation.NSZone)
M:HealthKit.HKSource.Copy(Foundation.NSZone)
M:HealthKit.HKSource.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKSourceRevision.Copy(Foundation.NSZone)
M:HealthKit.HKSourceRevision.EncodeTo(Foundation.NSCoder)
+M:HealthKit.HKStateOfMind.Copy(Foundation.NSZone)
+M:HealthKit.HKStateOfMind.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKStatistics.Copy(Foundation.NSZone)
M:HealthKit.HKStatistics.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKUnit.Copy(Foundation.NSZone)
@@ -37123,6 +37235,8 @@ M:HealthKit.HKWorkoutBuilder.UpdateActivityAsync(Foundation.NSUuid,Foundation.NS
M:HealthKit.HKWorkoutBuilder.UpdateActivityAsync(Foundation.NSUuid,Foundation.NSDictionary{Foundation.NSString,Foundation.NSObject})
M:HealthKit.HKWorkoutConfiguration.Copy(Foundation.NSZone)
M:HealthKit.HKWorkoutConfiguration.EncodeTo(Foundation.NSCoder)
+M:HealthKit.HKWorkoutEffortRelationship.Copy(Foundation.NSZone)
+M:HealthKit.HKWorkoutEffortRelationship.EncodeTo(Foundation.NSCoder)
M:HealthKit.HKWorkoutEvent.Copy(Foundation.NSZone)
M:HealthKit.HKWorkoutEvent.Create(HealthKit.HKWorkoutEventType,Foundation.NSDate,HealthKit.HKMetadata)
M:HealthKit.HKWorkoutEvent.Create(HealthKit.HKWorkoutEventType,Foundation.NSDateInterval,HealthKit.HKMetadata)
@@ -67670,6 +67784,7 @@ P:GLKit.GLKViewController.TimeSinceLastResume
P:GLKit.GLKViewController.TimeSinceLastUpdate
P:GLKit.GLKViewController.WeakDelegate
P:GLKit.GLKViewDrawEventArgs.Rect
+P:HealthKit.HKActivitySummary.Paused
P:HealthKit.HKDeletedObject.Metadata
P:HealthKit.HKDetailedCdaErrors.ValidationError
P:HealthKit.HKDevicePropertyKey.FirmwareVersion
@@ -67839,6 +67954,7 @@ P:HealthKit.HKPredicateKeyPath.WorkoutActivitySumQuantity
P:HealthKit.HKPredicateKeyPath.WorkoutActivityType
P:HealthKit.HKPredicateKeyPath.WorkoutAverageQuantity
P:HealthKit.HKPredicateKeyPath.WorkoutDuration
+P:HealthKit.HKPredicateKeyPath.WorkoutEffortRelationship
P:HealthKit.HKPredicateKeyPath.WorkoutMaximumQuantity
P:HealthKit.HKPredicateKeyPath.WorkoutMinimumQuantity
P:HealthKit.HKPredicateKeyPath.WorkoutSumQuantity
@@ -82167,6 +82283,7 @@ T:HealthKit.HKCategoryValuePresence
T:HealthKit.HKCategoryValueProgesteroneTestResult
T:HealthKit.HKCategoryValueSeverity
T:HealthKit.HKCategoryValueSleepAnalysisAsleep
+T:HealthKit.HKCategoryValueVaginalBleeding
T:HealthKit.HKCyclingFunctionalThresholdPowerTestType
T:HealthKit.HKDataTypeIdentifier
T:HealthKit.HKDetailedCdaErrors
@@ -82176,6 +82293,9 @@ T:HealthKit.HKElectrocardiogramLead
T:HealthKit.HKElectrocardiogramQueryDataHandler
T:HealthKit.HKElectrocardiogramSymptomsStatus
T:HealthKit.HKFhirRelease
+T:HealthKit.HKGad7AssessmentAnswer
+T:HealthKit.HKGad7AssessmentRisk
+T:HealthKit.HKHealthStore_HKWorkoutRelationship
T:HealthKit.HKHealthStoreCompletionHandler
T:HealthKit.HKHealthStoreRecoverActiveWorkoutSessionHandler
T:HealthKit.HKHeartbeatSeriesBuilderCompletionHandler
@@ -82184,10 +82304,17 @@ T:HealthKit.HKHeartRateRecoveryTestType
T:HealthKit.HKLiveWorkoutBuilderDelegate
T:HealthKit.HKMetadata
T:HealthKit.HKObserverQueryDescriptorUpdateHandler
+T:HealthKit.HKPhq9AssessmentAnswer
+T:HealthKit.HKPhq9AssessmentRisk
T:HealthKit.HKPhysicalEffortEstimationType
T:HealthKit.HKPrismBase
T:HealthKit.HKQuantitySeriesSampleQueryQuantityHandler
+T:HealthKit.HKScoredAssessmentTypeIdentifier
T:HealthKit.HKSourceRevisionInfo
+T:HealthKit.HKStateOfMindAssociation
+T:HealthKit.HKStateOfMindKind
+T:HealthKit.HKStateOfMindLabel
+T:HealthKit.HKStateOfMindValenceClassification
T:HealthKit.HKStatisticsCollectionQueryStatisticsUpdateHandler
T:HealthKit.HKSwimmingStrokeStyle
T:HealthKit.HKUserMotionContext
@@ -82197,6 +82324,9 @@ T:HealthKit.HKVerifiableClinicalRecordSourceType
T:HealthKit.HKVisionEye
T:HealthKit.HKVisionPrescriptionType
T:HealthKit.HKWaterSalinity
+T:HealthKit.HKWorkoutEffortRelationshipQueryOptions
+T:HealthKit.HKWorkoutEffortRelationshipQueryResultsHandler
+T:HealthKit.HKWorkoutRelationshipCallback
T:HealthKit.HKWorkoutRouteBuilderDataHandler
T:HealthKit.HKWorkoutRouteQueryDataHandler
T:HealthKit.HKWorkoutSessionDelegate
diff --git a/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs b/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs
index 87a8a5b4a5c6..d6f511b967ea 100644
--- a/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs
+++ b/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs
@@ -133,6 +133,12 @@ public void EnumValues_22351 ()
if (!TestRuntime.CheckXcodeVersion (14, 1))
continue;
break;
+
+ case HKCategoryTypeIdentifier.BleedingAfterPregnancy:
+ case HKCategoryTypeIdentifier.BleedingDuringPregnancy:
+ if (!TestRuntime.CheckXcodeVersion (16, 0))
+ continue;
+ break;
default:
if (!TestRuntime.CheckXcodeVersion (7, 0))
continue;
diff --git a/tests/monotouch-test/HealthKit/QuantityTypeIdentifierTest.cs b/tests/monotouch-test/HealthKit/QuantityTypeIdentifierTest.cs
index d3e56f2e5a29..e96db6d22c6a 100644
--- a/tests/monotouch-test/HealthKit/QuantityTypeIdentifierTest.cs
+++ b/tests/monotouch-test/HealthKit/QuantityTypeIdentifierTest.cs
@@ -125,6 +125,18 @@ public void EnumValues_22351 ()
if (!TestRuntime.CheckXcodeVersion (15, 0))
continue;
break;
+ case HKQuantityTypeIdentifier.CrossCountrySkiingSpeed:
+ case HKQuantityTypeIdentifier.DistanceCrossCountrySkiing:
+ case HKQuantityTypeIdentifier.DistancePaddleSports:
+ case HKQuantityTypeIdentifier.DistanceRowing:
+ case HKQuantityTypeIdentifier.DistanceSkatingSports:
+ case HKQuantityTypeIdentifier.EstimatedWorkoutEffortScore:
+ case HKQuantityTypeIdentifier.PaddleSportsSpeed:
+ case HKQuantityTypeIdentifier.RowingSpeed:
+ case HKQuantityTypeIdentifier.WorkoutEffortScore:
+ if (!TestRuntime.CheckXcodeVersion (16, 0))
+ continue;
+ break;
}
try {
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-HealthKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-HealthKit.todo
deleted file mode 100644
index 5ca91abddb36..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-HealthKit.todo
+++ /dev/null
@@ -1,70 +0,0 @@
-!missing-selector! HKHealthStore::setWorkoutSessionMirroringStartHandler: not bound
-!missing-selector! HKHealthStore::workoutSessionMirroringStartHandler not bound
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo
deleted file mode 100644
index 6481b79d146a..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo
+++ /dev/null
@@ -1,68 +0,0 @@
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.ignore b/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.ignore
index 1388366e47ae..0561de6eca4e 100644
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.ignore
+++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.ignore
@@ -1,3 +1,5 @@
-# intro reports them as not present
+# xtro says 'workoutSessionMirroringStartHandler' exists on macOS, introspection disagrees.
+# Headers doesn't say neither that it's available nor that it's not on macOS, which is probably why xtro picks it up (defaults to available).
+# Assuming that the lack of unavailability in the headers is a mistake, so remove from macOS.
!missing-selector! HKHealthStore::setWorkoutSessionMirroringStartHandler: not bound
!missing-selector! HKHealthStore::workoutSessionMirroringStartHandler not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.todo
deleted file mode 100644
index 6481b79d146a..000000000000
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.todo
+++ /dev/null
@@ -1,68 +0,0 @@
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound
diff --git a/tests/xtro-sharpie/iOS-HealthKit.todo b/tests/xtro-sharpie/iOS-HealthKit.todo
deleted file mode 100644
index 6481b79d146a..000000000000
--- a/tests/xtro-sharpie/iOS-HealthKit.todo
+++ /dev/null
@@ -1,68 +0,0 @@
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound
diff --git a/tests/xtro-sharpie/macOS-HealthKit.ignore b/tests/xtro-sharpie/macOS-HealthKit.ignore
index 1388366e47ae..264ec3ec498f 100644
--- a/tests/xtro-sharpie/macOS-HealthKit.ignore
+++ b/tests/xtro-sharpie/macOS-HealthKit.ignore
@@ -1,3 +1,2 @@
-# intro reports them as not present
!missing-selector! HKHealthStore::setWorkoutSessionMirroringStartHandler: not bound
!missing-selector! HKHealthStore::workoutSessionMirroringStartHandler not bound
diff --git a/tests/xtro-sharpie/macOS-HealthKit.todo b/tests/xtro-sharpie/macOS-HealthKit.todo
deleted file mode 100644
index 6481b79d146a..000000000000
--- a/tests/xtro-sharpie/macOS-HealthKit.todo
+++ /dev/null
@@ -1,68 +0,0 @@
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound
diff --git a/tests/xtro-sharpie/watchOS-HealthKit.ignore b/tests/xtro-sharpie/watchOS-HealthKit.ignore
index 707c48fc3ba9..5bff141d4480 100644
--- a/tests/xtro-sharpie/watchOS-HealthKit.ignore
+++ b/tests/xtro-sharpie/watchOS-HealthKit.ignore
@@ -15,7 +15,3 @@
## type was marked as available in 3.0 - but it's now iOS 11 only (even if members are marked with 10.0)
!unknown-type! HKCDADocument bound
-
-# as per intro and the docs in the header, this are not present
-!missing-selector! HKHealthStore::setWorkoutSessionMirroringStartHandler: not bound
-!missing-selector! HKHealthStore::workoutSessionMirroringStartHandler not bound
diff --git a/tests/xtro-sharpie/watchOS-HealthKit.todo b/tests/xtro-sharpie/watchOS-HealthKit.todo
deleted file mode 100644
index 6481b79d146a..000000000000
--- a/tests/xtro-sharpie/watchOS-HealthKit.todo
+++ /dev/null
@@ -1,68 +0,0 @@
-!missing-enum! HKCategoryValueVaginalBleeding not bound
-!missing-enum! HKGAD7AssessmentAnswer not bound
-!missing-enum! HKGAD7AssessmentRisk not bound
-!missing-enum! HKPHQ9AssessmentAnswer not bound
-!missing-enum! HKPHQ9AssessmentRisk not bound
-!missing-enum! HKStateOfMindAssociation not bound
-!missing-enum! HKStateOfMindKind not bound
-!missing-enum! HKStateOfMindLabel not bound
-!missing-enum! HKStateOfMindValenceClassification not bound
-!missing-enum! HKWorkoutEffortRelationshipQueryOptions not bound
-!missing-enum-value! HKErrorCode native value HKErrorNotPermissibleForGuestUserMode = 15 not bound
-!missing-field! HKCategoryTypeIdentifierBleedingAfterPregnancy not bound
-!missing-field! HKCategoryTypeIdentifierBleedingDuringPregnancy not bound
-!missing-field! HKDataTypeIdentifierStateOfMind not bound
-!missing-field! HKPredicateKeyPathWorkoutEffortRelationship not bound
-!missing-field! HKQuantityTypeIdentifierCrossCountrySkiingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierDistanceCrossCountrySkiing not bound
-!missing-field! HKQuantityTypeIdentifierDistancePaddleSports not bound
-!missing-field! HKQuantityTypeIdentifierDistanceRowing not bound
-!missing-field! HKQuantityTypeIdentifierDistanceSkatingSports not bound
-!missing-field! HKQuantityTypeIdentifierEstimatedWorkoutEffortScore not bound
-!missing-field! HKQuantityTypeIdentifierPaddleSportsSpeed not bound
-!missing-field! HKQuantityTypeIdentifierRowingSpeed not bound
-!missing-field! HKQuantityTypeIdentifierWorkoutEffortScore not bound
-!missing-field! HKScoredAssessmentTypeIdentifierGAD7 not bound
-!missing-field! HKScoredAssessmentTypeIdentifierPHQ9 not bound
-!missing-pinvoke! HKStateOfMindValenceClassificationForValence is not bound
-!missing-protocol-conformance! HKAudiogramSensitivityPoint should conform to NSSecureCoding
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKGAD7Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKObjectType::scoredAssessmentTypeForIdentifier: not bound
-!missing-selector! +HKObjectType::stateOfMindType not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers: not bound
-!missing-selector! +HKPHQ9Assessment::assessmentWithDate:answers:metadata: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithAssociation: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithKind: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithLabel: not bound
-!missing-selector! +HKQuery::predicateForStatesOfMindWithValence:operatorType: not bound
-!missing-selector! +HKQuery::predicateForWorkoutEffortSamplesRelatedToWorkout:activity: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations: not bound
-!missing-selector! +HKStateOfMind::stateOfMindWithDate:kind:valence:labels:associations:metadata: not bound
-!missing-selector! +HKUnit::appleEffortScoreUnit not bound
-!missing-selector! HKActivitySummary::setPaused: not bound
-!missing-selector! HKGAD7Assessment::answers not bound
-!missing-selector! HKGAD7Assessment::risk not bound
-!missing-selector! HKHealthStore::relateWorkoutEffortSample:withWorkout:activity:completion: not bound
-!missing-selector! HKHealthStore::unrelateWorkoutEffortSample:fromWorkout:activity:completion: not bound
-!missing-selector! HKPHQ9Assessment::answers not bound
-!missing-selector! HKPHQ9Assessment::risk not bound
-!missing-selector! HKScoredAssessment::score not bound
-!missing-selector! HKStateOfMind::associations not bound
-!missing-selector! HKStateOfMind::kind not bound
-!missing-selector! HKStateOfMind::labels not bound
-!missing-selector! HKStateOfMind::valence not bound
-!missing-selector! HKStateOfMind::valenceClassification not bound
-!missing-selector! HKWorkoutEffortRelationship::activity not bound
-!missing-selector! HKWorkoutEffortRelationship::samples not bound
-!missing-selector! HKWorkoutEffortRelationship::workout not bound
-!missing-selector! HKWorkoutEffortRelationshipQuery::initWithPredicate:anchor:options:resultsHandler: not bound
-!missing-type! HKGAD7Assessment not bound
-!missing-type! HKPHQ9Assessment not bound
-!missing-type! HKScoredAssessment not bound
-!missing-type! HKScoredAssessmentType not bound
-!missing-type! HKStateOfMind not bound
-!missing-type! HKStateOfMindType not bound
-!missing-type! HKWorkoutEffortRelationship not bound
-!missing-type! HKWorkoutEffortRelationshipQuery not bound
-!missing-selector! HKActivitySummary::isPaused not bound