Merge pull request #363 from Micke-K/Development

3.10.1 Release

.gitignore

@@ -4,4 +4,9 @@
 /*.Log
 /*.Lo_
 /*.csv
-
+/*.zip
+/*.new
+/*.old
+/Extensions/*.zip
+.gitignore
+CloudAPIPowerShellManagement.log

ADMXImport.md

@@ -12,7 +12,7 @@ Microsoft links:
 
 ## ADMX Import
 
-The **ADMX Import** tool is used for configuring 3rd party applications e.g. Chrome, Google Update etc., These ADMX files are available from the software vendor. An ADMX can be loaded in the tool and all settings can be configured using a similar UI as GPMC. When the ADMX is loaded, the script will look for an ADML file that is either in the same directory or in the en-US subdirectory. An ADML file can also be loaded manually, if another language should be used in the UI.
+The **ADMX Import** tool is used for configuring 3rd party applications e.g. Chrome, Google Update etc. These ADMX files are available from the software vendor. An ADMX can be loaded in the tool and all settings can be configured using a similar UI as GPMC. When the ADMX is loaded, the script will look for an ADML file that is either in the same directory or in the en-US subdirectory. An ADML file can also be loaded manually, if another language should be used in the UI.
 
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXExample.png" height="50%" width="50%"/>
 
@@ -24,11 +24,11 @@ A policy setting can either be edited via double-clicking an item or right-click
 
 The *Intune OMA-URI name* property specifies the name of the OMA-URI row in the Custom Profile. This is optional and if it is not specified, the script will use the name of the policy.
 
-A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictive results. Always use the associated ADML for correctly generated controls.
+A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictable results. Always use the associated ADML for correctly generated controls.
 
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExampleOMAURI.png" height="50%" width="50%"/>
 
-The *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configure in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
+The *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configured in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
 
 The *XML Definition* tab contains the XML node for the ADMX policy. This is used for reference in case manual configuration is required.
 
@@ -211,4 +211,4 @@ The following events can be used for troubleshooting:
 * Values outside Software\Policies will **NOT** be deleted when the policy is removed.
 * The tool supports all ADMX attributes specified in the schema but it looks like some functionalities are not supported by Windows or the Policy CSP e.g. the *soft* attribute should be set to true to avoid overwriting an existing value but all values were overwritten during the tests, even if the soft attribute was set. 
 * QWORD is not supported. The ADMX schema definition includes longDecimal which would create QWORD values but this is not supported in the Policy CSP. It will generate a Catastrophic Failure event in the Event Log. 
-* No support for enabledList/disabledList. This might be added in the future since this could make it very easy to create mapped drives via ADMX ingestion. 
+* No support for enabledList/disabledList. This might be added in the future since this could make it very easy to create mapped drives via ADMX ingestion. 

CloudAPIPowerShellManagement.psd1

@@ -12,7 +12,7 @@
 RootModule = 'CloudAPIPowerShellManagement.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.9.6'
+ModuleVersion = '3.10.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

CloudAPIPowerShellManagement.psm1

@@ -85,7 +85,12 @@ function Initialize-CloudAPIManagement
         [string]
         $secret,
         [string]
-        $certificate
+        $certificate,
+        [string]
+        $GraphEnvironment,
+        [string]
+        $GCCType
+
     )
 
     $PSModuleAutoloadingPreference = "none"
@@ -102,9 +107,47 @@ function Initialize-CloudAPIManagement
 
     if($tenantId)
     {
+        Write-Host "Using Tenant Id: $tenantId"
         $global:AzureAppId = $appId 
         $global:ClientSecret = $secret 
         $global:ClientCert = $certificate
+        $global:UseGraphEnvironment = $GraphEnvironment
+        $global:UseGCCType = $GCCType
+
+        if($global:AzureAppId)
+        {
+            Write-Host "Using Azure App Id: $($global:AzureAppId)"
+        }
+        else
+        {
+            Write-Warning "Azure App Id is missing. Use -AppId <AppID> on the command line"
+        }
+
+        if($global:ClientSecret -or $global:ClientCert)
+        {
+            if($global:ClientSecret)
+            {
+                Write-Host "Using Azure App Secret"
+            }
+            else
+            {
+                Write-Host "Using Azure App Certificate"
+            }            
+        }
+        else
+        {
+            Write-Warning "Azure App Secret or Certificate is missing. Use -Secret <Secret> or -Certificate <Certificate> on the command line"
+        }
+
+        if($global:UseGraphEnvironment)
+        {
+            Write-Host "Using Azure Graph Environment: $($global:UseGraphEnvironment)"
+        }
+
+        if($global:UseGCCType)
+        {
+            Write-Host "Using Graph Environment type: $($global:UseGCCType)"
+        }
     }
 
     if($global:hideUI -ne $true)

Core.psm1

@@ -86,9 +86,13 @@ function Start-CoreApp
     Write-Log "#####################################################################################"
 
     Write-Log "PowerShell version: $($PSVersionTable.PSVersion.ToString())"
-    Write-Log "PowerShell build: $($PSVersionTable.BuildVersion.ToString())"
+    if($PSVersionTable.BuildVersion) {
-    Write-Log "PowerShell CLR: $($PSVersionTable.CLRVersion.ToString())"
+        Write-Log "PowerShell build: $($PSVersionTable.BuildVersion.ToString())"
-    Write-Log "PowerShell edition: $($PSVersionTable.PSEdition)"
+    }
+    if($PSVersionTable.CLRVersion) {
+        Write-Log "PowerShell CLR: $($PSVersionTable.CLRVersion.ToString())"
+    }
+        Write-Log "PowerShell edition: $($PSVersionTable.PSEdition)"
 
     try
     {
@@ -344,6 +348,14 @@ function Write-LogError
     }
 
     Write-Log $Text 3
+
+    if((Get-SettingValue "ShowStackTrace") -eq $true)
+    {
+        Write-Log "Stack trace:`n $($Exception.StackTrace)"
+
+        Write-Log "Script stack trace:`n $($Exception.ScriptStackTrace)"
+
+    }
 }
 
 function Write-Status
@@ -1069,7 +1081,7 @@ function Get-Folder
         {
             if($global:WindowsAPICodePackLoaded -eq $false)
             {
-                $apiCodec = Join-Path $global:AppRootFolder "Microsoft.WindowsAPICodePack.Shell.dll"
+                $apiCodec = Join-Path $global:AppRootFolder "Bin\Microsoft.WindowsAPICodePack.Shell.dll"
                 if([IO.File]::Exists($apiCodec))
                 {
                     Add-Type -Path $apiCodec | Out-Null                    
@@ -1988,6 +2000,14 @@ function Add-DefaultSettings
         Type = "Boolean"
         Description = "Write errors to the Error Output of the PS Host. If disabled, errors will be written as a Warning. Eg. disable this if automation should skip logging PowerShell errors."
         DefaultValue = $true
+    }) "General"
+    
+    Add-SettingsObject (New-Object PSObject -Property @{
+        Title = "Show stack error"
+        Key = "ShowStackTrace"
+        Type = "Boolean"
+        Description = "Write exception stack trace info to the log."
+        DefaultValue = $false
     }) "General"    
 
     Add-SettingsObject (New-Object PSObject -Property @{
@@ -2890,6 +2910,19 @@ function Get-DataGridValues
     ($dataGrid.ItemsSource | Select -Property $properties)
 }
 
+function Get-GUIDs
+{
+    param($text)
+
+    $regExpGuid = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+    
+    $uniqueGuids = New-Object System.Collections.Generic.HashSet[String]
+    
+    # Use regular expressions to extract the GUIDs
+    [regex]::Matches($text, $regExpGuid) | ForEach-Object { $uniqueGuids.Add($_.Value) | Out-Null }
+        
+    $uniqueGuids
+}
 
 New-Alias -Name ?? -value Invoke-Coalesce
 New-Alias -Name ?: -value Invoke-IfTrue

Documentation.md

@@ -2,7 +2,7 @@
 
 The script can document most of the profiles and policies in Intune. The output can either be CSV or Word. Documenting to Word can either be to an existing Word template or empty document. There are many options for the documentation e.g. Language, Header styles, Table styles, managing not configured items etc.  
 
-The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible. Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order that the portal.
+The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible. Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order than the portal.
 
 The objects can be documented in three ways:
 
@@ -28,7 +28,7 @@ Please read the [Deep Dive](#deep-dive) section below for a detailed description
 
 The script can document the objects in any language supported by Intune. 
 
-Note that some profiles and properties does not have language support. These will be documented in English.
+Note that some profiles and properties do not have language support. These will be documented in English.
 
 **Known Issues**
 
@@ -36,7 +36,7 @@ This is the first version of the documentation support.
 
 * There are over 100 different object types. Not all are supported and not all supported object types are tested and verified. 
 
-* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider
+* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider.
 
 * Some complex type properties are not translated in this version e.g. the screen layout of apps on the iPhone. 
 
@@ -52,7 +52,7 @@ This is the first version of the documentation support.
 
 * Some Endpoint Security polices are NOT deviceManagementIntent objects. They are actually Settings Catalog objects and they will be listed with the Settings Catalog items e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies
 
-* Some Endpoint Security/Settings Catalog items is not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
+* Some Endpoint Security/Settings Catalog items are not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
 
 * Markdown is currently in experimental state. The script can document to an MD file created in the Documents folder but this can be to large in environments with many objects. The script will create HTML tables to support code blocks and column span. The MD View must support HTML tables to display the document. The *Markdown Viewer* extension in Chrome was used during testing.
 
@@ -93,7 +93,7 @@ Property based objects are very complex to document. These objects can be docume
 * PowerShell function
 * Or a combination of PowerShell and manually created json files 
 
-Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # is manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
+Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # are manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
 
 The generated files sometimes requires additional manually created properties. These could be properties in the UI that has a Yes/No, Enabled/Not Configured etc. trigger associated with a specific value. These properties must be manually added to the object before the documentation. The `DocumentationCustom.psm1` file takes care of this. This file is also used for overriding the documentation of specific values and other custom required processing.    
 
@@ -103,7 +103,7 @@ The `DocumentationCustom.psm1` file also takes care of custom documentation for
 
 **Language Support**
 
-The Settings based objects get their language strings from Graph APIs with a few exemptions.
+The Settings based objects get their language strings from Graph APIs with a few exceptions.
 
 The property based objects uses static language files. Each language file is generated based on multiple language files. Not all the language information is included in these files to reduce the output size. This could reduce the possibility to create custom documentation with multi language support.
 
@@ -111,7 +111,7 @@ These files will have to be re-generated when new functionality is released in I
 
 **Scripts for Generated Files**
 
-The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
+The scripts that automatically generate language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
 
 ## Extending The Documentation
 
@@ -132,9 +132,9 @@ The priority order for object documentation is:
 
 **Documentation Provider**
 
-The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1` file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
+The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1` file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via PowerShell functions.
 
-Documentation providers has a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
+Documentation providers have a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 
 **Documentation Output Provider**
 

Documentation/AppTypes.json

@@ -1,4 +1,4 @@
-[
+[
     {
         "AppType":  "AndroidLobApp",
         "ODataType":  "#microsoft.graph.androidLobApp",
@@ -29,6 +29,18 @@
         "Condition":  null,
         "LanguageId":  "iosVppApp"
     },
+    {
+        "AppType":  "WinGetPublicApp",
+        "ODataType":  "#microsoft.graph.winGetApp",
+        "Condition":  null,
+        "LanguageId":  "winGetPublicApp"
+    },
+    {
+        "AppType":  "WinGetStoreApp",
+        "ODataType":  "#microsoft.graph.winGetApp",
+        "Condition":  null,
+        "LanguageId":  "winGetStoreApp"
+    },
     {
         "AppType":  "MacOSLobApp",
         "ODataType":  "#microsoft.graph.macOSLobApp",
@@ -42,10 +54,22 @@
         "LanguageId":  "macOSEdgeApp"
     },
     {
-        "AppType":  "MacOSMdatpApp",
+        "AppType":  "MacOSMicrosoftDefenderApp",
-        "ODataType":  "#microsoft.graph.macOSMdatpApp",
+        "ODataType":  "#microsoft.graph.macOSMicrosoftDefenderApp",
         "Condition":  null,
-        "LanguageId":  "macOSMdatpApp"
+        "LanguageId":  "macOSMicrosoftDefenderApp"
+    },
+    {
+        "AppType":  "MacOSDmgApp",
+        "ODataType":  "#microsoft.graph.macOSDmgApp",
+        "Condition":  null,
+        "LanguageId":  "macOSDmgApp"
+    },
+    {
+        "AppType":  "MacOSPkgApp",
+        "ODataType":  "#microsoft.graph.macOSPkgApp",
+        "Condition":  null,
+        "LanguageId":  "macOSPkgApp"
     },
     {
         "AppType":  "MacOsVppApp",
@@ -53,6 +77,12 @@
         "Condition":  null,
         "LanguageId":  "macOsVppApp"
     },
+    {
+        "AppType":  "MacOSWebClip",
+        "ODataType":  "#microsoft.graph.macOSWebClip",
+        "Condition":  null,
+        "LanguageId":  "macOSWebClip"
+    },
     {
         "AppType":  "ManagedAndroidLobApp",
         "ODataType":  "#microsoft.graph.managedAndroidLobApp",
@@ -197,6 +227,24 @@
                       },
         "LanguageId":  "builtInIos"
     },
+    {
+        "AppType":  "IosIPadOSWebClip",
+        "ODataType":  "#microsoft.graph.iOSiPadOSWebClip",
+        "Condition":  null,
+        "LanguageId":  "iosIPadOSWebClip"
+    },
+    {
+        "AppType":  "WindowsWebApp",
+        "ODataType":  "#microsoft.graph.windowsWebApp",
+        "Condition":  null,
+        "LanguageId":  "windowsWebApp"
+    },
+    {
+        "AppType":  "Win32CatalogApp",
+        "ODataType":  "#microsoft.graph.win32CatalogApp",
+        "Condition":  null,
+        "LanguageId":  "win32CatalogApp"
+    },
     {
         "AppType":  "WindowsUniversalAppXLobApp",
         "ODataType":  "#microsoft.graph.windowsUniversalAppX",

Documentation/CategoryId.json

@@ -1,4 +1,4 @@
-{
+{
     "0":  "AirPlay",
     "1":  "AirPrint",
     "2":  "AndroidDeviceOwnerApplications",
@@ -151,5 +151,6 @@
     "149":  "WiredNetwork",
     "150":  "DefenderAntivirus",
     "151":  "CustomCompliance",
-    "152":  "IosDefenderAtp"
+    "152":  "IosDefenderAtp",
+    "153":  "WSLCompliance"
 }

Documentation/ObjectCategories.json

@@ -1,4 +1,4 @@
-[
+[
     {
         "ObjectType":  "#microsoft.graph.androidCustomConfiguration",
         "PolicyType":  "AndroidCustom",
@@ -314,6 +314,15 @@
 
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.androidWorkProfileMigrationConfiguration",
+        "PolicyType":  "AndroidForWorkMigrationPolicy",
+        "PolicyTypeLanguageId":  "androidForWorkMigrationPolicy",
+        "PlatformLanguageId":  "AndroidForWork",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.androidForWorkVpnConfiguration",
         "PolicyType":  "AndroidForWorkVpn",
@@ -470,7 +479,7 @@
                        ]
     },
     {
-        "ObjectType":  "#microsoft.graph.hardwareConfiguration",
+        "ObjectType":  "#microsoft.graph.hardwareConfigurations",
         "PolicyType":  "HardwareConfigurations",
         "PolicyTypeLanguageId":  "hardwareConfigurations",
         "PlatformLanguageId":  "Windows10",
@@ -1394,5 +1403,14 @@
         "Categories":  [
 
                        ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.inventoryCatalog",
+        "PolicyType":  "InventoryCatalog",
+        "PolicyTypeLanguageId":  null,
+        "PlatformLanguageId":  null,
+        "Categories":  [
+
+                       ]
     }
 ]

Documentation/ObjectInfo/#AppConfigOutlookDevice.json

@@ -11,7 +11,7 @@
         "entityKey":  "configureEmail",
         "dataType":  0,
         "booleanActions":  109,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "Inputs.authenticationType",
@@ -19,7 +19,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountType",
         "dataType":  16,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "Inputs.basicAuth",
@@ -37,7 +37,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailUPN",
         "dataType":  16,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -58,7 +58,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountDomain",
         "dataType":  20,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -74,7 +74,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAddress",
         "dataType":  16,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -92,7 +92,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.ServerHostName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -108,7 +108,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAccountName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -124,7 +124,7 @@
         "entityKey":  "IntuneMAMAllowedAccountsOnly",
         "dataType":  16,
         "booleanActions":  0,
-        "category": "TableHeaders.settings",
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -143,7 +143,7 @@
                 "value":  "Disabled"
             }
         ]
-    },    
+    },
 
 
     {
@@ -158,7 +158,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
@@ -166,25 +166,28 @@
         "entityKey":  "com.microsoft.outlook.Auth.Biometric",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle",
-    },
+        "ChildSettings": [
-    {
+            {
-        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
-        "descriptionResourceKey":  "",
+                "descriptionResourceKey":  "",
-        "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
+                "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
-        "dataType":  0,
+                "dataType":  0,
-        "booleanActions":  109,
+                "booleanActions":  109,
-        "unconfiguredValue": true,
+                "allowMissing": true,
-        "allowMissing": true,
+                "unconfiguredValue": true,
-        "category": "TableHeaders.settings",
+                "alwaysAddValue": true,
-        "Condition": {
+                "category": "SettingDetails.configurationSettingsTitle",
-            "Expressions": [
+                "Condition": {
-                {
+                    "Expressions": [
-                    "property": "com.microsoft.outlook.Auth.Biometric",
+                        {
-                    "value": "true"
+                            "property": "com.microsoft.outlook.Auth.Biometric",
+                            "value": "true"
+                        }
+                    ]
                 }
-            ]
+            }
-        }        
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowSaveContactsTitle",
@@ -192,25 +195,28 @@
         "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle",
-    },
+        "ChildSettings": [
-    {
+            {
-        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
-        "descriptionResourceKey":  "",
+                "descriptionResourceKey":  "",
-        "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
+                "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
-        "dataType":  0,
+                "dataType":  0,
-        "booleanActions":  109,
+                "booleanActions":  109,
-        "unconfiguredValue": true,
+                "allowMissing": true,
-        "allowMissing": true,
+                "unconfiguredValue": true,
-        "category": "TableHeaders.settings",
+                "alwaysAddValue": true,
-        "Condition": {
+                "category": "SettingDetails.configurationSettingsTitle",
-            "Expressions": [
+                "Condition": {
-                {
+                    "Expressions": [
-                    "property": "com.microsoft.outlook.Contacts.LocalSyncEnabled",
+                        {
-                    "value": "true"
+                            "property": "com.microsoft.outlook.Contacts.LocalSyncEnabled",
+                            "value": "true"
+                        }
+                    ]
                 }
-            ]
+            }
-        }        
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.discoverFeedTitle",
@@ -218,7 +224,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"        
+        "category": "SettingDetails.configurationSettingsTitle"        
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
@@ -226,25 +232,28 @@
         "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle",
-    },
+        "ChildSettings": [
-    {
+            {
-        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
-        "descriptionResourceKey":  "",
+                "descriptionResourceKey":  "",
-        "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
+                "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
-        "dataType":  0,
+                "dataType":  0,
-        "booleanActions":  109,
+                "booleanActions":  109,                
-        "category": "TableHeaders.settings",
+                "allowMissing": true,
-        "unconfiguredValue": true,
+                "unconfiguredValue": true,
-        "allowMissing": true,
+                "alwaysAddValue": true,
-        "Condition": {
+                "category": "SettingDetails.configurationSettingsTitle",
-            "Expressions": [
+                "Condition": {
-                {
+                    "Expressions": [
-                    "property": "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
+                        {
-                    "value": "true"
+                            "property": "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
+                            "value": "true"
+                        }
+                    ]
                 }
-            ]
+            }
-        }        
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowExternalRecipientsMailTipTitle",
@@ -252,7 +261,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
@@ -260,7 +269,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
@@ -268,25 +277,28 @@
         "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle",
-    },
+        "ChildSettings": [
-    {
+            {
-        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
-        "descriptionResourceKey":  "",
+                "descriptionResourceKey":  "",
-        "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
+                "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
-        "dataType":  0,
+                "dataType":  0,
-        "booleanActions":  109,
+                "booleanActions":  109,
-        "unconfiguredValue": true,
+                "allowMissing": true,
-        "allowMissing": true,
+                "unconfiguredValue": true,
-        "category": "TableHeaders.settings",
+                "alwaysAddValue": true,
-        "Condition": {
+                "category": "SettingDetails.configurationSettingsTitle",
-            "Expressions": [
+                "Condition": {
-                {
+                    "Expressions": [
-                    "property": "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
+                        {
-                    "value": "true"
+                            "property": "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
+                            "value": "true"
+                        }
+                    ]
                 }
-            ]
+            }
-        }        
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.OrganizeMailByThread.title",
@@ -294,7 +306,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
@@ -302,7 +314,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.themesEnabledTitle",
@@ -310,7 +322,7 @@
         "entityKey":  "com.microsoft.outlook.Settings.ThemesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
@@ -318,24 +330,114 @@
         "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": "TableHeaders.settings"
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
+                "Condition": {
+                    "Expressions": [
+                        {
+                            "property": "com.microsoft.outlook.Mail.TextPredictionsEnabled",
+                            "value": "true"
+                        }
+                    ]
+                }            
+            }
+        ]
+    },
+
+
+    {
+        "nameResourceKey":  "Inputs.outlookSMimeSettings",
+        "descriptionResourceKey":  "",
+        "dataType":  8,
+        "booleanActions":  0
     },
     {
-        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+        "nameResourceKey":  "OutlookAppConfig.enableSMIMETitle",
         "descriptionResourceKey":  "",
-        "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled",
         "dataType":  0,
         "booleanActions":  109,
-        "unconfiguredValue": true,
+        "category": "SettingDetails.requireSMIME",
-        "allowMissing": true,
+        "ChildSettings": [
-        "category": "TableHeaders.settings",
+            {
-        "Condition": {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
-            "Expressions": [
+                "descriptionResourceKey":  "",
-                {
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.UserChangeAllowed",
-                    "property": "com.microsoft.outlook.Mail.TextPredictionsEnabled",
+                "dataType":  0,
-                    "value": "true"
+                "booleanActions":  109,
-                }
+                "allowMissing": true,
-            ]
+                "unconfiguredValue": true,
-        }        
+                "alwaysAddValue": true,
-    }    
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.encryptAllEmails",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.EncryptAllMail",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.EncryptAllMail.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.signAllEmails",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.SignAllMail",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.SignAllMail.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "Inputs.ldapUrl",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.LDAPHostName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.requireSMIME"
+    },
+    {
+        "nameResourceKey":  "Inputs.deploySMimeCertsFromIntune",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.CertsFromIntune",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME"
+    }
 ]

Documentation/ObjectInfo/#microsoft.graph.deviceCustomAttributeShellScript.json

@@ -0,0 +1,43 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.configurationType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsManagement.customAttributeObjectName",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000
+    },
+    {
+        "nameResourceKey":  "WindowsManagement.CustomAttributes.customAttributeTypeLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "customAttributeType",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsManagement.scriptsettingsTabHeader",
+        "options":  [
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.dateTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "date"
+            },
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.stringTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "string"
+            },
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.integerTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "integer"
+            }
+        ]        
+    },    
+    {
+        "nameResourceKey":  "WindowsManagement.customAttributeObjectName",
+        "descriptionResourceKey":  "",
+        "entityKey":  "fileName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    }
+]    

Documentation/ObjectInfo/#microsoft.graph.hardwareConfiguration.json

@@ -0,0 +1,34 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.configurationType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "PolicyType.hardwareConfigurations",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.hardware",
+        "descriptionResourceKey":  "",
+        "entityKey":  "vendor",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.configurations"
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.perDevicePassword",
+        "descriptionResourceKey":  "",
+        "entityKey":  "perDevicePasswordDisabled",
+        "dataType":  109,
+        "booleanActions":  9,
+        "category": "SettingDetails.configurations"
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.file",
+        "descriptionResourceKey":  "",
+        "entityKey":  "fileName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.configurations"
+    }
+]

Documentation/ObjectInfo/#microsoft.graph.windows10EnrollmentCompletionPageConfiguration.json

@@ -11,92 +11,126 @@
         "nameResourceKey":  "EnrollmentStatusScreen.progressToggle",
         "descriptionResourceKey":  "",
         "entityKey":  "showInstallationProgress",
-        "dataType":  0,
-        "booleanActions":  109,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.timeout",
-        "descriptionResourceKey":  "",
-        "entityKey":  "installProgressTimeoutInMinutes",
-        "dataType":  14,
-        "booleanActions":  0,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
-        "descriptionResourceKey":  "",
-        "entityKey":  "showCustomErrorMessage",
-        "dataType":  0,
-        "booleanActions":  109,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.customMessageTextBox",
-        "descriptionResourceKey":  "",
-        "entityKey":  "customErrorMessage",
-        "dataType":  20,
-        "booleanActions":  0,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
-        "descriptionResourceKey":  "",
-        "entityKey":  "allowLogCollectionOnInstallFailure",
-        "dataType":  0,
-        "booleanActions":  109,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
-        "descriptionResourceKey":  "",
-        "entityKey":  "trackInstallProgressForAutopilotOnly",
-        "dataType":  0,
-        "booleanActions":  109,
-        "category":  "TableHeaders.settings"
-    },
-    {
-        "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
-        "descriptionResourceKey":  "",
-        "entityKey":  "blockDeviceSetupRetryByUser",
         "dataType":  16,
-        "booleanActions":  0,
+        "booleanActions":  109,
         "category":  "TableHeaders.settings",
         "options":  [                                
             {
                 "nameResourceKey":  "SettingDetails.no",
-                "value":  "true"
+                "value":  "false"
             },
             {
                 "nameResourceKey":  "BooleanActions.yes",
-                "value":  "false",
+                "value":  "true",
                 "Children": [
                     {
-                        "nameResourceKey":  "EnrollmentStatusScreen.resetToggle",
+                        "nameResourceKey":  "EnrollmentStatusScreen.timeout",
                         "descriptionResourceKey":  "",
-                        "entityKey":  "allowDeviceResetOnInstallFailure",
+                        "entityKey":  "InstallProgressTimeout",
-                        "dataType":  0,
-                        "booleanActions":  109,
-                        "category":  "TableHeaders.settings"
-                    },
-                    {
-                        "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
-                        "descriptionResourceKey":  "",
-                        "entityKey":  "allowDeviceUseOnInstallFailure",
-                        "dataType":  0,
-                        "booleanActions":  109,
-                        "category":  "TableHeaders.settings"
-                    },
-                    {
-                        "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
-                        "descriptionResourceKey":  "",
-                        "entityKey":  "waitForApps",
                         "dataType":  14,
                         "booleanActions":  0,
                         "category":  "TableHeaders.settings"
+                    },
+                    {
+                        "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "showCustomErrorMessage",
+                        "dataType":  16,
+                        "booleanActions":  109,
+                        "category":  "TableHeaders.settings",
+                        "options":  [                                
+                            {
+                                "nameResourceKey":  "SettingDetails.no",
+                                "value":  "false"
+                            },
+                            {
+                                "nameResourceKey":  "BooleanActions.yes",
+                                "value":  "true",
+                                "Children": [
+                                    {
+                                        "nameResourceKey":  "EnrollmentStatusScreen.customMessageTextBox",
+                                        "descriptionResourceKey":  "",
+                                        "entityKey":  "customErrorMessage",
+                                        "dataType":  20,
+                                        "booleanActions":  0,
+                                        "category":  "TableHeaders.settings"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "allowLogCollectionOnInstallFailure",
+                        "dataType":  0,
+                        "booleanActions":  109,
+                        "category":  "TableHeaders.settings"
+                    },
+                    {
+                        "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "trackInstallProgressForAutopilotOnly",
+                        "dataType":  0,
+                        "booleanActions":  109,
+                        "category":  "TableHeaders.settings"
+                    },
+                    {
+                        "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "blockDeviceSetupRetryByUser",
+                        "dataType":  16,
+                        "booleanActions":  0,
+                        "category":  "TableHeaders.settings",
+                        "options":  [                                
+                            {
+                                "nameResourceKey":  "SettingDetails.no",
+                                "value":  "true"
+                            },
+                            {
+                                "nameResourceKey":  "BooleanActions.yes",
+                                "value":  "false",
+                                "Children": [
+                                    {
+                                        "nameResourceKey":  "EnrollmentStatusScreen.resetToggle",
+                                        "descriptionResourceKey":  "",
+                                        "entityKey":  "allowDeviceResetOnInstallFailure",
+                                        "dataType":  0,
+                                        "booleanActions":  109,
+                                        "category":  "TableHeaders.settings"
+                                    },
+                                    {
+                                        "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
+                                        "descriptionResourceKey":  "",
+                                        "entityKey":  "allowDeviceUseOnInstallFailure",
+                                        "dataType":  0,
+                                        "booleanActions":  109,
+                                        "category":  "TableHeaders.settings"
+                                    },
+                                    {
+                                        "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
+                                        "descriptionResourceKey":  "",
+                                        "entityKey":  "waitForApps",
+                                        "dataType":  14,
+                                        "booleanActions":  0,
+                                        "category":  "TableHeaders.settings",
+                                        "Children": [
+                                            {
+                                                "nameResourceKey":  "EnrollmentStatusScreen.Apps.allowNonBlockingAppInstallation",
+                                                "descriptionResourceKey":  "",
+                                                "entityKey":  "allowNonBlockingAppInstallation",
+                                                "dataType":  0,
+                                                "booleanActions":  109,
+                                                "category":  "TableHeaders.settings"
+                                            }
+                                        ] 
+                                    }
+                                ]
+                            }
+                        ]        
                     }
                 ]
             }
-        ]        
+        ]
     }
 ]

Documentation/ObjectInfo/#microsoft.graph.windowsFeatureUpdateProfile.json

@@ -15,6 +15,34 @@
         "booleanActions":  0,
         "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
     },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.OptionalUpdate.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installFeatureUpdatesOptional",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+        "options":  [
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.required",
+                "descriptionResourceKey":  "",
+                "value":  false
+            },
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.optional",
+                "descriptionResourceKey":  "",
+                "value":  true
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.Windows11SideBySideInstall.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installLatestWindows10OnWindows11IneligibleDevice",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
+    },
     {
         "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.RolloutOptions.label",
         "descriptionResourceKey":  "",

Documentation/ObjectInfo/airprint_iosdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "airprint_iosdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/airprint_macdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "airprint_macdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/androiddefenderatp_complianceandroid.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddefenderatp_complianceandroid":  {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,

Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddefenderatp_complianceandroiddeviceowner":  {
                                                             "isSettingDescription":  false,
                                                             "showAsSectionHeader":  false,

Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddefenderatp_complianceandroidforwork":  {
                                                         "isSettingDescription":  false,
                                                         "showAsSectionHeader":  false,

Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddeviceownerapplications_androiddeviceownergeneral":  [
                                                                      {
                                                                          "isSettingDescription":  false,
@@ -85,32 +85,48 @@
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
-                                                                                                   "dataType":  0,
+                                                                                                   "dataType":  16,
                                                                                                    "category":  2,
                                                                                                    "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                    "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
                                                                                                    "childSettings":  [
-                                                                                                                         {
-                                                                                                                             "dataType":  10,
-                                                                                                                             "category":  2,
-                                                                                                                             "nameResourceKey":  "publicPlayStoreEnabledWarning",
-                                                                                                                             "childSettings":  [
 
-                                                                                                                                               ],
+                                                                                                                     ],
-                                                                                                                             "options":  [
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionNotConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionAllowList",
+                                                                                                                       "value":  "allowList",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionBlockList",
+                                                                                                                       "value":  "blockList",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "playStoreMode",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  10,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "publicPlayStoreEnabledWarning",
+                                                                                                   "childSettings":  [
 
-                                                                                                                                         ],
-                                                                                                                             "booleanActions":  0,
-                                                                                                                             "policyType":  2,
-                                                                                                                             "enabled":  true
-                                                                                                                         }
                                                                                                                      ],
                                                                                                    "options":  [
 
                                                                                                                ],
-                                                                                                   "entityKey":  "publicPlayStoreEnabled",
                                                                                                    "booleanActions":  0,
-                                                                                                   "defaultValue":  false,
                                                                                                    "policyType":  2,
                                                                                                    "enabled":  true
                                                                                                },

Documentation/ObjectInfo/androiddeviceownerpolicymessages_androiddeviceownergeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddeviceownerpolicymessages_androiddeviceownergeneral":  {
                                                                        "isSettingDescription":  false,
                                                                        "showAsSectionHeader":  true,

Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationguard_windows10endpointprotection":  [
                                                          {
                                                              "dataType":  10,

Documentation/ObjectInfo/applicationrestrictions_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationrestrictions_androidgeneral":  {
                                                    "dataType":  16,
                                                    "category":  5,

Documentation/ObjectInfo/applicationrestrictions_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationrestrictions_iosgeneral":  [
                                                {
                                                    "isSettingDescription":  false,

Documentation/ObjectInfo/applicationrestrictions_macgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationrestrictions_macgeneral":  {
                                                "isSettingDescription":  false,
                                                "showAsSectionHeader":  true,

Documentation/ObjectInfo/applicationrestrictions_windowsphonegeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationrestrictions_windowsphonegeneral":  {
                                                         "dataType":  16,
                                                         "category":  5,

Documentation/ObjectInfo/applications_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "applications_windows10general":  [
                                           {
                                               "dataType":  0,

Documentation/ObjectInfo/applications_windowsphonegeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applications_windowsphonegeneral":  {
                                              "dataType":  0,
                                              "category":  7,

Documentation/ObjectInfo/applicationsandgames_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationsandgames_iosgeneral":  [
                                             {
                                                 "isSettingDescription":  false,

Documentation/ObjectInfo/applicationsandgames_macgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationsandgames_macgeneral":  {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,

Documentation/ObjectInfo/applicationsandgoogle_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationsandgoogle_androidgeneral":  {
                                                  "dataType":  0,
                                                  "category":  9,

Documentation/ObjectInfo/applicationvisibility_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "applicationvisibility_iosgeneral":  [
                                              {
                                                  "isSettingDescription":  false,

Documentation/ObjectInfo/appmanagement_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "appmanagement_androidgeneral":  [
                                          {
                                              "isSettingDescription":  false,

Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "appsandexperience_windows10teamgeneral":  [
                                                    {
                                                        "dataType":  0,

Documentation/ObjectInfo/associateddomains_macdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "associateddomains_macdevicefeatures":  [
                                                 {
                                                     "isSettingDescription":  false,

Documentation/ObjectInfo/autonomoussingleappmode_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "autonomoussingleappmode_iosgeneral":  [
                                                {
                                                    "isSettingDescription":  false,

Documentation/ObjectInfo/azureoperationalinsights_windows10teamgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "azureoperationalinsights_windows10teamgeneral":  {
                                                           "dataType":  0,
                                                           "category":  14,

Documentation/ObjectInfo/bitlocker_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "bitlocker_windows10endpointprotection":  [
                                                   {
                                                       "isSettingDescription":  false,

Documentation/ObjectInfo/bootoptions_windows10devicefirmwareconfigurationinterface.json

@@ -1,4 +1,4 @@
-{
+{
     "bootoptions_windows10devicefirmwareconfigurationinterface":  [
                                                                       {
                                                                           "dataType":  16,

Documentation/ObjectInfo/browser_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "browser_androidgeneral":  {
                                    "dataType":  0,
                                    "category":  17,

Documentation/ObjectInfo/browser_windows8general.json

@@ -1,4 +1,4 @@
-{
+{
     "browser_windows8general":  [
                                     {
                                         "dataType":  0,

Documentation/ObjectInfo/browser_windowsphonegeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "browser_windowsphonegeneral":  {
                                         "dataType":  0,
                                         "category":  17,

Documentation/ObjectInfo/builtinapps_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "builtinapps_iosgeneral":  [
                                    {
                                        "isSettingDescription":  false,

Documentation/ObjectInfo/builtinapps_macgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "builtinapps_macgeneral":  {
                                    "isSettingDescription":  false,
                                    "showAsSectionHeader":  true,

Documentation/ObjectInfo/cameras_windows10devicefirmwareconfigurationinterface.json

@@ -1,4 +1,4 @@
-{
+{
     "cameras_windows10devicefirmwareconfigurationinterface":  [
                                                                   {
                                                                       "dataType":  16,

Documentation/ObjectInfo/cellular_windows8general.json

@@ -1,4 +1,4 @@
-{
+{
     "cellular_windows8general":  {
                                      "dataType":  0,
                                      "category":  20,

Documentation/ObjectInfo/cloudandstorage_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudandstorage_androidgeneral":  [
                                            {
                                                "dataType":  0,

Documentation/ObjectInfo/cloudandstorage_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudandstorage_iosgeneral":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/cloudandstorage_macgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudandstorage_macgeneral":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/cloudandstorage_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudandstorage_windows10general":  [
                                              {
                                                  "dataType":  0,

Documentation/ObjectInfo/cloudandstorage_windows8general.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudandstorage_windows8general":  [
                                             {
                                                 "dataType":  20,

Documentation/ObjectInfo/cloudprint_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "cloudprint_windows10general":  [
                                         {
                                             "dataType":  20,

Documentation/ObjectInfo/complianceemailprofile_complianceios.json

@@ -1,4 +1,4 @@
-{
+{
     "complianceemailprofile_complianceios":  {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,

Documentation/ObjectInfo/connecteddevices_iosgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "connecteddevices_iosgeneral":  [
                                         {
                                             "isSettingDescription":  false,

Documentation/ObjectInfo/connecteddevices_macgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "connecteddevices_macgeneral":  {
                                         "isSettingDescription":  false,
                                         "showAsSectionHeader":  true,

Documentation/ObjectInfo/connectivity_androidgeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "connectivity_androidgeneral":  [
                                         {
                                             "dataType":  0,

Documentation/ObjectInfo/connectivity_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "connectivity_windows10general":  [
                                           {
                                               "dataType":  16,

Documentation/ObjectInfo/connectivity_windowsphonegeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "connectivity_windowsphonegeneral":  [
                                              {
                                                  "dataType":  0,

Documentation/ObjectInfo/contentcaching_macdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "contentcaching_macdevicefeatures":  {
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  true,

Documentation/ObjectInfo/controlpanelandsettings_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "controlpanelandsettings_windows10general":  {
                                                      "dataType":  0,
                                                      "category":  26,

Documentation/ObjectInfo/credentialguard_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "credentialguard_windows10endpointprotection":  {
                                                         "dataType":  16,
                                                         "category":  27,

Documentation/ObjectInfo/customcompliance_compliancewindows10.json

@@ -1,14 +1,31 @@
-{
+{
     "customcompliance_compliancewindows10":  {
-                                                 "dataType":  25,
+                                                 "dataType":  0,
                                                  "category":  151,
+                                                 "nameResourceKey":  "AdminConfiguredComplianceSettingName",
+                                                 "descriptionResourceKey":  "CustomComplianceToolTip",
                                                  "childSettings":  [
+                                                                       {
+                                                                           "dataType":  25,
+                                                                           "category":  151,
+                                                                           "childSettings":  [
 
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "customCompliance",
+                                                                           "booleanActions":  0,
+                                                                           "policyType":  35,
+                                                                           "enabled":  true
+                                                                       }
                                                                    ],
                                                  "options":  [
 
                                                              ],
-                                                 "booleanActions":  0,
+                                                 "entityKey":  "customComplianceRequired",
+                                                 "booleanActions":  1,
+                                                 "defaultValue":  false,
                                                  "policyType":  35,
                                                  "enabled":  true
                                              }

Documentation/ObjectInfo/customconfiguration_ioscustom.json

@@ -1,4 +1,4 @@
-{
+{
     "customconfiguration_ioscustom":  [
                                           {
                                               "dataType":  20,

Documentation/ObjectInfo/customconfiguration_maccustom.json

@@ -1,4 +1,4 @@
-{
+{
     "customconfiguration_maccustom":  [
                                           {
                                               "dataType":  20,

Documentation/ObjectInfo/customomasettings_androidcustom.json

@@ -1,4 +1,4 @@
-{
+{
     "customomasettings_androidcustom":  {
                                             "columns":  [
                                                             {

Documentation/ObjectInfo/customomasettings_androidforworkcustom.json

@@ -1,4 +1,4 @@
-{
+{
     "customomasettings_androidforworkcustom":  {
                                                    "columns":  [
                                                                    {

Documentation/ObjectInfo/customomasettings_windows10custom.json

@@ -1,4 +1,4 @@
-{
+{
     "customomasettings_windows10custom":  {
                                               "columns":  [
                                                               {

Documentation/ObjectInfo/customomasettings_windowsphonecustom.json

@@ -1,4 +1,4 @@
-{
+{
     "customomasettings_windowsphonecustom":  {
                                                  "columns":  [
                                                                  {

Documentation/ObjectInfo/custompreferences_maccustompreferences.json

@@ -1,4 +1,4 @@
-{
+{
     "custompreferences_maccustompreferences":  [
                                                    {
                                                        "dataType":  20,

Documentation/ObjectInfo/defender_windows10general.json

@@ -1,4 +1,4 @@
-{
+{
     "defender_windows10general":  [
                                       {
                                           "dataType":  0,

Documentation/ObjectInfo/defenderantivirus_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "defenderantivirus_windows10endpointprotection":  [
                                                           {
                                                               "dataType":  19,

Documentation/ObjectInfo/defenderexploitguard_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "defenderexploitguard_windows10endpointprotection":  [
                                                              {
                                                                  "complexOptions":  [

Documentation/ObjectInfo/defenderfirewall_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "defenderfirewall_windows10endpointprotection":  [
                                                          {
                                                              "isSettingDescription":  false,

Documentation/ObjectInfo/defenderlocalsecurityoptions_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "defenderlocalsecurityoptions_windows10endpointprotection":  [
                                                                      {
                                                                          "complexOptions":  [

Documentation/ObjectInfo/defendersecuritycenter_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "defendersecuritycenter_windows10endpointprotection":  [
                                                                {
                                                                    "isSettingDescription":  false,

Documentation/ObjectInfo/deliveryoptimization_windowsdeliveryoptimization.json

@@ -1,4 +1,4 @@
-{
+{
     "deliveryoptimization_windowsdeliveryoptimization":  [
                                                              {
                                                                  "isSettingDescription":  false,

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration.json

@@ -1,4 +1,4 @@
-{
+{
     "derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration":  [
                                                                                                                            {
                                                                                                                                "dataType":  9,

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration.json

@@ -1,4 +1,4 @@
-{
+{
     "derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration":  [
                                                                                                          {
                                                                                                              "dataType":  9,

Documentation/ObjectInfo/deviceguard_windows10endpointprotection.json

@@ -1,4 +1,4 @@
-{
+{
     "deviceguard_windows10endpointprotection":  [
                                                     {
                                                         "isSettingDescription":  true,

Documentation/ObjectInfo/devicehealth_complianceandroid.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_complianceandroid":  [
                                            {
                                                "dataType":  0,

Documentation/ObjectInfo/devicehealth_complianceandroiddeviceowner.json

@@ -1,5 +1,22 @@
-{
+{
     "devicehealth_complianceandroiddeviceowner":  [
+                                                      {
+                                                          "dataType":  0,
+                                                          "category":  39,
+                                                          "nameResourceKey":  "complianceRootedAllowedName",
+                                                          "descriptionResourceKey":  "complianceRootedAllowedDescription",
+                                                          "childSettings":  [
+
+                                                                            ],
+                                                          "options":  [
+
+                                                                      ],
+                                                          "entityKey":  "securityBlockJailbrokenDevices",
+                                                          "booleanActions":  3,
+                                                          "defaultValue":  false,
+                                                          "policyType":  31,
+                                                          "enabled":  true
+                                                      },
                                                       {
                                                           "dataType":  16,
                                                           "category":  39,

Documentation/ObjectInfo/devicehealth_complianceandroidforwork.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_complianceandroidforwork":  [
                                                   {
                                                       "dataType":  0,

Documentation/ObjectInfo/devicehealth_complianceaospdeviceowner.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_complianceaospdeviceowner":  {
                                                    "dataType":  0,
                                                    "category":  39,

Documentation/ObjectInfo/devicehealth_complianceios.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_complianceios":  [
                                        {
                                            "dataType":  0,

Documentation/ObjectInfo/devicehealth_compliancemac.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_compliancemac":  {
                                        "dataType":  0,
                                        "category":  39,

Documentation/ObjectInfo/devicehealth_compliancewindows10.json

@@ -1,4 +1,4 @@
-{
+{
     "devicehealth_compliancewindows10":  [
                                              {
                                                  "isSettingDescription":  false,

Documentation/ObjectInfo/devicepassword_androiddeviceownergeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "devicepassword_androiddeviceownergeneral":  [
                                                      {
                                                          "isSettingDescription":  false,
@@ -12,7 +12,7 @@
                                                                                    "dataType":  16,
                                                                                    "category":  42,
                                                                                    "nameResourceKey":  "requiredPasswordTypeName",
-                                                                                   "descriptionResourceKey":  "androidEnterpriseRequiredPasswordTypeDescription",
+                                                                                   "descriptionResourceKey":  "androidEnterpriseConfigurationRequiredPasswordTypeDescription",
                                                                                    "emptyValueResourceKey":  "passwordExpirationInDaysEmptyValueKey",
                                                                                    "childSettings":  [