Release_iOS-17-4_macOS-14-4

declarative/declarations/configurations/passcode.settings.yaml

@@ -6,6 +6,7 @@ payload:
     iOS:
       introduced: '15.0'
       allowed-enrollments:
+      - supervised
       - device
       - user
       - local
@@ -16,26 +17,30 @@ payload:
     macOS:
       introduced: '13.0'
       allowed-enrollments:
-      - device
+      - supervised
       - local
       allowed-scopes:
       - system
       - user
     tvOS:
       introduced: n/a
+    visionOS:
+      introduced: n/a
     watchOS:
       introduced: '10.0'
       allowed-enrollments:
-      - device
+      - supervised
       - local
       allowed-scopes:
       - system
+  apply: combined
 payloadkeys:
 - key: RequirePasscode
   title: Require Passcode on Device
   type: <boolean>
   presence: optional
   default: false
+  combinetype: boolean-or
   content: If 'true', the system requires the user to set a passcode without any requirements
     about the length or quality of the passcode. The presence of any other keys implicitly
     requires a passcode, and overrides this key's value.
@@ -51,6 +56,7 @@ payloadkeys:
   type: <boolean>
   presence: optional
   default: false
+  combinetype: boolean-or
   content: If 'true', the passcode needs to consist of at least one alphabetic character
     and at least one number.
 - key: RequireComplexPasscode
@@ -58,6 +64,7 @@ payloadkeys:
   type: <boolean>
   presence: optional
   default: false
+  combinetype: boolean-or
   content: If 'true', the system requires a complex passcode. A complex passcode is
     one that doesn't contain repeated characters or increasing or decreasing characters
     (such as 123 or CBA).
@@ -69,6 +76,7 @@ payloadkeys:
     min: 0
     max: 16
   default: 0
+  combinetype: number-max
   content: The minimum number of characters a passcode can contain.
 - key: MinimumComplexCharacters
   title: Minimum Complex Characters
@@ -85,6 +93,7 @@ payloadkeys:
     min: 0
     max: 4
   default: 0
+  combinetype: number-max
   content: Specifies the minimum number of complex characters in the password. A complex
     character is a character other than a number or a letter, such as '&', '%', '$',
     and '#'.
@@ -96,6 +105,7 @@ payloadkeys:
     min: 2
     max: 11
   default: 11
+  combinetype: number-min
   content: |-
     The number of failed passcode attempts that the system allows the user before iOS erases the device or macOS locks the device. If you don't change this setting, after six failed attempts, the device imposes a time delay before the user can enter a passcode again. The time delay increases with each failed attempt.
     After the final failed attempt, the system securely erases all data and settings from the iOS device. A macOS device locks after the final attempt. The passcode time delay begins after the sixth attempt, so if this value is six or lower, the system has no time delay and triggers the erase or lock as soon as the user exceeds the limit.
@@ -110,6 +120,7 @@ payloadkeys:
       introduced: n/a
   type: <integer>
   presence: optional
+  combinetype: number-min
   content: The number of minutes before the login is reset after the maximum number
     of failed attempts. Also set the 'MaximumFailedAttempts' key for this to take
     effect.
@@ -117,6 +128,7 @@ payloadkeys:
   title: Maximum Grace Period
   type: <integer>
   presence: optional
+  combinetype: number-min
   content: The maximum period that a user can select, during which the user can unlock
     the device without a passcode. A value of '0' means no grace period, and the device
     requires a passcode immediately. In the absence of this key, the user can select
@@ -128,6 +140,7 @@ payloadkeys:
   range:
     min: 0
     max: 15
+  combinetype: number-min
   content: The maximum period that a user can select, during which the device can
     be idle before the system automatically locks it. When the device reaches this
     limit, the device locks and the user must enter the passcode to unlock it. In
@@ -145,6 +158,7 @@ payloadkeys:
   range:
     min: 0
     max: 730
+  combinetype: number-min
   content: Specifies the maximum number of days that the passcode can remain unchanged.
     After this number of days, the system forces the user to change the passcode before
     it unlocks the device.
@@ -155,6 +169,7 @@ payloadkeys:
   range:
     min: 1
     max: 50
+  combinetype: number-min
   content: The number of historical passcode entries the system checks when validating
     a new passcode. The device refuses a new passcode if it matches a previously used
     passcode within the specified passcode history range. In the absence of this key,
@@ -171,6 +186,7 @@ payloadkeys:
   type: <boolean>
   presence: optional
   default: false
+  combinetype: boolean-or
   content: If 'true', the system forces a password reset the next time the user tries
     to authenticate. If you set this key in a configuration in the system scope (device
     channel), the setting takes effect for all users, and admin authentication may