diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index 21553dfee9..10bf5bf5c8 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -295,6 +295,8 @@ #### [SUPL DDF file](supl-ddf-file.md) ### [SurfaceHub CSP](surfacehub-csp.md) #### [SurfaceHub DDF file](surfacehub-ddf-file.md) +### [TenantLockdown CSP](tenantlockdown-csp.md) +#### [TenantLockdown DDF file](tenantlockdown-ddf.md) ### [TPMPolicy CSP](tpmpolicy-csp.md) #### [TPMPolicy DDF file](tpmpolicy-ddf-file.md) ### [UEFI CSP](uefi-csp.md) diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index cd6b862e43..6d0e3eb4c0 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -2165,6 +2165,34 @@ Footnotes: + +[TenantLockdown CSP](tenantlockdown-csp.md) + + + + + + + + + + + + + + + + + + + + + +
HomeProBusinessEnterpriseEducationMobileMobile Enterprise
cross markcheck mark5check mark5check mark5check mark5cross markcross mark
+ + + + [TPMPolicy CSP](tpmpolicy-csp.md) diff --git a/windows/client-management/mdm/images/provisioning-csp-tenantlockdown.png b/windows/client-management/mdm/images/provisioning-csp-tenantlockdown.png new file mode 100644 index 0000000000..e788aebb52 Binary files /dev/null and b/windows/client-management/mdm/images/provisioning-csp-tenantlockdown.png differ diff --git a/windows/client-management/mdm/tenantlockdown-csp.md b/windows/client-management/mdm/tenantlockdown-csp.md new file mode 100644 index 0000000000..43449f403a --- /dev/null +++ b/windows/client-management/mdm/tenantlockdown-csp.md @@ -0,0 +1,39 @@ +--- +title: TenantLockdown CSP +description: +ms.author: maricia +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: MariciaAlforque +ms.date: 08/13/2018 +--- + +# TenantLockdown CSP + +> [!WARNING] +> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. This CSP was added in Windows 10, next major version. + +The TenantLockdown configuration service provider is used by the IT admin to lock a device to a tenant, which ensures that the device remains bound to the tenant in case of accidental or intentional resets or wipes. + +> [!Note] +> The forced network connection is only applicable to devices after reset (not new). + +The following diagram shows the TenantLockdown configuration service provider in tree format. + +![TenantLockdown CSP diagram](images/provisioning-csp-tenantlockdown.png) + +**./Vendor/MSFT/TenantLockdown** +The root node. + +**RequireNetworkInOOBE** +Specifies whether to require a network connection during the out-of-box experience (OOBE) at first logon. + +When RequireNetworkInOOBE is true, when the device goes through OOBE at first logon or after a reset, the user is required to choose a network before proceeding. There is no "skip for now" option. + +Value type is bool. Supported operations are Get and Replace. + +- true - Require network in OOBE +- false - No network connection requirement in OOBE + +Example scenario: Henry is the IT admin at Contoso. He deploys 1000 devices successfully with RequireNetworkInOOBE set to true. When users accidentally or intentionally reset their device, they are required to connect to a network before they can proceed. Upon successful connection, users see the Contoso branded sign-in experience where they must use their Azure AD credentials. There is no option to skip the network connection and create a local account. \ No newline at end of file diff --git a/windows/client-management/mdm/tenantlockdown-ddf.md b/windows/client-management/mdm/tenantlockdown-ddf.md new file mode 100644 index 0000000000..4c75123a3f --- /dev/null +++ b/windows/client-management/mdm/tenantlockdown-ddf.md @@ -0,0 +1,75 @@ +--- +title: TenantLockdown DDF file +description: XML file containing the device description framework +ms.author: maricia +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: MariciaAlforque +ms.date: 08/13/2018 +--- + +# TenantLockdown DDF file + +> [!WARNING] +> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + +This topic shows the OMA DM device description framework (DDF) for the **TenantLockdown** configuration service provider. + +Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download). + +The XML below is for Windows 10, next major version. + +``` syntax + +]> + + 1.2 + + TenantLockdown + ./Vendor/MSFT + + + + + + + + + + + + + + + com.microsoft/1.0/MDM/TenantLockdown + + + + RequireNetworkInOOBE + + + + + + false + true - Require network in OOBE, false - no network connection requirement in OOBE + + + + + + + + + + + text/plain + + + + + +``` \ No newline at end of file diff --git a/windows/client-management/mdm/win32compatibilityappraiser-csp.md b/windows/client-management/mdm/win32compatibilityappraiser-csp.md index 5efc199b30..5718fd4b66 100644 --- a/windows/client-management/mdm/win32compatibilityappraiser-csp.md +++ b/windows/client-management/mdm/win32compatibilityappraiser-csp.md @@ -16,7 +16,7 @@ ms.date: 07/19/2018 The Win32CompatibilityAppraiser configuration service provider enables the IT admin to query the current status of the Appraiser and UTC telementry health. This CSP was added in Windows 10, next major version. -The following diagram shows the Storage configuration service provider in tree format. +The following diagram shows the Win32CompatibilityAppraiser configuration service provider in tree format. ![Win32CompatibilityAppraiser CSP diagram](images/provisioning-csp-win32compatibilityappraiser.png)