3.9.7

Merge pull request #220 from ee61re/master
various documentation updates
2026-09-28 19:05:38 +02:00 · 2024-06-27 21:00:44 +10:00 · 2024-04-30 07:35:16 +10:00 · 2024-04-28 20:06:56 +01:00 · 2024-04-28 20:04:13 +01:00 · 2024-04-28 20:01:54 +01:00
341 changed files with 76927 additions and 45931 deletions
@@ -4,4 +4,9 @@
 /*.Log
 /*.Lo_
 /*.csv
-
+/*.zip
+/*.new
+/*.old
+/Extensions/*.zip
+.gitignore
+CloudAPIPowerShellManagement.log
@@ -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.

@@ -0,0 +1,42 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using Microsoft.Identity.Client;
+
+public class HttpFactoryWithProxy : IMsalHttpClientFactory
+{
+    private static HttpClient _httpClient;
+
+    public HttpFactoryWithProxy(string proxyURI) : this(proxyURI, null, null)
+    {
+
+    }
+
+    public HttpFactoryWithProxy(string proxyURI, string proxyUserName = null, string proxyPassword = null)
+    {
+        if (_httpClient == null) 
+        {
+            var proxy = new WebProxy
+            {
+                Address = new Uri(proxyURI),
+                BypassProxyOnLocal = false,
+                UseDefaultCredentials = false,
+                Credentials = new NetworkCredential(
+                    userName: proxyUserName,
+                    password: proxyPassword)
+            };
+
+            var httpClientHandler = new HttpClientHandler
+            {
+                Proxy = proxy,
+            };
+
+            _httpClient = new HttpClient(handler: httpClientHandler);
+        }
+    }
+
+    public HttpClient GetHttpClient()
+    {
+        return _httpClient;
+    }
+}
@@ -12,7 +12,7 @@
 RootModule = 'CloudAPIPowerShellManagement.psm1'

 # Version number of this module.
-ModuleVersion = '3.7.3'
+ModuleVersion = '3.9.7'

 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -27,7 +27,7 @@ Author = 'Mikael Karlsson'
 # CompanyName = ''

 # Copyright statement for this module
-Copyright = '(c) 2022 Mikael Karlsson. Software released under MIT License.'
+Copyright = '(c) 2023 Mikael Karlsson. Software released under MIT License.'

 # Description of the functionality provided by this module
 Description = 'Management of Intune and Azure via Cloud APIs like Microsoft Graph API'
@@ -69,7 +69,7 @@ Description = 'Management of Intune and Azure via Cloud APIs like Microsoft Grap
 NestedModules = @()

 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-FunctionsToExport = @("Initialize-CloudAPIManagement","Initialize-CloudAPIManagement")
+FunctionsToExport = @("Initialize-CloudAPIManagement")

 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 # CmdletsToExport = @()
@@ -88,14 +88,25 @@ function Initialize-CloudAPIManagement
        $certificate
    )

+    $PSModuleAutoloadingPreference = "none"
+
    $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"

    [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
    Add-Type -AssemblyName PresentationFramework

+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
    $global:hideUI = ($Silent -eq $true)
    $global:SilentBatchFile = $SilentBatchFile

+    if($tenantId)
+    {
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate
+    }
+
    if($global:hideUI -ne $true)
    {                
        # Run with UI
@@ -126,12 +137,11 @@ function Initialize-CloudAPIManagement
            Write-Error "Tenant Id is missing. Use -TenantId <Tenant-guid> on the command line to run silent batch jobs"
            return
        }
-        $global:TenantId = $tenantId 
-        $global:AzureAppId = $appId 
-        $global:ClientSecret = $secret 
-        $global:ClientCert = $certificate        
    }

+    $global:TenantId = $tenantId
+
+
    if($ShowConsoleWindow -ne $true)
    {
        Hide-Console
@@ -11,7 +11,7 @@ This module handles the WPF UI

 function Get-ModuleVersion
 {
-    '3.7.1'
+    '3.9.6'
 }

 function Initialize-Window
@@ -58,6 +58,7 @@ function Start-CoreApp

    $global:useDefaultFolderDialog = $false
    $global:WindowsAPICodePackLoaded = $false
+    $script:proxyURI = $null

    $global:loadedModules = @()
    $global:viewObjects = @()
@@ -235,6 +236,8 @@ function Write-Log

    if(-not $global:logFileMaxSize) { [Int64]$global:logFileMaxSize =  Get-SettingValue "LogFileSize" 1024; $global:logFileMaxSize = $global:logFileMaxSize * 1kb }

+    if($null -eq $global:logOutputError) { $global:logOutputError = Get-SettingValue "LogOutputError" }
+
    $fi = [IO.FileInfo]$global:logFile

    if($fi.Length -gt $global:logFileMaxSize)
@@ -286,12 +289,19 @@ function Write-Log
    if($type -eq 2)
    {
        Write-Warning $Text
-        $typeStr = "Error"
+        $typeStr = "Warning"
    }
    elseif($type -eq 3)
+    {
+        if($global:logOutputError -ne $false)
        {
            $host.ui.WriteErrorLine($Text)
-        $typeStr = "Warning"
+        }
+        else
+        {
+            Write-Warning $Text
+        }        
+        $typeStr = "Error"
    }
    else
    {
@@ -415,7 +425,7 @@ function Set-XamlProperty

 function Get-XamlProperty
 {
-    param($xamlObj, $controlName, $propertyName, $defaultValue)
+    param($xamlObj, $controlName, $propertyName, $defaultValue = $null)

    $obj = $xamlObj.FindName($controlName)

@@ -423,7 +433,7 @@ function Get-XamlProperty
    {
        if($obj)
        {
-            return (?? $obj."$propertyName" $null)
+            return (?? $obj."$propertyName" $defaultValue)
        }
        else 
        {
@@ -667,8 +677,15 @@ function Show-UpdatesDialog
    {
        if($mystream) { $mystream.Dispose() }
    }
+    $params = @{}
+    $proxyURI = Get-ProxyURI
+    if($proxyURI)
+    {
+        $params.Add("proxy", $proxyURI)
+        $params.Add("UseBasicParsing", $true)
+    }

-    $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/contents/ReleaseNotes.md"
+    $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/contents/ReleaseNotes.md" @params
    if($content)
    {
        $txt = [System.Text.Encoding]::UTF8.GetString(([System.Convert]::FromBase64String($content.content)))
@@ -703,7 +720,15 @@ function Get-IsLatestVersion

    $gitHubVer = $null

-    $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/releases/latest"
+    $params = @{}
+    $proxyURI = Get-ProxyURI
+    if($proxyURI)
+    {
+        $params.Add("proxy", $proxyURI)
+        $params.Add("UseBasicParsing", $true)
+    }
+
+    $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/releases/latest" @params
    if($content.Name)
    {
        try
@@ -715,7 +740,15 @@ function Get-IsLatestVersion

    if($null -eq $gitHubVer)
    {
-        $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/contents/CloudAPIPowerShellManagement.psd1"
+        $params = @{}
+        $proxyURI = Get-ProxyURI
+        if($proxyURI)
+        {
+            $params.Add("proxy", $proxyURI)
+            $params.Add("UseBasicParsing", $true)
+        }
+    
+        $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/contents/CloudAPIPowerShellManagement.psd1" @params
        $gitHubText = [System.Text.Encoding]::UTF8.GetString(([System.Convert]::FromBase64String($content.content)))
        $gitHubInfo = Get-ModuleDataTable $gitHubText
        try
@@ -1150,6 +1183,10 @@ function Expand-FileName
    [Environment]::SetEnvironmentVariable("DateTime",$null,[System.EnvironmentVariableTarget]::Process)
    [Environment]::SetEnvironmentVariable("Organization",$null,[System.EnvironmentVariableTarget]::Process)
    
+    # Remove invalid path characters
+    $re = "[{0}]" -f [RegEx]::Escape(([IO.Path]::GetInvalidPathChars() -join ''))
+    $fileName = $fileName -replace $re
+  
    $fileName
 }

@@ -1168,6 +1205,8 @@ function Initialize-Settings
    $global:Debug = Get-SettingValue "Debug"
    $global:logFile = $null
    $global:logFileMaxSize = $null
+    $global:logOutputError = $null
+    $script:proxyURI = $null
    
    if($Updated -eq $true)
    {
@@ -1496,7 +1535,7 @@ function Add-RegKeyToSettings

    try
    {
-        $keyObj = Get-Item -Path $regKey
+        $keyObj = Get-Item -Path $regKey -ErrorAction SilentlyContinue
        foreach($keyValue in ($keyObj.GetValueNames() | Sort))
        {
            try
@@ -1943,6 +1982,14 @@ function Add-DefaultSettings
            DefaultValue = 1024
    }) "General"

+    Add-SettingsObject (New-Object PSObject -Property @{
+        Title = "Add errors to PowerShell output"
+        Key = "LogOutputError"
+        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 = "Debug"
            Key = "Debug"
@@ -1998,6 +2045,12 @@ function Add-DefaultSettings
        Description = "Adds the organization name next to the login info on the menu bar"
    }) "General" 

+    Add-SettingsObject (New-Object PSObject -Property @{
+        Title = "Proxy URI"
+        Key = "ProxyURI"
+        Description = "Specify the URI for the proxy eg http://&lt;server&gt;:&lt;port&gt;"
+    }) "General"
+
 }

 function Add-SettingsObject
@@ -2410,6 +2463,7 @@ function Get-MainWindow
            
            Add-XamlEvent $script:welcomeForm "gitHubLink" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
            Add-XamlEvent $script:welcomeForm "licenseLink" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
+            Add-XamlEvent $script:welcomeForm "addCustomApp" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
            
            Add-XamlEvent $script:welcomeForm "chkAcceptConditions" "add_click" {
                $global:btnAcceptConditions.IsEnabled = ($this.IsChecked -eq $true)
@@ -2418,6 +2472,7 @@ function Get-MainWindow
            Add-XamlEvent $script:welcomeForm "btnAcceptConditions" "add_click" {
                Save-Setting "" "LicenseAccepted" "True"
                Save-Setting "" "FirstTimeRunning" "False"
+                Save-Setting "" "AppChangeInformed" "true"
                Show-ModalObject
                
                if($global:currentViewObject.ViewInfo.Authentication.ShowErrors)
@@ -2435,6 +2490,44 @@ function Get-MainWindow

            Show-ModalForm $window.Title $script:welcomeForm -HideButtons
        }
+        else
+        {
+            if($global:informOldAzureApp -eq $true) 
+            {
+                $appIdChangeInformed = Get-Setting "" "AppChangeInformed" "false"
+                if($appIdChangeInformed -ne "true") {
+                    $script:oldAzureAppForm = Get-XamlObject ($global:AppRootFolder + "\Xaml\OldAzureApp.xaml")
+
+                    Add-XamlEvent $script:oldAzureAppForm "addCustomApp" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
+
+                    Add-XamlEvent $script:oldAzureAppForm "btnOK" "add_click" {
+                        if((Get-XamlProperty $script:oldAzureAppForm "chkChangeApp" "IsChecked") -eq $true) {
+                            Write-Log "Set default app ID to $($global:DefaultAzureApp)"
+                            Save-Setting "EndpointManager" "EMAzureApp" $global:DefaultAzureApp
+                            $script:azureAppChanged = $true
+                        }
+
+                        if((Get-XamlProperty $script:oldAzureAppForm "chkSkippMessage" "IsChecked") -eq $true) {
+                            Save-Setting "" "AppChangeInformed" "true"
+                        }
+                        Show-ModalObject
+                        if($script:azureAppChanged -eq $true -and $global:currentViewObject) {
+                            [System.Windows.Forms.Application]::DoEvents()
+                            & $global:currentViewObject.ViewInfo.Authenticate
+                        }
+                    }
+
+                    Show-ModalForm $window.Title $script:oldAzureAppForm -HideButtons
+                }
+            }
+
+            ###!!! Force login here
+            if($global:currentViewObject.ViewInfo.Authenticate)
+            {
+                # Skip for now...need additional code to skip previous login and force this based on setting.
+                #!!!& $global:currentViewObject.ViewInfo.Authenticate -Params (@{"Interactve"=$true})
+            }
+        }            
    })

    foreach($view in $global:viewObjects)
@@ -2666,6 +2759,138 @@ function Show-LogView
    }
 }

+function Get-Base64ScriptContent
+{
+    param($encodeContent, [switch]$RemoveSignature)
+
+    if(-not $encodeContent) { return }
+
+    try
+    {
+        $scriptContent = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($encodeContent))
+
+        if($RemoveSignature -eq $true)
+        {
+            $x = $scriptContent.IndexOf("# SIG # Begin signature block")
+            if($x -gt 0)
+            {
+                $scriptContent = $scriptContent.SubString(0,$x)
+                $scriptContent = $scriptContent + "# SIG # Begin signature block`nSignature data excluded..."
+            }
+        }
+
+        $scriptContent
+    }
+    catch
+    {
+
+    }
+}
+
+function Get-ProxyURI
+{
+    if($null -eq $script:proxyURI)
+    {
+        $script:proxyUri = Get-SettingValue "ProxyURI"
+    }
+
+    if($null -eq $script:proxyURI)  
+    {
+        $script:proxyUri = ""
+    }
+    return $script:proxyURI
+}
+
+function Start-DownloadFile
+{
+    param($sourceURL, $targetFile)
+
+    Write-Log "Download file from $sourceURL"
+    if(-not $sourceURL)
+    {
+        return
+    }
+
+    if(-not $targetFile)
+    {
+        Write-Log "Target file is missing"
+        return
+    }    
+    
+    [void][System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions")
+    $wc = New-Object System.Net.WebClient
+    $wc.Encoding = [System.Text.Encoding]::UTF8
+    $proxyURI = Get-ProxyURI
+    if($proxyURI)
+    {
+        $wc.Proxy = [System.Net.WebProxy]::new($proxyURI)
+    }
+
+    try 
+    {
+        $title = $sourceURL.Split("/")[-1]
+        $title = $title.Split("/")[0]        
+    }
+    catch 
+    {
+        $title = $sourceURL
+    }
+
+    try 
+    {
+        Write-Status "Download file: `n$title"
+        $wc.DownloadFile($sourceURL, $targetFile)
+        Write-Log "File downloaded to $targetFile"
+    }
+    catch
+    {
+        Write-LogError "Failed to download file" $_.Exception
+    }
+    finally
+    {
+        $wc.Dispose()
+    }
+}
+
+function Get-ASCIIBytes
+{
+    param($String)
+    
+    $bytes = [System.Text.Encoding]::ASCII.GetBytes($String)
+ 
+    if ($bytes[0] -eq 0x2b -and $bytes[1] -eq 0x2f -and $bytes[2] -eq 0x76) 
+    { [Text.Encoding]::UTF7.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xff -and $bytes[1] -eq 0xfe) 
+    { [Text.Encoding]::Unicode.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xfe -and $bytes[1] -eq 0xff) 
+    { [Text.Encoding]::BigEndianUnicode.GetBytes($String) }
+    elseif ($bytes[0] -eq 0x00 -and $bytes[1] -eq 0x00 -and $bytes[2] -eq 0xfe -and $bytes[3] -eq 0xff) 
+    { [Text.Encoding]::UTF32.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xef -and $bytes[1] -eq 0xbb -and $bytes[2] -eq 0xbf) 
+    { [Text.Encoding]::UTF8.GetBytes($String) }
+
+    $bytes
+}
+
+function Get-DataGridValues
+{
+    param($dataGrid)
+    
+    $dgColumns = $dataGrid.Columns
+
+    $properties = @()
+
+    foreach($tmpCol in $dgColumns)
+    {
+        if(-not $tmpCol.Binding.Path.Path) { continue }
+        $propName = $tmpCol.Binding.Path.Path
+        $properties += @{n=$tmpCol.Header;e=([Scriptblock]::Create("`$_.$propName"))}
+    }
+
+    ($dataGrid.ItemsSource | Select -Property $properties)
+}
+
+
 New-Alias -Name ?? -value Invoke-Coalesce
 New-Alias -Name ?: -value Invoke-IfTrue
 Export-ModuleMember -alias * -function *
@@ -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**

@@ -1,4 +1,4 @@
-{
+{
    "0":  "AirPlay",
    "1":  "AirPrint",
    "2":  "AndroidDeviceOwnerApplications",
@@ -0,0 +1,184 @@
+<style type="text/css">
+    
+html { }
+
+html,body {
+    margin:0;
+    padding:5px;
+    position:relative;
+}
+
+.header-level1 {
+    font-family:"Arial",sans-serif;
+    font-size: 18px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.header-level2 {
+    font-family:"Arial",sans-serif;
+    font-size: 16px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level3 {
+    font-family:"Arial",sans-serif;
+    font-size: 14px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level4 {
+    font-family:"Arial",sans-serif;
+    font-size: 12px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level6 {
+    font-family:"Arial",sans-serif;
+    font-size: 10px;
+    margin-top: 3px;
+}
+
+.table-settings {
+    border: 1px solid #999999;
+    padding-right: 5px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-settings TR:nth-child(even) {
+    background-color: #FAFAFA
+}
+
+.table-settings th {
+    background-color: #D0D0D0;
+    padding: 0px;
+    text-align:left;
+    font-size: 12px;
+    padding-right: 10px;
+    padding-top: 3px;
+    font-weight: bold;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+}
+
+.table-settings td {
+    text-align:left;
+    padding-right: 5px;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+    border-bottom: 1px solid #ddd;
+}
+
+.code {
+    background: #f4f4f4;
+    border: 1px solid #ddd;
+    border-left: 3px solid #333333;
+    color: #666;
+    page-break-inside: avoid;
+    font-family: monospace;
+    font-size: 12px;
+    line-height: 1.6;
+    margin-bottom: 2px;
+    max-width: 100%;
+    overflow: auto;
+    padding: 1em 1.5em;
+    display: block;
+    word-wrap: break-word;
+}
+
+.description summary {
+    list-style: none;
+    cursor: pointer;
+}
+
+details.description[open] summary::after {
+  content: attr(data-open);
+}
+
+details.description:not([open]) summary::after {
+  content: attr(data-close);
+}
+
+.row-even {
+    
+}
+
+.row-odd {
+    
+}
+
+.category-level1 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.category-level2 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+}
+
+.anchor-style {
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.anchor-level2 {
+
+}
+
+.anchor-level3 {
+    padding-left: 5px;
+}
+
+.anchor-level4 {
+    padding-left: 10px;
+}
+
+.anchor-level5 {
+    padding-left: 15px;
+}
+
+.table-value {
+    border: 0px;
+    width: 100%;
+    padding: 0px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-value th {
+    background-color: #F9F9F9;
+    padding: 0px;
+    text-align:left;
+    font-size: 11px;
+    padding-right: 0px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: normal;
+    border-width: 0px;
+    border-style: none;
+}
+
+.table-value tr {
+    background-color: #FFFFFF;
+}
+
+.table-value td {
+    border-bottom: 0;
+    padding: 1px;
+}
+
+.row-new-property {
+    background-color: #E7E7E7 !important;
+}
+
+</style>
@@ -0,0 +1,117 @@
+<style type="text/css">
+    
+html { }
+
+html,body {
+    margin:0;
+    padding:0 px;
+    position:relative;
+}
+
+h6 {
+    margin-top: 2px !important;
+}
+
+.table-settings {
+    padding-right: 5px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+    margin-bottom: 0px !important;
+}
+
+.table-settings p {
+    margin-bottom: 0px !important;
+}
+
+.table-settings TR:nth-child(even) {
+    background-color: #FAFAFA
+}
+
+.table-settings td {
+    text-align:left;
+    border-width: 5px;
+    padding: 5px !important;
+    border-style: none;
+    border-color: #F2F2F2;
+    border-bottom: 1px solid #ddd;
+}
+
+.table-header1 td {
+    background-color: #D0D0D0;
+    text-align: left;
+    font-size: 12px;
+    font-weight: bold;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+}
+
+.category-level1 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.category-level2 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+}
+
+.anchor-style {
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.anchor-level2 {
+
+}
+
+.table-value {
+    border: 0px;
+    width: 100%;
+    padding: 0px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-value th {
+    background-color: #F9F9F9;
+    padding: 0px;
+    text-align:left;
+    font-size: 11px;
+    padding-right: 0px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: normal;
+    border-width: 0px;
+    border-style: none;
+}
+
+.table-value tr {
+    background-color: #FFFFFF;
+}
+
+.table-value td {
+    border-bottom: 0;
+    padding: 1px;
+}
+
+.row-new-property {
+    background-color: #E7E7E7 !important;
+}
+
+.description summary {
+    list-style: none;
+    cursor: pointer;
+}
+
+details.description[open] summary::after {
+  content: attr(data-open);
+}
+
+details.description:not([open]) summary::after {
+  content: attr(data-close);
+}
+
+</style>
@@ -1,4 +1,4 @@
-[
+[
    {
        "ObjectType":  "#microsoft.graph.androidCustomConfiguration",
        "PolicyType":  "AndroidCustom",
@@ -1014,13 +1014,7 @@
        "PolicyTypeLanguageId":  "vpn",
        "PlatformLanguageId":  "Windows10",
        "Categories":  [
-                           "vpn",
-                           "vpnappsandtrafficrules",
-                           "vpnconditionalaccess",
-                           "vpndnstriggers",
-                           "vpnproxy",
-                           "vpnsplittunneling",
-                           "vpntrustednetwork"
+                           "vpn"
                       ]
    },
    {
@@ -1400,5 +1394,14 @@
        "Categories":  [

                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.inventoryCatalog",
+        "PolicyType":  "InventoryCatalog",
+        "PolicyTypeLanguageId":  null,
+        "PlatformLanguageId":  null,
+        "Categories":  [
+
+                       ]
    }
 ]
@@ -11,7 +11,7 @@
        "entityKey":  "configureEmail",
        "dataType":  0,
        "booleanActions":  109,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "Inputs.authenticationType",
@@ -19,7 +19,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.AccountType",
        "dataType":  16,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "Inputs.basicAuth",
@@ -37,7 +37,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailUPN",
        "dataType":  16,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "userPrincipalNameOption",
@@ -58,7 +58,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.AccountDomain",
        "dataType":  20,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
@@ -74,7 +74,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAddress",
        "dataType":  16,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "userPrincipalNameOption",
@@ -92,7 +92,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.ServerHostName",
        "dataType":  20,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
@@ -108,7 +108,7 @@
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAccountName",
        "dataType":  20,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
@@ -124,7 +124,7 @@
        "entityKey":  "IntuneMAMAllowedAccountsOnly",
        "dataType":  16,
        "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
@@ -158,7 +158,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
@@ -166,17 +166,18 @@
        "entityKey":  "com.microsoft.outlook.Auth.Biometric",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
-        "unconfiguredValue": true,
                "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
@@ -185,6 +186,8 @@
                        }
                    ]
                }
+            }
+        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSaveContactsTitle",
@@ -192,17 +195,18 @@
        "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
-        "unconfiguredValue": true,
                "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
@@ -211,6 +215,8 @@
                        }
                    ]
                }
+            }
+        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.discoverFeedTitle",
@@ -218,7 +224,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103        
+        "category": "SettingDetails.configurationSettingsTitle"        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
@@ -226,17 +232,18 @@
        "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,                
-        "category": 103,
-        "unconfiguredValue": true,
                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
@@ -245,6 +252,8 @@
                        }
                    ]
                }
+            }
+        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowExternalRecipientsMailTipTitle",
@@ -252,7 +261,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
@@ -260,7 +269,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
@@ -268,17 +277,18 @@
        "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
-        "unconfiguredValue": true,
                "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
@@ -287,6 +297,8 @@
                        }
                    ]
                }
+            }
+        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.OrganizeMailByThread.title",
@@ -294,7 +306,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
@@ -302,7 +314,7 @@
        "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.themesEnabledTitle",
@@ -310,7 +322,7 @@
        "entityKey":  "com.microsoft.outlook.Settings.ThemesEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
@@ -318,17 +330,18 @@
        "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
        "dataType":  0,
        "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
-        "unconfiguredValue": true,
                "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
@@ -339,3 +352,92 @@
                }            
            }
        ]
+    },
+
+
+    {
+        "nameResourceKey":  "Inputs.outlookSMimeSettings",
+        "descriptionResourceKey":  "",
+        "dataType":  8,
+        "booleanActions":  0
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.enableSMIMETitle",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.UserChangeAllowed",
+                "dataType":  0,
+                "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"
+    }
+]
@@ -7,6 +7,96 @@
        "booleanActions":  0,
        "category": "AppInformationTab.name"
    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "Condition": {                            
+            "Expressions": [
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }                        
+            ]
+        } 
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "UWP",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Win32",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Unsupported Store Type",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },    
    {
        "nameResourceKey":  "Inputs.displayVersionLabel",
        "descriptionResourceKey":  "",
@@ -836,10 +926,24 @@
                ]
            },
            {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "returnCode",
+                            "nameResourceKey": "Win32ReturnCodes.Columns.returnCode"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "type",
+                            "nameResourceKey": "Win32ReturnCodes.Columns.codeType"
+                        }
+                    }
+                ],
                "nameResourceKey":  "Win32ReturnCodes.selectorLabel",
                "descriptionResourceKey":  "",
                "entityKey":  "returnCodes",
-                "dataType":  20,
+                "dataType":  21,
                "booleanActions":  0,
                "category": "Win32Program.selectorLabel"
            },
@@ -892,10 +996,24 @@
                "category": "Win32Requirements.selectorLabel"
            },
            {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                "nameResourceKey":  "Win32Requirements.AdditionalRequirements.label",
                "descriptionResourceKey":  "",
-                "entityKey":  "requirementRulesSummary",
-                "dataType":  20,
+                "entityKey":  "requirementRulesTranslated",
+                "dataType":  21,
                "booleanActions":  0,
                "category": "Win32Requirements.selectorLabel"
            },
@@ -908,10 +1026,24 @@
                "category": "DetectionRules.selectorLabel"
            },
            {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                "nameResourceKey":  "DetectionRules.selectorLabel",
                "descriptionResourceKey":  "",
-                "entityKey":  "detectionRulesSummary",
-                "dataType":  20,
+                "entityKey":  "detectionRulesTranslated",
+                "dataType":  21,
                "booleanActions":  0,
                "category": "DetectionRules.selectorLabel",
                "Condition": {                            
@@ -967,12 +1099,12 @@
                "category": "SettingDetails.dependencyCategory"
            },
            {
-                "nameResourceKey":  "supersedenceCategory",
+                "nameResourceKey":  "AppRelationshipStatus.Tabs.supersedence",
                "descriptionResourceKey":  "",
                "entityKey":  "supersededApps",
                "dataType":  20,
                "booleanActions":  0,
-                "category": "SettingDetails.supersedenceCategory"
+                "category": "AppRelationshipStatus.Tabs.supersedence"
            }
        ]
    }    
@@ -106,8 +106,8 @@
        "dataType":  102,
        "category":  "Autopilot.OOBE.title",
        "entityKey":  "language",
-        "booleanActions":  0
-    },    
+        "booleanActions":  0,
+        "ChildSettings": [
            {
                "nameResourceKey":  "Autopilot.OOBE.title",
                "descriptionResourceKey":  "",
@@ -115,6 +115,15 @@
                "dataType":  6,
                "booleanActions":  0,
                "category": "Autopilot.OOBE.title",
+                "Condition": {
+                    "Expressions": [
+                        {
+                            "property": "language",
+                            "operator": "ne",
+                            "value": "user-select"
+                        }
+                    ]
+                },
                "complexOptions":  [
                    {
                        "nameResourceKey":  "Autopilot.OOBE.skipKeyboardSelection",
@@ -132,7 +141,20 @@
                                }
                            ]
                        }
+                    }
+                ]
+            }
+        ]        
    },      
+    {
+        "nameResourceKey":  "Autopilot.OOBE.title",
+        "descriptionResourceKey":  "",
+        "entityKey":  "outOfBoxExperienceSettings",
+        "dataType":  6,
+        "skipAddLevel": true,
+        "booleanActions":  0,
+        "category": "Autopilot.OOBE.title",
+        "complexOptions":  [            
            {
                "nameResourceKey":  "Autopilot.OOBE.licenseAgreement",
                "descriptionResourceKey":  "Autopilot.OOBE.licenseAgreementInfo",
@@ -189,7 +211,7 @@
        "nameResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.label",
        "descriptionResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.infoBalloon",
        "entityKey":  "applyDeviceNameTemplate",
-        "dataType":  103,
+        "dataType":  0,        
        "booleanActions":  109,
        "category": "Autopilot.OOBE.title",
        "ChildSettings": [
@@ -393,7 +393,7 @@
                "value":  "notConfigured"
            },
            {
-                "nameResourceKey":  "microsoftEdge",
+                "nameResourceKey":  "microsoftEdgeOptionText",
                "descriptionResourceKey":  "",
                "value":  "microsoftEdge"
            },
@@ -543,7 +543,7 @@
    {
        "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
        "descriptionResourceKey":  "",
-        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
+        "entityKey":  "periodBeforePinReset",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
@@ -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"
+    }
+]    
@@ -306,7 +306,7 @@
    {
        "nameResourceKey":  "TAPSettings.EncryptData.label",
        "descriptionResourceKey":  "TAPSettings.EncryptData.tooltip",
-        "entityKey":  "appDataEncryptionType",
+        "entityKey":  "encryptOrgData",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.dataProtection",
@@ -354,7 +354,7 @@
                "value":  "notConfigured"
            },
            {
-                "nameResourceKey":  "microsoftEdge",
+                "nameResourceKey":  "microsoftEdgeOptionText",
                "descriptionResourceKey":  "",
                "value":  "microsoftEdge"
            },
@@ -398,14 +398,12 @@
            }
        ]
    },
+
+
    {
        "dataType":  8,
        "nameResourceKey":  "empty"
    }, 
-
-
-
-    
    {
        "nameResourceKey":  "TAPSettings.PinAccess.label",
        "descriptionResourceKey":  "TAPSettings.PinAccess.tooltip",
@@ -496,17 +494,17 @@
    {
        "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
        "descriptionResourceKey":  "",
-        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
+        "entityKey":  "periodBeforePinReset",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
-        "nameResourceKey":  "TAPSettings.Tap.previousPinBlockCount",
-        "descriptionResourceKey":  "",
-        "entityKey":  "previousPinBlockCount",
-        "dataType":  14,
-        "booleanActions":  0,
+        "nameResourceKey":  "TAPSettings.AppPIN.label",
+        "descriptionResourceKey":  "TAPSettings.AppPIN.tooltip",
+        "entityKey":  "disableAppPinIfDevicePinIsSet",
+        "dataType":  0,
+        "booleanActions":  201,
        "category": "SettingDetails.accessRequirements"
    },
    {
@@ -5,7 +5,7 @@
        "entityKey":  "versionInfo",
        "dataType":  20,
        "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.label",
@@ -13,7 +13,7 @@
        "entityKey":  "updateScheduleType",
        "dataType":  16,
        "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
        "options":  [
            {
                "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.outsideActiveHours",
@@ -39,7 +39,7 @@
    },
    {
        "dataType":  16,
-        "category":  103,
+        "category":  "TableHeaders.settings",
        "nameResourceKey":  "timeZoneName",
        "descriptionResourceKey":  "timeZoneDescription",
        "childSettings":  [
@@ -249,6 +249,6 @@
        "entityKey":  "timeWidows",
        "dataType":  20,
        "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
    }
 ]
@@ -13,7 +13,7 @@
        "entityKey":  "showInstallationProgress",
        "dataType":  0,
        "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.timeout",
@@ -21,7 +21,7 @@
        "entityKey":  "installProgressTimeoutInMinutes",
        "dataType":  14,
        "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
@@ -29,7 +29,7 @@
        "entityKey":  "showCustomErrorMessage",
        "dataType":  0,
        "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.customMessageTextBox",
@@ -37,7 +37,7 @@
        "entityKey":  "customErrorMessage",
        "dataType":  20,
        "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
@@ -45,7 +45,7 @@
        "entityKey":  "allowLogCollectionOnInstallFailure",
        "dataType":  0,
        "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
@@ -53,7 +53,7 @@
        "entityKey":  "trackInstallProgressForAutopilotOnly",
        "dataType":  0,
        "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
@@ -61,7 +61,7 @@
        "entityKey":  "blockDeviceSetupRetryByUser",
        "dataType":  16,
        "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
        "options":  [                                
            {
                "nameResourceKey":  "SettingDetails.no",
@@ -77,7 +77,7 @@
                        "entityKey":  "allowDeviceResetOnInstallFailure",
                        "dataType":  0,
                        "booleanActions":  109,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
@@ -85,7 +85,7 @@
                        "entityKey":  "allowDeviceUseOnInstallFailure",
                        "dataType":  0,
                        "booleanActions":  109,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
@@ -93,7 +93,7 @@
                        "entityKey":  "waitForApps",
                        "dataType":  14,
                        "booleanActions":  0,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                    }
                ]
            }
@@ -0,0 +1,69 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.policyType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsDriverUpdateProfile.Subtitle.automatic",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000,
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "automatic"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "TableHeaders.policyType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsDriverUpdateProfile.Subtitle.manual",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000,
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "manual"
+                }
+            ]
+        }        
+    },
+    {
+        "nameResourceKey":  "WindowsDriverUpdateProfile.Details.ApprovalMethod.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "approvalType",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category":  "TableHeaders.settings",
+        "options":  [                                
+            {
+                "nameResourceKey":  "WindowsDriverUpdateProfile.ApprovalMethod.automatic",
+                "value":  "automatic"
+            },
+            {
+                "nameResourceKey":  "WindowsDriverUpdateProfile.ApprovalMethod.manual",
+                "value":  "manual"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "WindowsDriverUpdateProfile.Details.DeploymentDeferralInDays.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "deploymentDeferralInDays",
+        "formatStringKey": "WindowsDriverUpdateProfile.Details.DeploymentDeferralInDays.value",
+        "dataType":  108,
+        "booleanActions":  0,
+        "category":  "TableHeaders.settings",
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "automatic"
+                }
+            ]
+        }
+    }
+]
@@ -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":  "",
@@ -13,7 +13,7 @@
        "entityKey":  "deployableContentDisplayName",
        "dataType":  20,
        "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
@@ -21,13 +21,13 @@
        "entityKey":  "expeditedUpdateSettings",
        "dataType":  6,
        "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
        "complexOptions":  [
            {
                "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
                "descriptionResourceKey":  "",
                "dataType":  16,
-                "category":  103,
+                "category":  "TableHeaders.settings",
                "entityKey":  "daysUntilForcedReboot",
                "booleanActions":  0,
                "options":  [                                
@@ -1,4 +1,4 @@
-{
+{
    "airprint_iosdevicefeatures":  [
                                       {
                                           "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "airprint_macdevicefeatures":  [
                                       {
                                           "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "androiddefenderatp_complianceandroid":  {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
@@ -1,4 +1,4 @@
-{
+{
    "androiddefenderatp_complianceandroiddeviceowner":  {
                                                            "isSettingDescription":  false,
                                                            "showAsSectionHeader":  false,
@@ -1,4 +1,4 @@
-{
+{
    "androiddefenderatp_complianceandroidforwork":  {
                                                        "isSettingDescription":  false,
                                                        "showAsSectionHeader":  false,
@@ -1,4 +1,4 @@
-{
+{
    "androiddeviceownerapplications_androiddeviceownergeneral":  [
                                                                     {
                                                                         "isSettingDescription":  false,
@@ -113,6 +113,164 @@
                                                                                                   "defaultValue":  false,
                                                                                                   "policyType":  2,
                                                                                                   "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "columns":  [
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appNameName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "name",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "packageName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appId",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appUrlName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appStoreUrl",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appPublisherName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "publisher",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "dataType":  21,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "certificateInstallTitle",
+                                                                                                   "descriptionResourceKey":  "certificateInstallDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "certInstallApps",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectSecurityApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "securityLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "securityLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectSecurityApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "securityLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectNetworkApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "networkLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "networkLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectNetworkApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "networkLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
                                                                                               }
                                                                                           ],
                                                                         "options":  [
@@ -1,4 +1,4 @@
-{
+{
    "androiddeviceownerpolicymessages_androiddeviceownergeneral":  {
                                                                       "isSettingDescription":  false,
                                                                       "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "applicationguard_windows10endpointprotection":  [
                                                         {
                                                             "dataType":  10,
@@ -1,4 +1,4 @@
-{
+{
    "applicationrestrictions_androidgeneral":  {
                                                   "dataType":  16,
                                                   "category":  5,
@@ -1,4 +1,4 @@
-{
+{
    "applicationrestrictions_iosgeneral":  [
                                               {
                                                   "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "applicationrestrictions_macgeneral":  {
                                               "isSettingDescription":  false,
                                               "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "applicationrestrictions_windowsphonegeneral":  {
                                                        "dataType":  16,
                                                        "category":  5,
@@ -1,4 +1,4 @@
-{
+{
    "applications_windows10general":  [
                                          {
                                              "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "applications_windowsphonegeneral":  {
                                             "dataType":  0,
                                             "category":  7,
@@ -1,4 +1,4 @@
-{
+{
    "applicationsandgames_iosgeneral":  [
                                            {
                                                "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "applicationsandgames_macgeneral":  {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "applicationsandgoogle_androidgeneral":  {
                                                 "dataType":  0,
                                                 "category":  9,
@@ -1,4 +1,4 @@
-{
+{
    "applicationvisibility_iosgeneral":  [
                                             {
                                                 "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "appmanagement_androidgeneral":  [
                                         {
                                             "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "appsandexperience_windows10teamgeneral":  [
                                                   {
                                                       "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "associateddomains_macdevicefeatures":  [
                                                {
                                                    "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "autonomoussingleappmode_iosgeneral":  [
                                               {
                                                   "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "azureoperationalinsights_windows10teamgeneral":  {
                                                          "dataType":  0,
                                                          "category":  14,
@@ -1,4 +1,4 @@
-{
+{
    "bitlocker_windows10endpointprotection":  [
                                                  {
                                                      "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "bootoptions_windows10devicefirmwareconfigurationinterface":  [
                                                                      {
                                                                          "dataType":  16,
@@ -1,4 +1,4 @@
-{
+{
    "browser_androidgeneral":  {
                                   "dataType":  0,
                                   "category":  17,
@@ -1,4 +1,4 @@
-{
+{
    "browser_windows8general":  [
                                    {
                                        "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "browser_windowsphonegeneral":  {
                                        "dataType":  0,
                                        "category":  17,
@@ -1,4 +1,4 @@
-{
+{
    "builtinapps_iosgeneral":  [
                                   {
                                       "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "builtinapps_macgeneral":  {
                                   "isSettingDescription":  false,
                                   "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "cameras_windows10devicefirmwareconfigurationinterface":  [
                                                                  {
                                                                      "dataType":  16,
@@ -44,7 +44,7 @@
                                                                                  ],
                                                                      "booleanActions":  0,
                                                                      "policyType":  108,
-                                                                      "enabled":  false
+                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  16,
@@ -1,4 +1,4 @@
-{
+{
    "cellular_windows8general":  {
                                     "dataType":  0,
                                     "category":  20,
@@ -1,4 +1,4 @@
-{
+{
    "cloudandstorage_androidgeneral":  [
                                           {
                                               "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "cloudandstorage_iosgeneral":  [
                                       {
                                           "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "cloudandstorage_macgeneral":  [
                                       {
                                           "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "cloudandstorage_windows10general":  [
                                             {
                                                 "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "cloudandstorage_windows8general":  [
                                            {
                                                "dataType":  20,
@@ -1,4 +1,4 @@
-{
+{
    "cloudprint_windows10general":  [
                                        {
                                            "dataType":  20,
@@ -1,4 +1,4 @@
-{
+{
    "complianceemailprofile_complianceios":  {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
@@ -1,4 +1,4 @@
-{
+{
    "connecteddevices_iosgeneral":  [
                                        {
                                            "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "connecteddevices_macgeneral":  {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "connectivity_androidgeneral":  [
                                        {
                                            "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "connectivity_windows10general":  [
                                          {
                                              "dataType":  16,
@@ -1,4 +1,4 @@
-{
+{
    "connectivity_windowsphonegeneral":  [
                                             {
                                                 "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "contentcaching_macdevicefeatures":  {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
@@ -1,4 +1,4 @@
-{
+{
    "controlpanelandsettings_windows10general":  {
                                                     "dataType":  0,
                                                     "category":  26,
@@ -1,4 +1,4 @@
-{
+{
    "credentialguard_windows10endpointprotection":  {
                                                        "dataType":  16,
                                                        "category":  27,
@@ -1,4 +1,4 @@
-{
+{
    "customcompliance_compliancewindows10":  {
                                                 "dataType":  25,
                                                 "category":  151,
@@ -1,4 +1,4 @@
-{
+{
    "customconfiguration_ioscustom":  [
                                          {
                                              "dataType":  20,
@@ -1,4 +1,4 @@
-{
+{
    "customconfiguration_maccustom":  [
                                          {
                                              "dataType":  20,
@@ -1,4 +1,4 @@
-{
+{
    "customomasettings_androidcustom":  {
                                            "columns":  [
                                                            {
@@ -1,4 +1,4 @@
-{
+{
    "customomasettings_androidforworkcustom":  {
                                                   "columns":  [
                                                                   {
@@ -1,4 +1,4 @@
-{
+{
    "customomasettings_windows10custom":  {
                                              "columns":  [
                                                              {
@@ -1,4 +1,4 @@
-{
+{
    "customomasettings_windowsphonecustom":  {
                                                 "columns":  [
                                                                 {
@@ -1,4 +1,4 @@
-{
+{
    "custompreferences_maccustompreferences":  [
                                                   {
                                                       "dataType":  20,
@@ -1,4 +1,4 @@
-{
+{
    "defender_windows10general":  [
                                      {
                                          "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "defenderantivirus_windows10endpointprotection":  [
                                                          {
                                                              "dataType":  19,
@@ -1,4 +1,4 @@
-{
+{
    "defenderexploitguard_windows10endpointprotection":  [
                                                             {
                                                                 "complexOptions":  [
@@ -1,4 +1,4 @@
-{
+{
    "defenderfirewall_windows10endpointprotection":  [
                                                         {
                                                             "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "defenderlocalsecurityoptions_windows10endpointprotection":  [
                                                                     {
                                                                         "complexOptions":  [
@@ -1,4 +1,4 @@
-{
+{
    "defendersecuritycenter_windows10endpointprotection":  [
                                                               {
                                                                   "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "deliveryoptimization_windowsdeliveryoptimization":  [
                                                             {
                                                                 "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration":  [
                                                                                                                           {
                                                                                                                               "dataType":  9,
@@ -1,4 +1,4 @@
-{
+{
    "derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration":  [
                                                                                                         {
                                                                                                             "dataType":  9,
@@ -1,4 +1,4 @@
-{
+{
    "deviceexperience_androiddeviceownergeneral":  {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  true,
@@ -1,815 +0,0 @@
-{
-    "devicefirmwareconfigurationinterface_windows10devicefirmwareconfigurationinterface":  [
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "dfciHeaderName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "securityFeaturesName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "changeUefiSettingsPermissionName",
-                                                                                                   "descriptionResourceKey":  "changeUefiSettingsPermissionDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfiguredOnly",
-                                                                                                                       "value":  "notConfiguredOnly",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "none",
-                                                                                                                       "value":  "none",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "changeUefiSettingsPermission",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfiguredOnly",
-                                                                                                   "unconfiguredValue":  "notConfiguredOnly",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "virtualizationOfCpuAndIOName",
-                                                                                                   "descriptionResourceKey":  "virtualizationOfCpuAndIODescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "virtualizationOfCpuAndIO",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "windowsPlatformBinaryTableName",
-                                                                                                   "descriptionResourceKey":  "windowsPlatformBinaryTableDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "windowsPlatformBinaryTable",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "simultaneousMultiThreadingName",
-                                                                                                   "descriptionResourceKey":  "simultaneousMultiThreadingDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "simultaneousMultiThreading",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "builtInHardwareName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "dfciBuiltinHeaderDescName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "camerasName",
-                                                                                                   "descriptionResourceKey":  "camerasDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "cameras",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "frontCamerasName",
-                                                                                                   "descriptionResourceKey":  "frontCamerasDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "frontCamera",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "rearCamerasName",
-                                                                                                   "descriptionResourceKey":  "rearCamerasDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "rearCamera",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "infraredCamerasName",
-                                                                                                   "descriptionResourceKey":  "infraredCamerasDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "infraredCamera",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "microphonesAndSpeakersName",
-                                                                                                   "descriptionResourceKey":  "microphonesAndSpeakersDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "microphonesAndSpeakers",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "microphonesName",
-                                                                                                   "descriptionResourceKey":  "microphonesDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "microphone",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "radiosName",
-                                                                                                   "descriptionResourceKey":  "radiosDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "children":  [
-                                                                                                                                        {
-                                                                                                                                            "dataType":  10,
-                                                                                                                                            "category":  136,
-                                                                                                                                            "nameResourceKey":  "radioWarningInfoBox",
-                                                                                                                                            "childSettings":  [
-
-                                                                                                                                                              ],
-                                                                                                                                            "options":  [
-
-                                                                                                                                                        ],
-                                                                                                                                            "booleanActions":  0,
-                                                                                                                                            "policyType":  108,
-                                                                                                                                            "enabled":  true
-                                                                                                                                        }
-                                                                                                                                    ],
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "radios",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "bluetoothName",
-                                                                                                   "descriptionResourceKey":  "bluetoothDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "bluetooth",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "wwanName",
-                                                                                                   "descriptionResourceKey":  "wwanDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "wirelessWideAreaNetwork",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "nfcName",
-                                                                                                   "descriptionResourceKey":  "nfcDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "nearFieldCommunication",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "wifiName",
-                                                                                                   "descriptionResourceKey":  "wifiDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "wiFi",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "bootOptionsName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "bootFromExternalMediaName",
-                                                                                                   "descriptionResourceKey":  "bootFromExternalMediaDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "bootFromExternalMedia",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "bootFromBuiltInNetworkAdaptersName",
-                                                                                                   "descriptionResourceKey":  "bootFromBuiltInNetworkAdaptersDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "bootFromBuiltInNetworkAdapters",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "portName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "usbTypeAPortName",
-                                                                                                   "descriptionResourceKey":  "usbTypeAPortDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "usbTypeAPort",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "usbTypeCPortName",
-                                                                                                   "descriptionResourceKey":  "usbTypeCPortDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "usbTypeCPort",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "sdCardName",
-                                                                                                   "descriptionResourceKey":  "sdCardDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "sdCard",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "wakeOnLANName",
-                                                                                                   "descriptionResourceKey":  "wakeOnLANDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "wakeOnLAN",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "wakeOnPowerName",
-                                                                                                   "descriptionResourceKey":  "wakeOnPowerDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "wakeOnPower",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               }
-                                                                                           ]
-}
@@ -1,4 +1,4 @@
-{
+{
    "deviceguard_windows10endpointprotection":  [
                                                    {
                                                        "isSettingDescription":  true,
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_complianceandroid":  [
                                           {
                                               "dataType":  0,
@@ -154,8 +154,8 @@
                                                                     {
                                                                         "dataType":  16,
                                                                         "category":  39,
-                                                                         "nameResourceKey":  "safetyNetAttestationOptionsName",
-                                                                         "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
+                                                                         "nameResourceKey":  "playIntegrityVerdictOptionsName",
+                                                                         "descriptionResourceKey":  "playIntegrityVerdictOptionsDescription",
                                                                         "childSettings":  [

                                                                                           ],
@@ -166,17 +166,17 @@
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
-                                                                                             "nameResourceKey":  "androidSafetyNetbasicIntegrity",
+                                                                                             "nameResourceKey":  "androidPlayIntegrityVerdictBasicIntegrity",
                                                                                             "value":  "basicIntegrity",
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
-                                                                                             "nameResourceKey":  "androidSafetyNetBasicIntegrityAndCertified",
+                                                                                             "nameResourceKey":  "androidPlayIntegrityVerdictBasicAndDeviceIntegrity",
                                                                                             "value":  "basicIntegrityAndCertified",
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
-                                                                         "entityKey":  "androidSafetyNetAttestationOptions",
+                                                                         "entityKey":  "androidPlayIntegrityVerdictOptions",
                                                                         "booleanActions":  0,
                                                                         "defaultValue":  "notConfigured",
                                                                         "unconfiguredValue":  "notConfigured",
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_complianceandroiddeviceowner":  [
                                                      {
                                                          "dataType":  16,
@@ -52,8 +52,8 @@
                                                                                {
                                                                                    "dataType":  16,
                                                                                    "category":  39,
-                                                                                    "nameResourceKey":  "safetyNetAttestationOptionsName",
-                                                                                    "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
+                                                                                    "nameResourceKey":  "playIntegrityVerdictOptionsName",
+                                                                                    "descriptionResourceKey":  "playIntegrityVerdictOptionsDescription",
                                                                                    "childSettings":  [

                                                                                                      ],
@@ -64,17 +64,75 @@
                                                                                                        "enabled":  true
                                                                                                    },
                                                                                                    {
-                                                                                                        "nameResourceKey":  "androidSafetyNetbasicIntegrity",
+                                                                                                        "nameResourceKey":  "androidPlayIntegrityVerdictBasicIntegrity",
                                                                                                        "value":  "basicIntegrity",
+                                                                                                        "children":  [
+                                                                                                                         {
+                                                                                                                             "dataType":  16,
+                                                                                                                             "category":  39,
+                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
+                                                                                                                             "descriptionResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
+                                                                                                                             "childSettings":  [
+
+                                                                                                                                               ],
+                                                                                                                             "options":  [
+                                                                                                                                             {
+                                                                                                                                                 "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
+                                                                                                                                                 "value":  "basic",
                                                                                                                                                 "enabled":  true
                                                                                                                                             },
                                                                                                                                             {
-                                                                                                        "nameResourceKey":  "androidSafetyNetBasicIntegrityAndCertified",
-                                                                                                        "value":  "basicIntegrityAndCertified",
+                                                                                                                                                 "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
+                                                                                                                                                 "value":  "hardwareBacked",
                                                                                                                                                 "enabled":  true
                                                                                                                                             }
                                                                                                                                         ],
-                                                                                    "entityKey":  "androidSafetyNetAttestationOptions",
+                                                                                                                             "entityKey":  "securityRequiredAndroidSafetyNetEvaluationType",
+                                                                                                                             "booleanActions":  0,
+                                                                                                                             "defaultValue":  "basic",
+                                                                                                                             "unconfiguredValue":  "basic",
+                                                                                                                             "policyType":  31,
+                                                                                                                             "enabled":  false
+                                                                                                                         }
+                                                                                                                     ],
+                                                                                                        "enabled":  true
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "nameResourceKey":  "androidPlayIntegrityVerdictBasicAndDeviceIntegrity",
+                                                                                                        "value":  "basicIntegrityAndCertified",
+                                                                                                        "children":  [
+                                                                                                                         {
+                                                                                                                             "dataType":  16,
+                                                                                                                             "category":  39,
+                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
+                                                                                                                             "descriptionResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
+                                                                                                                             "childSettings":  [
+
+                                                                                                                                               ],
+                                                                                                                             "options":  [
+                                                                                                                                             {
+                                                                                                                                                 "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
+                                                                                                                                                 "value":  "basic",
+                                                                                                                                                 "enabled":  true
+                                                                                                                                             },
+                                                                                                                                             {
+                                                                                                                                                 "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
+                                                                                                                                                 "value":  "hardwareBacked",
+                                                                                                                                                 "enabled":  true
+                                                                                                                                             }
+                                                                                                                                         ],
+                                                                                                                             "entityKey":  "securityRequiredAndroidSafetyNetEvaluationType",
+                                                                                                                             "booleanActions":  0,
+                                                                                                                             "defaultValue":  "basic",
+                                                                                                                             "unconfiguredValue":  "basic",
+                                                                                                                             "policyType":  31,
+                                                                                                                             "enabled":  false
+                                                                                                                         }
+                                                                                                                     ],
+                                                                                                        "enabled":  true
+                                                                                                    }
+                                                                                                ],
+                                                                                    "entityKey":  "androidPlayIntegrityVerdictOptions",
                                                                                    "booleanActions":  0,
                                                                                    "defaultValue":  "notConfigured",
                                                                                    "unconfiguredValue":  "notConfigured",
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_complianceandroidforwork":  [
                                                  {
                                                      "dataType":  0,
@@ -103,8 +103,8 @@
                                                                            {
                                                                                "dataType":  16,
                                                                                "category":  39,
-                                                                                "nameResourceKey":  "safetyNetAttestationOptionsName",
-                                                                                "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
+                                                                                "nameResourceKey":  "playIntegrityVerdictOptionsName",
+                                                                                "descriptionResourceKey":  "playIntegrityVerdictOptionsDescription",
                                                                                "childSettings":  [

                                                                                                  ],
@@ -115,25 +115,25 @@
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
-                                                                                                    "nameResourceKey":  "androidSafetyNetbasicIntegrity",
+                                                                                                    "nameResourceKey":  "androidPlayIntegrityVerdictBasicIntegrity",
                                                                                                    "value":  "basicIntegrity",
                                                                                                    "children":  [
                                                                                                                     {
                                                                                                                         "dataType":  16,
                                                                                                                         "category":  39,
-                                                                                                                         "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
-                                                                                                                         "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
+                                                                                                                         "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
+                                                                                                                         "descriptionResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
                                                                                                                         "childSettings":  [

                                                                                                                                           ],
                                                                                                                         "options":  [
                                                                                                                                         {
-                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeBasic",
+                                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
                                                                                                                                             "value":  "basic",
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
-                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeHardwareBacked",
+                                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
                                                                                                                                             "value":  "hardwareBacked",
                                                                                                                                             "enabled":  true
                                                                                                                                         }
@@ -149,25 +149,25 @@
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
-                                                                                                    "nameResourceKey":  "androidSafetyNetBasicIntegrityAndCertified",
+                                                                                                    "nameResourceKey":  "androidPlayIntegrityVerdictBasicAndDeviceIntegrity",
                                                                                                    "value":  "basicIntegrityAndCertified",
                                                                                                    "children":  [
                                                                                                                     {
                                                                                                                         "dataType":  16,
                                                                                                                         "category":  39,
-                                                                                                                         "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
-                                                                                                                         "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
+                                                                                                                         "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
+                                                                                                                         "descriptionResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
                                                                                                                         "childSettings":  [

                                                                                                                                           ],
                                                                                                                         "options":  [
                                                                                                                                         {
-                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeBasic",
+                                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
                                                                                                                                             "value":  "basic",
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
-                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeHardwareBacked",
+                                                                                                                                             "nameResourceKey":  "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
                                                                                                                                             "value":  "hardwareBacked",
                                                                                                                                             "enabled":  true
                                                                                                                                         }
@@ -183,7 +183,7 @@
                                                                                                    "enabled":  true
                                                                                                }
                                                                                            ],
-                                                                                "entityKey":  "androidSafetyNetAttestationOptions",
+                                                                                "entityKey":  "androidPlayIntegrityVerdictOptions",
                                                                                "booleanActions":  0,
                                                                                "defaultValue":  "notConfigured",
                                                                                "unconfiguredValue":  "notConfigured",
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_complianceaospdeviceowner":  {
                                                   "dataType":  0,
                                                   "category":  39,
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_complianceios":  [
                                       {
                                           "dataType":  0,
@@ -1,4 +1,4 @@
-{
+{
    "devicehealth_compliancemac":  {
                                       "dataType":  0,
                                       "category":  39,
@@ -1,16 +1,32 @@
-{
-    "devicehealth_compliancewindows10":  {
+{
+    "devicehealth_compliancewindows10":  [
+                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
                                                 "dataType":  8,
                                                 "category":  39,
                                                 "nameResourceKey":  "complianceWindowsDeviceHealthAttestationHeader",
+                                                 "childSettings":  [
+
+                                                                   ],
+                                                 "options":  [
+
+                                                             ],
+                                                 "booleanActions":  0,
+                                                 "policyType":  35,
+                                                 "enabled":  true
+                                             },
+                                             {
+                                                 "isSettingDescription":  false,
+                                                 "showAsSectionHeader":  false,
+                                                 "dataType":  8,
+                                                 "category":  39,
+                                                 "nameResourceKey":  "complianceWindows10DeviceHealthAttestationHeader",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
                                                                           "category":  39,
                                                                           "nameResourceKey":  "bitLockerEnabledName",
-                                                                       "descriptionResourceKey":  "bitLockerEnabledDescription",
                                                                           "childSettings":  [

                                                                                             ],
@@ -27,7 +43,6 @@
                                                                           "dataType":  0,
                                                                           "category":  39,
                                                                           "nameResourceKey":  "secureBootEnabledName",
-                                                                       "descriptionResourceKey":  "secureBootEnabledDescription",
                                                                           "childSettings":  [

                                                                                             ],
@@ -44,7 +59,6 @@
                                                                           "dataType":  0,
                                                                           "category":  39,
                                                                           "nameResourceKey":  "codeIntegrityEnabledName",
-                                                                       "descriptionResourceKey":  "codeIntegrityEnabledDescription",
                                                                           "childSettings":  [

                                                                                             ],
@@ -64,5 +78,101 @@
                                                 "booleanActions":  0,
                                                 "policyType":  35,
                                                 "enabled":  true
+                                             },
+                                             {
+                                                 "isSettingDescription":  false,
+                                                 "showAsSectionHeader":  false,
+                                                 "dataType":  8,
+                                                 "category":  39,
+                                                 "nameResourceKey":  "complianceWindows11DeviceHealthAttestationHeader",
+                                                 "childSettings":  [
+                                                                       {
+                                                                           "dataType":  0,
+                                                                           "category":  39,
+                                                                           "nameResourceKey":  "earlyLaunchAntiMalwareDriverEnabledName",
+                                                                           "childSettings":  [
+
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "earlyLaunchAntiMalwareDriverEnabled",
+                                                                           "booleanActions":  1,
+                                                                           "defaultValue":  false,
+                                                                           "policyType":  35,
+                                                                           "enabled":  false
+                                                                       },
+                                                                       {
+                                                                           "dataType":  0,
+                                                                           "category":  39,
+                                                                           "nameResourceKey":  "firmwareProtectionEnabledName",
+                                                                           "childSettings":  [
+
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "firmwareProtectionEnabled",
+                                                                           "booleanActions":  1,
+                                                                           "defaultValue":  false,
+                                                                           "policyType":  35,
+                                                                           "enabled":  false
+                                                                       },
+                                                                       {
+                                                                           "dataType":  0,
+                                                                           "category":  39,
+                                                                           "nameResourceKey":  "hvciEnabledName",
+                                                                           "childSettings":  [
+
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "memoryIntegrityEnabled",
+                                                                           "booleanActions":  1,
+                                                                           "defaultValue":  false,
+                                                                           "policyType":  35,
+                                                                           "enabled":  false
+                                                                       },
+                                                                       {
+                                                                           "dataType":  0,
+                                                                           "category":  39,
+                                                                           "nameResourceKey":  "memoryAccessProtectionEnabledName",
+                                                                           "childSettings":  [
+
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "kernelDmaProtectionEnabled",
+                                                                           "booleanActions":  1,
+                                                                           "defaultValue":  false,
+                                                                           "policyType":  35,
+                                                                           "enabled":  false
+                                                                       },
+                                                                       {
+                                                                           "dataType":  0,
+                                                                           "category":  39,
+                                                                           "nameResourceKey":  "virtualizationBasedSecurityEnabledName",
+                                                                           "childSettings":  [
+
+                                                                                             ],
+                                                                           "options":  [
+
+                                                                                       ],
+                                                                           "entityKey":  "virtualizationBasedSecurityEnabled",
+                                                                           "booleanActions":  1,
+                                                                           "defaultValue":  false,
+                                                                           "policyType":  35,
+                                                                           "enabled":  false
                                                                       }
+                                                                   ],
+                                                 "options":  [
+
+                                                             ],
+                                                 "booleanActions":  0,
+                                                 "policyType":  35,
+                                                 "enabled":  false
+                                             }
+                                         ]
 }
@@ -1,4 +1,4 @@
-{
+{
    "devicepassword_androiddeviceownergeneral":  [
                                                     {
                                                         "isSettingDescription":  false,
@@ -1,4 +1,4 @@
-{
+{
    "devicepassword_aospdeviceownerdevice":  [
                                                 {
                                                     "dataType":  16,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mikael Karlsson	5326bd5525	3.9.7	2024-06-27 21:00:44 +10:00
Mikael Karlsson	b7e04bc820	Merge pull request #220 from ee61re/master various documentation updates	2024-04-30 07:35:16 +10:00
Rob Ellis	670f47ea3f	Merge branch 'Micke-K:master' into master	2024-04-28 20:06:56 +01:00
Rob Ellis	6d86c3e91e	Update MSALInfo.md typos	2024-04-28 20:04:13 +01:00
Rob Ellis	f41827f41a	Update Documentation.md typos	2024-04-28 20:01:54 +01:00
Rob Ellis	b56a226c3e	Update ADMXImport.md typos	2024-04-28 19:53:07 +01:00
Rob Ellis	8ff175534d	Update README.md Typos	2024-04-28 19:37:24 +01:00
Mikael Karlsson	6991cae5ae	Merge pull request #219 from ee61re/master Update CompareForm.xaml	2024-04-28 10:19:40 +10:00
Rob Ellis	3ce1be57ae	Update CompareForm.xaml Fixed typos	2024-04-27 14:58:53 +01:00
Mikael Karlsson	c16f85a299	3.9.6	2024-04-22 21:48:16 +10:00
Mikael Karlsson	47968b4219	3.9.5	2024-01-24 21:25:53 +11:00
Mikael Karlsson	6ac211a2bf	3.9.4	2023-12-18 19:37:17 +11:00
Mikael Karlsson	83c845fc33	3.9.3 Fix	2023-12-11 19:00:23 +11:00
Mikael Karlsson	f5613442bd	3.9.3	2023-12-11 18:58:13 +11:00
Mikael Karlsson	ab7b062946	3.9.2	2023-10-17 20:34:44 +11:00
Mikael Karlsson	ea3af64316	3.9.1	2023-08-30 20:07:18 +10:00
Mikael Karlsson	e6ec048df0	3.9.0 Module Added version in the module file	2023-05-04 23:42:37 +10:00
Mikael Karlsson	0fd868ff70	3.9.0	2023-05-04 22:00:12 +10:00
Mikael Karlsson	ece28a649f	3.8.1	2023-01-26 22:29:21 +11:00
Mikael Karlsson	897309e48e	3.7.4	2022-11-22 21:54:51 +11:00