diff --git a/windows/client-management/mdm/accountmanagement-csp.md b/windows/client-management/mdm/accountmanagement-csp.md index 42722f7bd7..5f2a7ff230 100644 --- a/windows/client-management/mdm/accountmanagement-csp.md +++ b/windows/client-management/mdm/accountmanagement-csp.md @@ -19,10 +19,18 @@ AccountManagement CSP is used to configure setting in the Account Manager servic > [!NOTE] > The AccountManagement CSP is only supported in Windows Holographic for Business edition. +The following shows the AccountManagement configuration service provider in tree format. -The following diagram shows the AccountManagement configuration service provider in tree format. - -![accountmanagement csp.](images/provisioning-csp-accountmanagement.png) +```console +./Vendor/MSFT +AccountManagement +----UserProfileManagement +--------EnableProfileManager +--------DeletionPolicy +--------StorageCapacityStartDeletion +--------StorageCapacityStopDeletion +--------ProfileInactivityThreshold +``` **./Vendor/MSFT/AccountManagement** Root node for the AccountManagement configuration service provider. diff --git a/windows/client-management/mdm/appv-deploy-and-config.md b/windows/client-management/mdm/appv-deploy-and-config.md index 4c8f6eaecd..ac7cb56c39 100644 --- a/windows/client-management/mdm/appv-deploy-and-config.md +++ b/windows/client-management/mdm/appv-deploy-and-config.md @@ -23,7 +23,36 @@ manager: dansimp [EnterpriseAppVManagement CSP reference](./enterpriseappvmanagement-csp.md) -![enterpriseappvmanagement csp.](images/provisioning-csp-enterpriseappvmanagement.png) +The following shows the EnterpriseAppVManagement configuration service provider in tree format. + +```console +./Vendor/MSFT +EnterpriseAppVManagement +----AppVPackageManagement +--------EnterpriseID +------------PackageFamilyName +---------------PackageFullName +------------------Name +------------------Version +------------------Publisher +------------------InstallLocation +------------------InstallDate +------------------Users +------------------AppVPackageID +------------------AppVVersionId +------------------AppVPackageUri +----AppVPublishing +--------LastSync +------------LastError +------------LastErrorDescription +------------SyncStatusDescription +------------SyncProgress +--------Sync +------------PublishXML +----AppVDynamicPolicy +--------ConfigurationId +------------Policy +```

(./User/Vendor/MSFT/EnterpriseAppVManagement) contains the following sub-nodes.

diff --git a/windows/client-management/mdm/bootstrap-csp.md b/windows/client-management/mdm/bootstrap-csp.md index e07354fa81..7c66f6b36e 100644 --- a/windows/client-management/mdm/bootstrap-csp.md +++ b/windows/client-management/mdm/bootstrap-csp.md @@ -16,18 +16,18 @@ ms.date: 06/26/2017 The BOOTSTRAP configuration service provider sets the Trusted Provisioning Server (TPS) for the device. +>[!Note] +>BOOTSTRAP CSP is only supported in Windows 10 Mobile. +> +> This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_DEVICE\_MANAGEMENT\_ADMIN capabilities to be accessed from a network configuration application. -> **Note**  BOOTSTRAP CSP is only supported in Windows 10 Mobile. -> -> -> -> **Note**   This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_DEVICE\_MANAGEMENT\_ADMIN capabilities to be accessed from a network configuration application. +The following shows the BOOTSTRAP configuration service provider in tree format as used by Open Mobile Alliance (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider. - - -The following image shows the BOOTSTRAP configuration service provider in tree format as used by Open Mobile Alliance (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider. - -![bootstrap csp (cp).](images/provisioning-csp-bootstrap-cp.png) +```console +BOOTSTRAP +----CONTEXT-ALLOW +----PROVURL +``` **CONTEXT-ALLOW** Optional. Specifies a context for the TPS. Only one context is supported, so this parameter is ignored and "0" is assumed for its value. diff --git a/windows/client-management/mdm/browserfavorite-csp.md b/windows/client-management/mdm/browserfavorite-csp.md index 15a939f7eb..bf703c3671 100644 --- a/windows/client-management/mdm/browserfavorite-csp.md +++ b/windows/client-management/mdm/browserfavorite-csp.md @@ -28,9 +28,13 @@ This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID -The following diagram shows the BrowserFavorite configuration service provider in tree format as used by Open Mobile Alliance Device (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider. +The following shows the BrowserFavorite configuration service provider in tree format as used by Open Mobile Alliance Device (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider. -![browserfavorite csp (cp).](images/provisioning-csp-browserfavorite-cp.png) +```console +BrowserFavorite +favorite name +----URL +``` ***favorite name*** Required. Specifies the user-friendly name of the favorite URL that is displayed in the Favorites list of Internet Explorer. @@ -78,19 +82,19 @@ The following table shows the Microsoft custom elements that this configuration -

parm-query

+

Parm-query

Yes

-

noparm

+

Noparm

Yes

-

nocharacteristic

+

Nocharacteristic

Yes

-

characteristic-query

+

Characteristic-query

Yes

Recursive query: Yes

Top-level query: Yes

diff --git a/windows/client-management/mdm/cellularsettings-csp.md b/windows/client-management/mdm/cellularsettings-csp.md index e493bf16e1..38f858db4d 100644 --- a/windows/client-management/mdm/cellularsettings-csp.md +++ b/windows/client-management/mdm/cellularsettings-csp.md @@ -19,9 +19,13 @@ The CellularSettings configuration service provider is used to configure cellula > [!Note] > Starting in Windows 10, version 1703 the CellularSettings CSP is supported in Windows 10 Home, Pro, Enterprise, and Education editions. -The following image shows the CellularSettings CSP in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider. +The following shows the CellularSettings CSP in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider. -![provisioning for cellular settings.](images/provisioning-csp-cellularsettings.png) +```console +./Vendor/MSFT +CellularSettings +----DataRoam +``` **DataRoam**

Optional. Integer. Specifies the default roaming value. Valid values are:

diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md index 44886adee0..37fa305bce 100644 --- a/windows/client-management/mdm/cm-cellularentries-csp.md +++ b/windows/client-management/mdm/cm-cellularentries-csp.md @@ -18,9 +18,35 @@ The CM\_CellularEntries configuration service provider is used to configure the This configuration service provider requires the ID\_CAP\_NETWORKING\_ADMIN capability to be accessed from a network configuration application. -The following diagram shows the CM\_CellularEntries configuration service provider management object in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider. +The following shows the CM\_CellularEntries configuration service provider management object in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider. -![cm\-cellularentries csp.](images/provisioning-csp-cm-cellularentries.png) +```console +CM_CellularEntries +----entryname +--------AlwaysOn +--------AuthType +--------ConnectionType +--------Desc.langid +--------Enabled +--------IpHeaderCompression +--------Password +--------SwCompression +--------UserName +--------UseRequiresMappingPolicy +--------Version +--------DevSpecificCellular +-----------GPRSInfoAccessPointName +--------Roaming +--------OEMConnectionID +--------ApnId +--------IPType +--------ExemptFromDisablePolicy +--------ExemptFromRoaming +--------TetheringNAI +--------IdleDisconnectTimeout +--------SimIccId +--------PurposeGroups +``` ***entryname***

Defines the name of the connection.

@@ -51,27 +77,27 @@ The following diagram shows the CM\_CellularEntries configuration service provid -

gprs

+

Gprs

Default. Used for GPRS type connections (GPRS + GSM + EDGE + UMTS + LTE).

-

cdma

+

Cdma

Used for CDMA type connections (1XRTT + EVDO).

-

lte

+

Lte

Used for LTE type connections (eHRPD + LTE) when the device is registered HOME.

-

legacy

+

Legacy

Used for GPRS + GSM + EDGE + UMTS connections.

-

lte_iwlan

+

Lte_iwlan

Used for GPRS type connections that may be offloaded over WiFi

-

iwlan

+

Iwlan

Used for connections that are implemented over WiFi offload only

@@ -285,15 +311,15 @@ The following table shows the Microsoft custom elements that this configuration -

nocharacteristic

+

Nocharacteristic

Yes

-

characteristic-query

+

Characteristic-query

Yes

-

parm-query

+

Parm-query

Yes

diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index d4793c91e6..78158a6a3f 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -43,12 +43,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - cross mark + No + No + No + No + No + No @@ -69,12 +69,12 @@ Additional lists: Mobile - cross mark - check mark4 - check mark4 - check mark4 - check mark4 - cross mark + No + Yes + Yes + Yes + Yes + No @@ -95,12 +95,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -121,12 +121,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - cross mark + No + No + No + No + No + No @@ -147,12 +147,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -173,12 +173,12 @@ Additional lists: Mobile - check mark6 - check mark6 - check mark6 - check mark6 - check mark6 - check mark6 + Yes6 + Yes6 + Yes6 + Yes6 + Yes6 + Yes6 @@ -199,12 +199,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -225,12 +225,12 @@ Additional lists: Mobile - cross mark - check mark3 - check mark - check mark - check mark - cross mark + No + Yes3 + Yes + Yes + Yes + No @@ -251,12 +251,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -277,12 +277,12 @@ Additional lists: Mobile - cross mark - check mark5 - check mark2 - check mark2 - check mark2 - check mark2 + No + Yes5 + Yes2 + Yes2 + Yes2 + Yes2 @@ -303,12 +303,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - cross mark + No + No + No + No + No + No @@ -329,12 +329,12 @@ Additional lists: Mobile - check mark3 - check mark3 - check mark3 - check mark3 - check mark3 - check mark + Yes3 + Yes3 + Yes3 + Yes3 + Yes3 + Yes @@ -356,12 +356,12 @@ Additional lists: - cross mark - cross mark - cross mark - cross mark - cross mark - check mark1 + No + No + No + No + No + Yes1 @@ -382,12 +382,12 @@ Additional lists: Mobile - check mark2 - check mark2 - check mark2 - check mark2 - check mark2 - check mark + Yes2 + Yes2 + Yes2 + Yes2 + Yes2 + Yes @@ -408,12 +408,12 @@ Additional lists: Mobile - check mark3 - check mark3 - check mark3 - check mark3 - check mark3 - check mark + Yes3 + Yes3 + Yes3 + Yes3 + Yes3 + Yes @@ -434,12 +434,12 @@ Additional lists: Mobile - check mark2 - check mark2 - check mark2 - check mark2 - check mark2 - check mark + Yes2 + Yes2 + Yes2 + Yes2 + Yes2 + Yes @@ -460,12 +460,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -486,12 +486,12 @@ Additional lists: Mobile - cross mark - cross mark - check mark2 - check mark2 - check mark2 - cross mark + No + No + Yes2 + Yes2 + Yes2 + No @@ -512,12 +512,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -538,12 +538,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - cross mark + No + No + No + No + No + No @@ -564,12 +564,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -590,12 +590,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -616,12 +616,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - cross mark + Yes + Yes + Yes + Yes + Yes + No @@ -642,12 +642,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -668,12 +668,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -694,12 +694,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - cross mark + No + No + No + No + No + No @@ -720,12 +720,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -746,12 +746,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -772,12 +772,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -799,12 +799,12 @@ Additional lists: - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -825,12 +825,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -852,12 +852,12 @@ Additional lists: - cross mark - cross mark - cross mark - check mark2 - check mark2 - check mark3 + No + No + No + Yes2 + Yes2 + Yes3 @@ -878,12 +878,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -904,12 +904,12 @@ Additional lists: Mobile - check mark6 - check mark6 - check mark6 - check mark6 - check mark6 - cross mark + Yes6 + Yes6 + Yes6 + Yes6 + Yes6 + No @@ -930,12 +930,12 @@ Additional lists: Mobile - check mark2 - check mark2 - check mark2 - check mark2 - check mark2 - check mark + Yes2 + Yes2 + Yes2 + Yes2 + Yes2 + Yes @@ -956,12 +956,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -982,12 +982,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - check mark2 - check mark2 - cross mark + No + No + No + Yes2 + Yes2 + No @@ -1008,12 +1008,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1034,13 +1034,13 @@ Additional lists: Mobile - check mark + Yes Only for mobile application management (MAM) - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes @@ -1061,12 +1061,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - cross mark + No + Yes + Yes + Yes + Yes + No @@ -1087,12 +1087,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1113,12 +1113,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1139,12 +1139,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1165,12 +1165,12 @@ Additional lists: Mobile - cross mark - check mark3 - check mark3 - check mark3 - check mark3 - check mark3 + No + Yes3 + Yes3 + Yes3 + Yes3 + Yes3 @@ -1191,12 +1191,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check markB + No + No + No + No + No + YesB @@ -1217,12 +1217,12 @@ Additional lists: Mobile - cross mark - check mark3 - check mark3 - check mark3 - check mark3 - cross mark + No + Yes3 + Yes3 + Yes3 + Yes3 + No @@ -1243,12 +1243,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1269,12 +1269,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1296,13 +1296,13 @@ Additional lists: Mobile Enterprise - check mark - check mark - cross mark - check mark - check mark - cross mark - cross mark + Yes + Yes + No + Yes + Yes + No + No @@ -1322,12 +1322,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1348,12 +1348,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark2 + No + No + No + No + No + Yes2 @@ -1374,12 +1374,12 @@ Additional lists: Mobile - check mark4 - check mark4 - check mark4 - check mark4 - check mark4 - check mark4 + Yes + Yes + Yes + Yes + Yes + Yes @@ -1400,12 +1400,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1426,12 +1426,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1452,12 +1452,12 @@ Additional lists: Mobile - cross mark - check mark2 - check mark2 - check mark2 - check mark2 - check mark2 + No + Yes2 + Yes2 + Yes2 + Yes2 + Yes2 @@ -1478,12 +1478,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1504,12 +1504,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1530,12 +1530,12 @@ Additional lists: Mobile - cross mark - check mark2 - check mark2 - check mark2 - check mark2 - cross mark + No + Yes2 + Yes2 + Yes2 + Yes2 + No @@ -1556,12 +1556,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1582,12 +1582,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1608,12 +1608,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1634,12 +1634,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - check mark2 - check mark2 - cross mark + No + No + No + Yes2 + Yes2 + No @@ -1660,12 +1660,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1686,12 +1686,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1712,12 +1712,12 @@ Additional lists: Mobile - check markB - check markB - check markB - check markB - check markB - check markB + YesB + YesB + YesB + YesB + YesB + YesB @@ -1738,12 +1738,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1764,12 +1764,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1790,12 +1790,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1816,12 +1816,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1842,12 +1842,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -1868,12 +1868,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1894,12 +1894,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1920,12 +1920,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -1946,12 +1946,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -1972,12 +1972,12 @@ Additional lists: Mobile - cross mark - check mark1 - check mark1 - check mark1 - check mark1 - cross mark + No + Yes1 + Yes1 + Yes1 + Yes1 + No @@ -1998,12 +1998,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -2024,12 +2024,12 @@ Additional lists: Mobile - cross mark - check mark1 - check mark1 - check mark1 - check mark1 - cross mark + No + Yes1 + Yes1 + Yes1 + Yes1 + No @@ -2050,12 +2050,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -2103,12 +2103,12 @@ Additional lists: Mobile - cross mark - check mark5 - check mark5 - check mark5 - check mark5 - cross mark + No + Yes5 + Yes5 + Yes5 + Yes5 + No @@ -2129,12 +2129,12 @@ Additional lists: Mobile - cross mark - check mark - check mark - check mark - check mark - check mark + No + Yes + Yes + Yes + Yes + Yes @@ -2155,12 +2155,12 @@ Additional lists: Mobile - cross mark - check mark - check mark4 - check mark4 - check mark4 - cross mark + No + Yes + Yes + Yes + Yes + No @@ -2181,12 +2181,12 @@ Additional lists: Mobile - cross mark - cross mark - check mark - check mark - check mark - cross mark + No + No + Yes + Yes + Yes + No @@ -2207,12 +2207,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -2233,12 +2233,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -2259,12 +2259,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -2290,7 +2290,7 @@ Additional lists: - check mark + Yes @@ -2312,12 +2312,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -2338,12 +2338,12 @@ Additional lists: Mobile - cross mark - check mark1 - check mark1 - check mark1 - check mark1 - cross mark + No + Yes1 + Yes1 + Yes1 + Yes1 + No @@ -2364,12 +2364,12 @@ Additional lists: Mobile - cross mark - check mark5 - check mark5 - check mark5 - check mark5 - cross mark + No + Yes5 + Yes5 + Yes5 + Yes5 + No @@ -2390,12 +2390,12 @@ Additional lists: Mobile - cross mark - check mark1 - check mark1 - check mark1 - check mark1 - cross mark + No + Yes1 + Yes1 + Yes1 + Yes1 + No @@ -2416,12 +2416,12 @@ Additional lists: Mobile - cross mark - check mark3 - check mark3 - check mark3 - check mark3 - cross mark> + No + Yes3 + Yes3 + Yes3 + Yes3 + No> @@ -2443,12 +2443,12 @@ Additional lists: Mobile - check mark - check mark - check mark - check mark - check mark - check mark + Yes + Yes + Yes + Yes + Yes + Yes @@ -2469,12 +2469,12 @@ Additional lists: Mobile - cross mark - cross mark - cross mark - cross mark - cross mark - check mark + No + No + No + No + No + Yes @@ -2495,12 +2495,12 @@ Additional lists: Mobile - cross mark - check mark5 - check mark5 - check mark5 - check mark5 - check mark5 + No + Yes5 + Yes5 + Yes5 + Yes5 + Yes5 @@ -2526,7 +2526,7 @@ Additional lists: - check mark + Yes @@ -2555,36 +2555,36 @@ The following list shows the CSPs supported in HoloLens devices: | Configuration service provider | HoloLens (1st gen) Development Edition | HoloLens (1st gen) Commercial Suite | HoloLens 2 | |------|--------|--------|--------| -| [AccountManagement CSP](accountmanagement-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) 4 | ![check mark](images/checkmark.png) -| [Accounts CSP](accounts-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [ApplicationControl CSP](applicationcontrol-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [AppLocker CSP](applocker-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![cross mark](images/crossmark.png) | -| [AssignedAccess CSP](assignedaccess-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) 4 | ![check mark](images/checkmark.png) | -| [CertificateStore CSP](certificatestore-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png)| ![check mark](images/checkmark.png) | -| [ClientCertificateInstall CSP](clientcertificateinstall-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DevDetail CSP](devdetail-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DeveloperSetup CSP](developersetup-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) 2 (runtime provisioning via provisioning packages only; no MDM support)| ![check mark](images/checkmark.png) | -| [DeviceManageability CSP](devicemanageability-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [DeviceStatus CSP](devicestatus-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DevInfo CSP](devinfo-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DiagnosticLog CSP](diagnosticlog-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DMAcc CSP](dmacc-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DMClient CSP](dmclient-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [EnrollmentStatusTracking CSP](enrollmentstatustracking-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) 10 | -| [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [NetworkProxy CSP](networkproxy-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [NetworkQoSPolicy CSP](networkqospolicy-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) 8| -| [NodeCache CSP](nodecache-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -[PassportForWork CSP](passportforwork-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [Policy CSP](policy-configuration-service-provider.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [RemoteFind CSP](remotefind-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) 4 | ![check mark](images/checkmark.png) | -| [RemoteWipe CSP](remotewipe-csp.md) (**doWipe** and **doWipePersistProvisionedData** nodes only) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) 4 | ![check mark](images/checkmark.png) | -| [RootCATrustedCertificates CSP](rootcacertificates-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [TenantLockdown CSP](tenantlockdown-csp.md) | ![cross mark.](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) 10 | -| [Update CSP](update-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [VPNv2 CSP](vpnv2-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [WiFi CSP](wifi-csp.md) | ![cross mark.](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [WindowsLicensing CSP](windowslicensing-csp.md) | ![check mark.](images/checkmark.png) | ![check mark](images/checkmark.png) | ![cross mark](images/crossmark.png) | +| [AccountManagement CSP](accountmanagement-csp.md) | No | Yes 4 | Yes +| [Accounts CSP](accounts-csp.md) | Yes | Yes | Yes | +| [ApplicationControl CSP](applicationcontrol-csp.md) | No | No | Yes | +| [AppLocker CSP](applocker-csp.md) | No | Yes | No | +| [AssignedAccess CSP](assignedaccess-csp.md) | No | Yes 4 | Yes | +| [CertificateStore CSP](certificatestore-csp.md) | Yes | Yes| Yes | +| [ClientCertificateInstall CSP](clientcertificateinstall-csp.md) | No | Yes | Yes | +| [DevDetail CSP](devdetail-csp.md) | Yes | Yes | Yes | +| [DeveloperSetup CSP](developersetup-csp.md) | No | Yes 2 (runtime provisioning via provisioning packages only; no MDM support)| Yes | +| [DeviceManageability CSP](devicemanageability-csp.md) | No | No | Yes | +| [DeviceStatus CSP](devicestatus-csp.md) | No | Yes | Yes | +| [DevInfo CSP](devinfo-csp.md) | Yes | Yes | Yes | +| [DiagnosticLog CSP](diagnosticlog-csp.md) | No | Yes | Yes | +| [DMAcc CSP](dmacc-csp.md) | Yes | Yes | Yes | +| [DMClient CSP](dmclient-csp.md) | Yes | Yes | Yes | +| [EnrollmentStatusTracking CSP](enrollmentstatustracking-csp.md) | No | No | Yes 10 | +| [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md) | No | Yes | Yes | +| [NetworkProxy CSP](networkproxy-csp.md) | No | No | Yes | +| [NetworkQoSPolicy CSP](networkqospolicy-csp.md) | No | No | Yes 8| +| [NodeCache CSP](nodecache-csp.md) | Yes | Yes | Yes | +[PassportForWork CSP](passportforwork-csp.md) | No | Yes | Yes | +| [Policy CSP](policy-configuration-service-provider.md) | No | Yes | Yes | +| [RemoteFind CSP](remotefind-csp.md) | No | Yes 4 | Yes | +| [RemoteWipe CSP](remotewipe-csp.md) (**doWipe** and **doWipePersistProvisionedData** nodes only) | No | Yes 4 | Yes | +| [RootCATrustedCertificates CSP](rootcacertificates-csp.md) | No | Yes | Yes | +| [TenantLockdown CSP](tenantlockdown-csp.md) | No | No | Yes 10 | +| [Update CSP](update-csp.md) | No | Yes | Yes | +| [VPNv2 CSP](vpnv2-csp.md) | No | Yes | Yes | +| [WiFi CSP](wifi-csp.md) | No | Yes | Yes | +| [WindowsLicensing CSP](windowslicensing-csp.md) | Yes | Yes | No | ## CSPs supported in Microsoft Surface Hub @@ -2649,17 +2649,3 @@ The following list shows the CSPs supported in HoloLens devices:
- Footnotes: -- A - Only for mobile application management (MAM). -- B - Provisioning only. -- 1 - Added in Windows 10, version 1607. -- 2 - Added in Windows 10, version 1703. -- 3 - Added in Windows 10, version 1709. -- 4 - Added in Windows 10, version 1803. -- 5 - Added in Windows 10, version 1809. -- 6 - Added in Windows 10, version 1903. -- 7 - Added in Windows 10, version 1909. -- 8 - Added in Windows 10, version 2004. -- 9 - Added in Windows 10 Team 2020 Update -- 10 - Added in [Windows Holographic, version 20H2](/hololens/hololens-release-notes#windows-holographic-version-20h2) - diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md index bd80931f74..c4a5bf7384 100644 --- a/windows/client-management/mdm/device-update-management.md +++ b/windows/client-management/mdm/device-update-management.md @@ -138,9 +138,46 @@ Updates are configured using a combination of the [Update CSP](update-csp.md), a The enterprise IT can configure auto-update polices via OMA DM using the [Policy CSP](policy-configuration-service-provider.md) (this functionality is not supported in Windows 10 Mobile and Windows 10 Home). Here's the CSP diagram for the Update node in Policy CSP. -The following diagram shows the Update policies in a tree format. +The following shows the Update policies in a tree format. -![update policies.](images/update-policies.png) +```console +./Vendor/MSFT +Policy +----Config +--------Update +-----------ActiveHoursEnd +-----------ActiveHoursMaxRange +-----------ActiveHoursStart +-----------AllowAutoUpdate +-----------AllowMUUpdateService +-----------AllowNonMicrosoftSignedUpdate +-----------AllowUpdateService +-----------AutoRestartNotificationSchedule +-----------AutoRestartRequiredNotificationDismissal +-----------BranchReadinessLevel +-----------DeferFeatureUpdatesPeriodInDays +-----------DeferQualityUpdatesPeriodInDays +-----------DeferUpdatePeriod +-----------DeferUpgradePeriod +-----------EngagedRestartDeadline +-----------EngagedRestartSnoozeSchedule +-----------EngagedRestartTransitionSchedule +-----------ExcludeWUDriversInQualityUpdate +-----------IgnoreMOAppDownloadLimit +-----------IgnoreMOUpdateDownloadLimit +-----------PauseDeferrals +-----------PauseFeatureUpdates +-----------PauseQualityUpdates +-----------RequireDeferUpgrade +-----------RequireUpdateApproval +-----------ScheduleImminentRestartWarning +-----------ScheduledInstallDay +-----------ScheduledInstallTime +-----------ScheduleRestartWarning +-----------SetAutoRestartNotificationDisable +-----------UpdateServiceUrl +-----------UpdateServiceUrlAlternate +``` **Update/ActiveHoursEnd** > [!NOTE] @@ -674,9 +711,38 @@ Example ### Update management -The enterprise IT can configure the set of approved updates and get compliance status via OMA DM using the [Update CSP](update-csp.md). The following diagram shows the Update CSP in tree format.. +The enterprise IT can configure the set of approved updates and get compliance status via OMA DM using the [Update CSP](update-csp.md). The following shows the Update CSP in tree format. -![provisioning csp update.](images/provisioning-csp-update.png) +```console +./Vendor/MSFT +Update +----ApprovedUpdates +--------Approved Update Guid +------------ApprovedTime +----FailedUpdates +--------Failed Update Guid +------------HResult +------------Status +------------RevisionNumber +----InstalledUpdates +--------Installed Update Guid +------------RevisionNumber +----InstallableUpdates +--------Installable Update Guid +------------Type +------------RevisionNumber +----PendingRebootUpdates +--------Pending Reboot Update Guid +------------InstalledTime +------------RevisionNumber +----LastSuccessfulScanTime +----DeferUpgrade +----Rollback +--------QualityUpdate +--------FeatureUpdate +--------QualityUpdateStatus +--------FeatureUpdateStatus +``` **Update** The root node. diff --git a/windows/client-management/mdm/deviceinstanceservice-csp.md b/windows/client-management/mdm/deviceinstanceservice-csp.md index 0db22bf159..a7852e16cc 100644 --- a/windows/client-management/mdm/deviceinstanceservice-csp.md +++ b/windows/client-management/mdm/deviceinstanceservice-csp.md @@ -24,9 +24,27 @@ The DeviceInstance CSP is only supported in Windows 10 Mobile. -The following diagram shows the DeviceInstanceService configuration service provider in tree format. +The following shows the DeviceInstanceService configuration service provider in tree format. -![provisioning\-csp\-deviceinstanceservice.](images/provisioning-csp-deviceinstanceservice.png) +```console +./Vendor/MSFT +DeviceInstanceService +------------Roaming +------------PhoneNumber +------------IMEI +------------IMSI +------------Identity +---------------Identity1 +------------------Roaming +------------------PhoneNumber +------------------IMEI +------------------IMSI +---------------Identity2 +------------------PhoneNumber +------------------IMEI +------------------IMSI +------------------Roaming +``` **Roaming** A boolean value that specifies the roaming status of the device. In dual SIM mode when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/Roaming is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/Roaming. @@ -36,34 +54,34 @@ Supported operation is **Get**. Returns **True** if the device is roaming; otherwise **False**. **PhoneNumber** -A string that represents the phone number of the device. In case of dual SIM mode when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/PhoneNumber is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/PhoneNumber. +A string that represents the phone number of the device. In dual SIM mode, when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/PhoneNumber is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/PhoneNumber. Value type is chr. Supported operation is **Get**. **IMEI** -A string the represents the International Mobile Station Equipment Identity (IMEI) of the device. In case of dual SIM mode when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/IMEI is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/IMEI. +A string the represents the International Mobile Station Equipment Identity (IMEI) of the device. In dual SIM mode, when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/IMEI is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/IMEI. Value type is chr. Supported operation is **Get**. **IMSI** -A string that represents the first six digits of device IMSI number (Mobile Country/region Code, Mobile Network Code) of the device. In case of dual SIM mode when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/IMSI is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/IMSI. +A string that represents the first six digits of device IMSI number (Mobile Country/region Code, Mobile Network Code) of the device. In dual SIM mode when the device supports two different phone numbers, querying SIM 1 explicitly with ./Vendor/MSFT/DeviceInstanceService/Identify1/IMSI is functionally equivalent to using ./Vendor/MSFT/DeviceInstanceService/IMSI. Value type is chr. Supported operation is **Get**. **Identity** -The parent node to group per SIM specific information in case of dual SIM mode. +The parent node to group per SIM-specific information in dual SIM mode. **Identity1** -The parent node to group SIM1 specific information in case of dual SIM mode. +The parent node to group SIM1 specific information in dual SIM mode. **Identity2** -The parent node to group SIM2 specific information in case of dual SIM mode. +The parent node to group SIM2 specific information in dual SIM mode. ## Examples diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md index 9933e58a23..d415155769 100644 --- a/windows/client-management/mdm/devicelock-csp.md +++ b/windows/client-management/mdm/devicelock-csp.md @@ -30,9 +30,33 @@ The DevicePasswordEnabled setting must be set to 0 (device password is enabled) - MaxInactivityTimeDeviceLock - MinDevicePasswordComplexCharacters -The following image shows the DeviceLock configuration service provider in tree format. +The following shows the DeviceLock configuration service provider in tree format. -![devicelock csp.](images/provisioning-csp-devicelock.png) +```console +./Vendor/MSFT +DeviceLock +--------Provider +----------ProviderID +-------------DevicePasswordEnabled +-------------AllowSimpleDevicePassword +-------------MinDevicePasswordLength +-------------AlphanumericDevicePasswordRequired +-------------MaxDevicePasswordFailedAttempts +-------------DevicePasswordExpiration +-------------DevicePasswordHistory +-------------MaxInactivityTimeDeviceLock +-------------MinDevicePasswordComplexCharacters +----------DeviceValue +-------------DevicePasswordEnabled +-------------AllowSimpleDevicePassword +-------------MinDevicePasswordLength +-------------AlphanumericDevicePasswordRequired +-------------MaxDevicePasswordFailedAttempts +-------------DevicePasswordExpiration +-------------DevicePasswordHistory +-------------MaxInactivityTimeDeviceLock +-------------MinDevicePasswordComplexCharacters +``` **Provider** Required. An interior node to group all policy providers. Scope is permanent. Supported operation is Get. diff --git a/windows/client-management/mdm/enterprise-app-management.md b/windows/client-management/mdm/enterprise-app-management.md index 8c5e138861..0f51e05177 100644 --- a/windows/client-management/mdm/enterprise-app-management.md +++ b/windows/client-management/mdm/enterprise-app-management.md @@ -39,9 +39,109 @@ Windows 10 lets you inventory all apps deployed to a user and all apps for all These classifications are represented as nodes in the EnterpriseModernAppManagement CSP. -The following diagram shows the EnterpriseModernAppManagement CSP in a tree format. +The following shows the EnterpriseModernAppManagement CSP in a tree format. -![enterprisemodernappmanagement csp diagram.](images/provisioning-csp-enterprisemodernappmanagement.png) +```console +./Device/Vendor/MSFT +or +./User/Vendor/MSFT +EnterpriseAppManagement +----AppManagement +--------UpdateScan +--------LastScanError +--------AppInventoryResults +--------AppInventoryQuery +--------RemovePackage +--------AppStore +----------PackageFamilyName +------------PackageFullName +--------------Name +--------------Version +--------------Publisher +--------------Architecture +--------------InstallLocation +--------------IsFramework +--------------IsBundle +--------------InstallDate +--------------ResourceID +--------------RequiresReinstall +--------------PackageStatus +--------------Users +--------------IsProvisioned +--------------IsStub +------------DoNotUpdate +------------AppSettingPolicy +--------------SettingValue +------------MaintainProcessorArchitectureOnUpdate +------------NonRemovable +----------ReleaseManagement +------------ReleaseManagementKey +--------------ChannelId +--------------ReleaseId +--------------EffectiveRelease +-----------------ChannelId +-----------------ReleaseId +--------nonStore +----------PackageFamilyName +------------PackageFullName +--------------Name +--------------Version +--------------Publisher +--------------Architecture +--------------InstallLocation +--------------IsFramework +--------------IsBundle +--------------InstallDate +--------------ResourceID +--------------RequiresReinstall +--------------PackageStatus +--------------Users +--------------IsProvisioned +--------------IsStub +------------DoNotUpdate +------------AppSettingPolicy +--------------SettingValue +------------MaintainProcessorArchitectureOnUpdate +------------NonRemoveable +--------System +----------PackageFamilyName +------------PackageFullName +--------------Name +--------------Version +--------------Publisher +--------------Architecture +--------------InstallLocation +--------------IsFramework +--------------IsBundle +--------------InstallDate +--------------ResourceID +--------------RequiresReinstall +--------------PackageStatus +--------------Users +--------------IsProvisioned +--------------IsStub +------------DoNotUpdate +------------AppSettingPolicy +--------------SettingValue +------------MaintainProcessorArchitectureOnUpdate +------------NonRemoveable +----AppInstallation +--------PackageFamilyName +----------StoreInstall +----------HostedInstall +----------LastError +----------LastErrorDesc +----------Status +----------ProgressStatus +----AppLicenses +--------StoreLicenses +----------LicenseID +------------LicenseCategory +------------LicenseUsage +------------RequesterID +------------AddLicense +------------GetLicenseFromStore +``` Each app displays one package family name and 1-n package full names for installed apps. The apps are categorized based on their origin (Store, nonStore, System). diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md index 98249aad50..f5132cb038 100644 --- a/windows/client-management/mdm/enterpriseappmanagement-csp.md +++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md @@ -21,9 +21,35 @@ The EnterpriseAppManagement enterprise configuration service provider is used to -The following diagram shows the EnterpriseAppManagement configuration service provider in tree format. +The following shows the EnterpriseAppManagement configuration service provider in tree format. -![enterpriseappmanagement csp.](images/provisioning-csp-enterpriseappmanagement.png) +```console +./Vendor/MSFT +EnterpriseAppManagement +----EnterpriseID +--------EnrollmentToken +--------StoreProductID +--------StoreUri +--------CertificateSearchCriteria +--------Status +--------CRLCheck +--------EnterpriseApps +------------Inventory +----------------ProductID +--------------------Version +--------------------Title +--------------------Publisher +--------------------InstallDate +------------Download +----------------ProductID +--------------------Version +--------------------Name +--------------------URL +--------------------Status +--------------------LastError +--------------------LastErrorDesc +--------------------DownloadInstall +``` ***EnterpriseID*** Optional. A dynamic node that represents the EnterpriseID as a GUID. It is used to enroll or unenroll enterprise applications. diff --git a/windows/client-management/mdm/filesystem-csp.md b/windows/client-management/mdm/filesystem-csp.md index 3df7b51be2..0b5579a5a6 100644 --- a/windows/client-management/mdm/filesystem-csp.md +++ b/windows/client-management/mdm/filesystem-csp.md @@ -22,9 +22,16 @@ The FileSystem configuration service provider is used to query, add, modify, and > [!NOTE] > This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_CSP\_OEM capabilities to be accessed from a network configuration application. -The following diagram shows the FileSystem configuration service provider management object in tree format as used by OMA DM. The OMA Client Provisioning protocol is not supported by this configuration service provider. +The following shows the FileSystem configuration service provider management object in tree format as used by OMA DM. The OMA Client Provisioning protocol is not supported by this configuration service provider. -![filesystem csp (dm).](images/provisioning-csp-filesystem-dm.png) +```console +./Vendor/MSFT +FileSystem +----file name +----file directory +--------file name +--------file directory +``` **FileSystem** Required. Defines the root of the file system management object. It functions as the root directory for file system queries. diff --git a/windows/client-management/mdm/hotspot-csp.md b/windows/client-management/mdm/hotspot-csp.md index af7934b674..0672037cf9 100644 --- a/windows/client-management/mdm/hotspot-csp.md +++ b/windows/client-management/mdm/hotspot-csp.md @@ -25,9 +25,26 @@ The HotSpot configuration service provider is used to configure and enable Inter -The following diagram shows the HotSpot configuration service provider management object in tree format as used by OMA Client Provisioning. The OMA DM protocol is not supported by this configuration service provider. +The following shows the HotSpot configuration service provider management object in tree format as used by OMA Client Provisioning. The OMA DM protocol is not supported by this configuration service provider. -![hotspot csp (cp).](images/provisioning-csp-hotspot-cp.png) +```console +./Vendor/MSFT +HotSpot +-------Enabled +-------DedicatedConnections +-------TetheringNAIConnection +-------MaxUsers +-------MaxBluetoothUsers +-------MOHelpNumber +-------MOInfoLink +-------MOAppLink +-------MOHelpMessage +-------EntitlementRequired +-------EntitlementDll +-------EntitlementInterval +-------PeerlessTimeout +-------PublicConnectionTimeout +``` **Enabled** Required. Specifies whether to enable Internet sharing on the device. The default is false. diff --git a/windows/client-management/mdm/messaging-csp.md b/windows/client-management/mdm/messaging-csp.md index 69893ff362..1e87fad908 100644 --- a/windows/client-management/mdm/messaging-csp.md +++ b/windows/client-management/mdm/messaging-csp.md @@ -15,9 +15,18 @@ manager: dansimp The Messaging configuration service provider is used to configure the ability to get text messages audited on a mobile device. This CSP was added in Windows 10, version 1703. -The following diagram shows the Messaging configuration service provider in tree format. +The following shows the Messaging configuration service provider in tree format. -![messaging csp.](images/provisioning-csp-messaging.png) +```console +./User/Vendor/MSFT +Messaging +----AuditingLevel +----Auditing +--------Messages +----------Count +----------RevisionId +----------Data +``` **./User/Vendor/MSFT/Messaging** diff --git a/windows/client-management/mdm/napdef-csp.md b/windows/client-management/mdm/napdef-csp.md index 0b715c1a53..bf9a0bc281 100644 --- a/windows/client-management/mdm/napdef-csp.md +++ b/windows/client-management/mdm/napdef-csp.md @@ -25,13 +25,41 @@ The NAPDEF configuration service provider is used to add, modify, or delete WAP -The following diagram shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **initial bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider. +The following shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **initial bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider. -![napdef csp (cp) (initial bootstrapping).](images/provisioning-csp-napdef-cp.png) +```console +NAPDEF +----NAPAUTHINFO +------AUTHNAME +------AUTHSECRET +------AUTHTYPE +----BEARER +----INTERNET +----LOCAL-ADDR +----LOCAL-ADDRTYPE +----NAME +----NAP-ADDRESS +----NAP-ADDRTYPE +----NAPID +``` -The following diagram shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **updating the bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider. +The following shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **updating the bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider. -![napdef csp (cp) (update bootstrapping).](images/provisioning-csp-napdef-cp-2.png) +```console +NAPDEF +--NAPID +----NAPAUTHINFO +------AUTHNAME +------AUTHSECRET +------AUTHTYPE +----BEARER +----INTERNET +----LOCAL-ADDR +----LOCAL-ADDRTYPE +----NAME +----NAP-ADDRESS +----NAP-ADDRTYPE +``` **NAPAUTHINFO** Defines a group of authentication settings. @@ -106,26 +134,26 @@ The following table shows the Microsoft custom elements that this configuration -ELements +Elements Available -

parm-query

+

Parm-query

Yes

Note that some GPRS parameters will not necessarily contain the exact same value as was set.

-

noparm

+

Noparm

Yes

-

nocharacteristic

+

Nocharacteristic

Yes

-

characteristic-query

+

Characteristic-query

Yes

diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md index 84ff8f5e34..028da43967 100644 --- a/windows/client-management/mdm/passportforwork-csp.md +++ b/windows/client-management/mdm/passportforwork-csp.md @@ -21,15 +21,68 @@ The PassportForWork configuration service provider is used to provision Windows   ### User configuration diagram -The following diagram shows the PassportForWork configuration service provider in tree format. +The following shows the PassportForWork configuration service provider in tree format. -![passportforwork csp.](images/provisioning-csp-passportforwork.png) +```console +./User/Vendor/MSFT +PassportForWork +-------TenantId +----------Policies +-------------UsePassportForWork +-------------RequireSecurityDevice +-------------EnablePinRecovery +-------------PINComplexity +----------------MinimumPINLength +----------------MaximumPINLength +----------------UppercaseLetters +----------------LowercaseLetters +----------------SpecialCharecters +----------------Digits +----------------History +----------------Expiration +``` ### Device configuration diagram -The following diagram shows the PassportForWork configuration service provider in tree format. +The following shows the PassportForWork configuration service provider in tree format. -![passportforwork diagram.](images/provisioning-csp-passportforwork2.png) +```console +./Device/Vendor/MSFT +PassportForWork +-------TenantId +----------Policies +-------------UsePassportForWork +-------------RequireSecurityDevice +-------------ExcludeSecurityDevices +----------------TPM12 +-------------EnablePinRecovery +-------------UserCertificateForOnPremAuth +-------------PINComplexity +----------------MinimumPINLength +----------------MaximumPINLength +----------------UppercaseLetters +----------------LowercaseLetters +----------------SpecialCharacters +----------------Digits +----------------History +----------------Expiration +-------------Remote +----------------UseRemotePassport +-------------UseHelloCertificatesAsSmartCardCertificates +-------UseBiometrics +-------Biometrics +----------UseBiometrics +----------FacialFeatureUse +-------DeviceUnlock +----------GroupA +----------GroupB +----------Plugins +-------DynamicLock +----------DynamicLock +----------Plugins +-------SecurityKey +----------UseSecurityKeyForSignin +``` **PassportForWork** Root node for PassportForWork configuration service provider. diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 18c2823552..acf05925b9 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -42,9 +42,25 @@ The Policy configuration service provider has the following sub-categories: > - **./Vendor/MSFT/Policy/Config/_AreaName/PolicyName_** to configure the policy. > - **./Vendor/MSFT/Policy/Result/_AreaName/PolicyName_** to get the result. -The following diagram shows the Policy configuration service provider in tree format as used by both Open Mobile Alliance Device Management (OMA DM) and OMA Client Provisioning. +The following shows the Policy configuration service provider in tree format as used by both Open Mobile Alliance Device Management (OMA DM) and OMA Client Provisioning. -![policy csp diagram.](images/provisioning-csp-policy.png) +```console +./Vendor/MSFT +Policy +-------Config +----------AreaName +-------------PolicyName +-------Result +----------AreaName +-------------PolicyName +-------ConfigOperations +----------ADMXInstall +-------------AppName +----------------Policy +------------------UniqueID +----------------Preference +------------------UniqueID +``` **./Vendor/MSFT/Policy** diff --git a/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md b/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md index d86682733e..644cc93fd2 100644 --- a/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md +++ b/windows/client-management/mdm/policy-csp-admx-controlpaneldisplay.md @@ -1551,7 +1551,8 @@ ADMX Info: Home - cross mark + No + No Pro diff --git a/windows/client-management/mdm/pxlogical-csp.md b/windows/client-management/mdm/pxlogical-csp.md index e2d40a822a..1b7b94e690 100644 --- a/windows/client-management/mdm/pxlogical-csp.md +++ b/windows/client-management/mdm/pxlogical-csp.md @@ -19,15 +19,56 @@ The PXLOGICAL configuration service provider is used to add, remove, or modify W > **Note**   This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_NETWORKING\_ADMIN capabilities to be accessed from a network configuration application. -  -The following diagram shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for initial bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider. +The following shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for initial bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider. -![pxlogical csp (cp) (initial bootstrapping).](images/provisioning-csp-pxlogical-cp.png) +```console +PXLOGICAL +----DOMAIN +----NAME +----PORT +-------PORTNBR +-------SERVICE +----PUSHENABLED +----PROXY-ID +----TRUST +----PXPHYSICAL +-------DOMAIN +-------PHYSICAL-PROXY-ID +-------PORT +---------PORTNBR +---------SERVICE +-------PUSHENABLED +-------PXADDR +-------PXADDRTYPE +-------TO-NAPID +``` -The following diagram shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for updating the bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider. -![pxlogical csp (cp) (update bootstrapping).](images/provisioning-csp-pxlogical-cp-2.png) +The following shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for updating the bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider. + +```console +PXLOGICAL +--PROXY-ID +----DOMAIN +----NAME +----PORT +-------PORTNBR +-------SERVICE +----PUSHENABLED +----TRUST +----PXPHYSICAL +-------PHYSICAL-PROXY-ID +----------DOMAIN +----------PORT +-------------PORTNBR +-------------SERVICE +----------PUSHENABLED +----------PXADDR +----------PXADDRTYPE +----------TO-NAPID +``` + **PXPHYSICAL** Defines a group of logical proxy settings. @@ -37,7 +78,7 @@ The element's mwid attribute is a Microsoft provisioning XML attribute, and is o **DOMAIN** Specifies the domain associated with the proxy (for example, "\*.com"). -A Windows device supports only one proxy that does not have a DOMAIN parameter, or has an empty DOMAIN value. That is, the device only supports one default proxy. All other proxy configurations must have a DOMAIN parameter with a non-empty value. A query of this parameter returns a semicolon delimited string of all domains associated with the proxy. +A Windows device supports only one proxy that does not have a DOMAIN parameter, or has an empty DOMAIN value. That is, the device only supports one default proxy. All other proxy configurations must have a DOMAIN parameter with a non-empty value. A query of this parameter returns a semicolon-delimited string of all domains associated with the proxy. **NAME** Specifies the name of the logical proxy. diff --git a/windows/client-management/mdm/securitypolicy-csp.md b/windows/client-management/mdm/securitypolicy-csp.md index 4ffdbad557..fbc7a1ec31 100644 --- a/windows/client-management/mdm/securitypolicy-csp.md +++ b/windows/client-management/mdm/securitypolicy-csp.md @@ -23,9 +23,13 @@ The SecurityPolicy configuration service provider is used to configure security For the SecurityPolicy CSP, you cannot use the Replace command unless the node already exists. -The following diagram shows the SecurityPolicy configuration service provider management object in tree format as used by both OMA DM and OMA Client Provisioning. +The following shows the SecurityPolicy configuration service provider management object in tree format as used by both OMA DM and OMA Client Provisioning. -![securitypolicy csp (dm,cp).](images/provisioning-csp-securitypolicy-dmandcp.png) +```console +./Vendor/MSFT +SecurityPolicy +----PolicyID +``` ***PolicyID*** Defines the security policy identifier as a decimal value. @@ -48,7 +52,7 @@ The following security policies are supported.

4104

-

Hex:1008

+

Hex: 1008

TPS Policy

This setting indicates whether mobile operators can be assigned the Trusted Provisioning Server (TPS) SECROLE_OPERATOR_TPS role.

Default value: 1

@@ -58,7 +62,7 @@ The following security policies are supported.

4105

-

Hex:1009

+

Hex: 1009

Message Authentication Retry Policy

This setting specifies the maximum number of times the user is allowed to try authenticating a Wireless Application Protocol (WAP) PIN-signed message.

Default value: 3

@@ -66,7 +70,7 @@ The following security policies are supported.

4108

-

Hex:100c

+

Hex: 100c

Service Loading Policy

This setting indicates whether SL messages are accepted, by specifying the security roles that can accept SL messages. An SL message downloads new services or provisioning XML to the device.

Default value: 256 (SECROLE_KNOWN_PPG)

diff --git a/windows/client-management/mdm/vpn-csp.md b/windows/client-management/mdm/vpn-csp.md index 42a6882673..80121f22ea 100644 --- a/windows/client-management/mdm/vpn-csp.md +++ b/windows/client-management/mdm/vpn-csp.md @@ -23,7 +23,7 @@ The VPN configuration service provider allows the MDM server to configure the VP Important considerations: -- For a VPN that requires a client certificate, the server must first enroll the needed client certificate before deploying a VPN profile to ensure that there is a functional VPN profile at the device. This is particularly critical for forced tunnel VPN. +- For a VPN that requires a client certificate, the server must first enroll the needed client certificate before deploying a VPN profile to ensure that there is a functional VPN profile at the device. This is critical for forced tunnel VPN. - VPN configuration commands must be wrapped with an Atomic command as shown in the example below. @@ -31,9 +31,61 @@ Important considerations: - For the VPN CSP, you cannot use the Replace command unless the node already exists. -The following diagram shows the VPN configuration service provider in tree format. +The following shows the VPN configuration service provider in tree format. -![provisioning\-csp\-vpnimg.](images/provisioning-csp-vpn.png) +```console +./Vendor/MSFT +VPN +-----ProfileName +---------Server +---------TunnelType +---------ThirdParty +-------------Name +-------------AppID +-------------CustomStoreURL +-------------CustomConfiguration +---------RoleGroup +---------Authentication +-------------Method +-------------Certificate +---------------Issuer +---------------EKU +---------------CacheLifeTimeProtectedCert +-------------MultiAuth +---------------StartURL +---------------EndURL +-------------EAP +---------Proxy +-------------Automatic +-------------Manual +---------------Server +---------------Port +-------------BypassProxyforLocal +---------SecuredResources +-------------AppPublisherNameList +---------------AppPublisherName +-------------AppAllowedList +---------------AppAllowedList +-------------NetworkAllowedList +---------------NetworkAllowedList +-------------NameSapceAllowedList +---------------NameSapceAllowedList +-------------ExcudedAppList +---------------ExcudedAppList +-------------ExcludedNetworkList +---------------ExcludedNetworkList +-------------ExcludedNameSpaceList +---------------ExcludedNameSpaceList +-------------DNSSuffixSearchList +---------------DNSSuffixSearchList +---------Policies +-------------RememberCredentials +-------------SplitTunnel +-------------BypassforLocal +-------------TrustedNetworkDetection +-------------ConnectionType +---------DNSSuffix +``` ***ProfileName*** Unique alpha numeric Identifier for the profile. The profile name must not include a forward slash (/). @@ -48,12 +100,12 @@ Supported operations are Get, Add, and Replace. Value type is chr. Some examples are 208.23.45.130 or vpn.contoso.com. **TunnelType** -Optional, but required when deploying a 3rd party IKEv2 VPN profile. Only a value of IKEv2 is supported for this release. +Optional, but required when deploying a third-party IKEv2 VPN profile. Only a value of IKEv2 is supported for this release. Value type is chr. Supported operations are Get and Add. **ThirdParty** -Optional, but required if deploying 3rd party SSL-VPN plugin profile. Defines a group of setting applied to SSL-VPN profile provisioning. +Optional, but required if deploying third-party SSL-VPN plugin profile. Defines a group of setting applied to SSL-VPN profile provisioning. Supported operations are Get and Add. @@ -73,17 +125,17 @@ Valid values: - Checkpoint Mobile VPN **ThirdParty/AppID** -Optional, but required when deploying a 3rd party SSL-VPN plugin app from a private enterprise storefront. This is the ProductID associated with the store application. The client will use this ProductID to ensure that only the enterprise approved plugin is initialized. +Optional, but required when deploying a third-party SSL-VPN plugin app from a private enterprise storefront. This is the ProductID associated with the store application. The client will use this ProductID to ensure that only the enterprise approved plugin is initialized. Value type is chr. Supported operations are Get, Add, Replace, and Delete. **ThirdParty/CustomStoreURL** -Optional, but required if an enterprise is deploying a 3rd party SSL-VPN plugin app from the private enterprise storefront. This node specifies the URL of the 3rd party SSL-VPN plugin app. +Optional, but required if an enterprise is deploying a third-party SSL-VPN plugin app from the private enterprise storefront. This node specifies the URL of the third-party SSL-VPN plugin app. Value type is chr. Supported operations are Get, Add, Replace, and Delete. **ThirdParty/CustomConfiguration** -Optional. This is an HTML encoded XML blob for SSL-VPN plugin specific configuration that is deployed to the device to make it available for SSL-VPN plugins. +Optional. This is an HTML encoded XML blob for SSL-VPN plugin-specific configuration that is deployed to the device to make it available for SSL-VPN plugins. Value type is char. Supported operations are Get, Add, Replace, and Delete. @@ -98,7 +150,7 @@ Optional node for ThirdParty VPN profiles, but required for IKEv2. This is a col Supported operations are Get and Add. **Authentication/Method** -Required for IKEv2 profiles and optional for third party profiles. This specifies the authentication provider to use for VPN client authentication. Only the EAP method is supported for IKEv2 profiles. +Required for IKEv2 profiles and optional for third-party profiles. This specifies the authentication provider to use for VPN client authentication. Only the EAP method is supported for IKEv2 profiles. Supported operations are Get and Add. @@ -114,7 +166,7 @@ Optional node. A collection of nodes that enables simpler authentication experie Supported operations are Get and Add. **Authentication/Certificate/Issuer** -Optional. Filters out the installed certificates with private keys stored in registry or TPM. This can be used in conjunction with EKU for more granular filtering. +Optional. Filters out the installed certificates with private keys stored in registry or TPM. This can be used with EKU for more granular filtering. Value type is chr. Supported operations are Get, Add, Delete, and Replace. @@ -123,7 +175,7 @@ Value type is chr. Supported operations are Get, Add, Delete, and Replace.   **Authentication/Certificate/EKU** -Optional. This Extended Key Usage (EKU) element is used to filter out the installed certificates with private keys stored in the registry or TPM. You can use this in conjunction with ISSUER for a more granular filtering. +Optional. This Extended Key Usage (EKU) element is used to filter out the installed certificates with private keys stored in the registry or TPM. You can use this with ISSUER for a more granular filtering. Value type is chr. Supported operations are Get, Add, Delete, and Replace. @@ -175,16 +227,16 @@ Default is False. Optional node. A collection of configuration objects that define the inclusion resource lists for what can be secured over VPN. Allowed lists are applied only when Policies/SplitTunnel element is set to True. VPN exclusions are not supported.. **SecuredResources/AppAllowedList/AppAllowedList** -Optional. Specifies one or more ProductIDs for the enterprise line of business applications built for Windows. When this element is defined, then all traffic sourced from specified apps will be secured over VPN (assuming protected networks defined allows access). They will not be able to connect directly bypassing the VPN connection. When the profile is auto-triggered, VPN is triggered automatically by these apps. +Optional. Specifies one or more ProductIDs for the enterprise line-of-business applications built for Windows. When this element is defined, then all traffic sourced from specified apps will be secured over VPN (assuming protected networks defined allows access). They will not be able to connect directly bypassing the VPN connection. When the profile is autotriggered, VPN is triggered automatically by these apps. -Supported operations are Get, Add, Replace and Delete. +Supported operations are Get, Add, Replace, and Delete. Value type is chr. Examples are {F05DC613-E223-40AD-ABA9-CCCE04277CD9} and ContosoApp.ContosoCorp\_jlsnulm3s397u. **SecuredResources/NetworkAllowedList/NetworkAllowedList** -Optional, but required when Policies/SplitTunnel is set to true for IKEv2 profile. Specifies one or more IP ranges that you want secured over VPN. Applications connecting to protected resources that match this list will be secured over VPN. Otherwise, they’ll continue to connect directly. The IP ranges are defined in the format 10.0.0.0/8. When the profile is auto-triggered, the VPN is triggered automatically by these protected networks. +Optional, but required when Policies/SplitTunnel is set to true for IKEv2 profile. Specifies one or more IP ranges that you want secured over VPN. Applications connecting to protected resources that match this list will be secured over VPN. Otherwise, they’ll continue to connect directly. The IP ranges are defined in the format 10.0.0.0/8. When the profile is autotriggered, the VPN is triggered automatically by these protected networks. Supported operations are Get, Add, Replace, and Delete. @@ -202,7 +254,7 @@ Value type is chr. An example is \*.corp.contoso.com. **SecuredResources/ExcluddedAppList/ExcludedAppList** -Optional. Specifies one or more ProductIDs for enterprise line of business applications built for Windows. When the element is defined, these apps will never use VPN. They will connect directly and bypass the VPN connection. +Optional. Specifies one or more ProductIDs for enterprise line-of-business applications built for Windows. When the element is defined, these apps will never use VPN. They will connect directly and bypass the VPN connection. Supported operations are Get, Add, Replace, and Delete. diff --git a/windows/client-management/mdm/w4-application-csp.md b/windows/client-management/mdm/w4-application-csp.md index e7321b1888..de649eb77b 100644 --- a/windows/client-management/mdm/w4-application-csp.md +++ b/windows/client-management/mdm/w4-application-csp.md @@ -21,11 +21,17 @@ The default security roles are defined in the root characteristic, and map to ea > **Note**   This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_CSP\_W4\_APPLICATION capabilities to be accessed from a network configuration application. -  +The following shows the configuration service provider in tree format as used by OMA Client Provisioning. -The following diagram shows the configuration service provider in tree format as used by OMA Client Provisioning. - -![w4 application csp (cp).](images/provisioning-csp-w4-application-cp.png) +```console +APPLICATION +----APPID +----NAME +----TO-PROXY +----TO-NAPID +----ADDR +----MS +``` **APPID** Required. This parameter takes a string value. The only supported value for configuring MMS is "w4". diff --git a/windows/client-management/mdm/w7-application-csp.md b/windows/client-management/mdm/w7-application-csp.md index 7aaa801796..7745749716 100644 --- a/windows/client-management/mdm/w7-application-csp.md +++ b/windows/client-management/mdm/w7-application-csp.md @@ -19,11 +19,37 @@ The APPLICATION configuration service provider that has an APPID of w7 is used f > **Note**  This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID\_CAP\_DEVICE\_MANAGEMENT\_ADMIN capabilities to be accessed from a network configuration application. -  -The following image shows the configuration service provider in tree format as used by OMA Client Provisioning. +The following shows the configuration service provider in tree format as used by OMA Client Provisioning. -![w7 application csp (dm).](images/provisioning-csp-w7-application-dm.png) +```console +APPLICATION +---APPADDR +------ADDR +------ADDRTYPE +------PORT +---------PORTNBR +---APPAUTH +------AAUTHDATA +------AAUTHLEVEL +------AAUTHNAME +------AAUTHSECRET +------AAUTHTYPE +---AppID +---BACKCOMPATRETRYDISABLED +---CONNRETRYFREQ +---DEFAULTENCODING +---INIT +---INITIALBACKOFTIME +---MAXBACKOFTIME +---NAME +---PROTOVER +---PROVIDER-ID +---ROLE +---TO-NAPID +---USEHWDEVID +---SSLCLIENTCERTSEARCHCRITERIA +``` > **Note**   All parm names and characteristic types are case sensitive and must use all uppercase. Both APPSRV and CLIENT credentials must be provided in provisioning XML. diff --git a/windows/client-management/mdm/wifi-csp.md b/windows/client-management/mdm/wifi-csp.md index e867ae66ef..e6864ea72c 100644 --- a/windows/client-management/mdm/wifi-csp.md +++ b/windows/client-management/mdm/wifi-csp.md @@ -29,9 +29,22 @@ Programming considerations: - For the WiFi CSP, you cannot use the Replace command unless the node already exists. - Using Proxyis only supported in Windows 10 Mobile. Using this configuration in Windows 10 for desktop editions (Home, Pro, Enterprise, and Education) will result in failure. -The following image shows the WiFi configuration service provider in tree format. +The following shows the WiFi configuration service provider in tree format. + +```console +./Device/Vendor/MSFT +or +./User/Vendor/MSFT +WiFi +---Profile +------SSID +---------WlanXML +---------Proxy +---------ProxyPacUrl +---------ProxyWPAD +---------WiFiCost +``` -![wi-fi csp diagram.](images/provisioning-csp-wifi.png) The following list shows the characteristics and parameters. diff --git a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md index 4f22b0b48c..bba543313e 100644 --- a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md +++ b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md @@ -17,9 +17,25 @@ ms.date: 11/01/2017 The Windows Defender Advanced Threat Protection (WDATP) configuration service provider (CSP) allows IT Admins to onboard, determine configuration and health status, and offboard endpoints for WDATP. -The following diagram shows the WDATP configuration service provider in tree format as used by the Open Mobile Alliance (OMA) Device Management (DM). +The following shows the WDATP configuration service provider in tree format as used by the Open Mobile Alliance (OMA) Device Management (DM). -![windowsadvancedthreatprotection csp diagram.](images/provisioning-csp-watp.png) +```console +./Device/Vendor/MSFT +WindowsAdvancedThreatProtection +----Onboarding +----HealthState +--------LastConnected +--------SenseIsRunning +--------OnboardingState +--------OrgId +----Configuration +--------SampleSharing +--------TelemetryReportingFrequency +----Offboarding +----DeviceTagging +--------Group +--------Criticality +``` The following list describes the characteristics and parameters. diff --git a/windows/client-management/mdm/wmi-providers-supported-in-windows.md b/windows/client-management/mdm/wmi-providers-supported-in-windows.md index 2fe71b5e76..7dfbe89239 100644 --- a/windows/client-management/mdm/wmi-providers-supported-in-windows.md +++ b/windows/client-management/mdm/wmi-providers-supported-in-windows.md @@ -86,19 +86,19 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_BrowserSecurityZones -cross mark +Yes MDM_BrowserSettings -cross mark +Yes MDM_Certificate -cross mark +Yes MDM_CertificateEnrollment -cross mark +Yes MDM_Client @@ -106,7 +106,7 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_ConfigSetting -cross mark +Yes MDM_DeviceRegistrationInfo @@ -114,11 +114,11 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_EASPolicy -cross mark +Yes MDM_MgMtAuthority -cross mark +Yes MDM_MsiApplication @@ -138,7 +138,7 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_Restrictions -cross mark +Yes MDM_RestrictionsUser @@ -146,7 +146,7 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_SecurityStatus -cross mark +Yes MDM_SideLoader @@ -158,11 +158,11 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_Updates -cross mark +Yes MDM_VpnApplicationTrigger -cross mark +Yes MDM_VpnConnection @@ -174,27 +174,27 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw MDM_WirelessProfile -cross mark +Yes MDM_WirelesssProfileXML -cross mark +Yes MDM_WNSChannel -cross mark +Yes MDM_WNSConfiguration -cross mark +Yes MSFT_NetFirewallProfile -cross mark +Yes MSFT_VpnConnection -cross mark +Yes SoftwareLicensingProduct @@ -213,16 +213,16 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw | Class | Test completed in Windows 10 for desktop | |--------------------------------------------------------------------------|------------------------------------------| -| [**wpcappoverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcgameoverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcgamessettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcrating**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | +| [**wpcappoverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcgameoverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcgamessettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcrating**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | | [**wpcRatingsDescriptor**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | | -| [**wpcratingssystem**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcsystemsettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcurloverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcusersettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | -| [**wpcwebsettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | ![cross mark.](images/checkmark.png) | +| [**wpcratingssystem**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcsystemsettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcurloverride**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcusersettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | +| [**wpcwebsettings**](/windows/win32/parcon/parental-controls-wmi-provider-schema) | Yes | @@ -232,17 +232,17 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw |--------------------------------------------------------------------------|------------------------------------------| [**Win32\_1394Controller**](/windows/win32/cimwin32prov/win32-1394controller) | [**Win32\_BaseBoard**](/windows/win32/cimwin32prov/win32-baseboard) | -[**Win32\_Battery**](/windows/win32/cimwin32prov/win32-battery) | ![cross mark.](images/checkmark.png) -[**Win32\_BIOS**](/windows/win32/cimwin32prov/win32-bios) | ![cross mark.](images/checkmark.png) +[**Win32\_Battery**](/windows/win32/cimwin32prov/win32-battery) | Yes +[**Win32\_BIOS**](/windows/win32/cimwin32prov/win32-bios) | Yes [**Win32\_CDROMDrive**](/windows/win32/cimwin32prov/win32-cdromdrive) | -[**Win32\_ComputerSystem**](/windows/win32/cimwin32prov/win32-computersystem) | ![cross mark.](images/checkmark.png) -[**Win32\_ComputerSystemProduct**](/windows/win32/cimwin32prov/win32-computersystemproduct) | ![cross mark.](images/checkmark.png) -[**Win32\_CurrentTime**](/previous-versions/windows/desktop/wmitimepprov/win32-currenttime) | ![cross mark.](images/checkmark.png) +[**Win32\_ComputerSystem**](/windows/win32/cimwin32prov/win32-computersystem) | Yes +[**Win32\_ComputerSystemProduct**](/windows/win32/cimwin32prov/win32-computersystemproduct) | Yes +[**Win32\_CurrentTime**](/previous-versions/windows/desktop/wmitimepprov/win32-currenttime) | Yes [**Win32\_Desktop**](/windows/win32/cimwin32prov/win32-desktop) | -[**Win32\_DesktopMonitor**](/windows/win32/cimwin32prov/win32-desktopmonitor) |![cross mark.](images/checkmark.png) -[**Win32\_DiskDrive**](/windows/win32/cimwin32prov/win32-diskdrive) | ![cross mark.](images/checkmark.png) +[**Win32\_DesktopMonitor**](/windows/win32/cimwin32prov/win32-desktopmonitor) |Yes +[**Win32\_DiskDrive**](/windows/win32/cimwin32prov/win32-diskdrive) | Yes [**Win32\_DiskPartition**](/windows/win32/cimwin32prov/win32-diskpartition) | -[**Win32\_DisplayConfiguration**](/previous-versions//aa394137(v=vs.85)) | ![cross mark.](images/checkmark.png) +[**Win32\_DisplayConfiguration**](/previous-versions//aa394137(v=vs.85)) | Yes [**Win32\_DMAChannel**](/windows/win32/cimwin32prov/win32-dmachannel) | [**Win32\_DriverVXD**](/previous-versions//aa394141(v=vs.85)) | [**Win32\_EncryptableVolume**](/windows/win32/secprov/win32-encryptablevolume) | @@ -252,23 +252,23 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw [**Win32\_IRQResource**](/windows/win32/cimwin32prov/win32-irqresource) | [**Win32\_Keyboard**](/windows/win32/cimwin32prov/win32-keyboard) | [**Win32\_LoadOrderGroup**](/windows/win32/cimwin32prov/win32-loadordergroup) | -[**Win32\_LocalTime**](/previous-versions/windows/desktop/wmitimepprov/win32-localtime) | ![cross mark.](images/checkmark.png) +[**Win32\_LocalTime**](/previous-versions/windows/desktop/wmitimepprov/win32-localtime) | Yes [**Win32\_LoggedOnUser**](/windows/win32/cimwin32prov/win32-loggedonuser) | -[**Win32\_LogicalDisk**](/windows/win32/cimwin32prov/win32-logicaldisk) | ![cross mark.](images/checkmark.png) +[**Win32\_LogicalDisk**](/windows/win32/cimwin32prov/win32-logicaldisk) | Yes [**Win32\_MotherboardDevice**](/windows/win32/cimwin32prov/win32-motherboarddevice) | -[**Win32\_NetworkAdapter**](/windows/win32/cimwin32prov/win32-networkadapter) | ![cross mark.](images/checkmark.png) +[**Win32\_NetworkAdapter**](/windows/win32/cimwin32prov/win32-networkadapter) | Yes [**Win32\_NetworkAdapterConfiguration**](/windows/win32/cimwin32prov/win32-networkadapterconfiguration) | [**Win32\_NetworkClient**](/windows/win32/cimwin32prov/win32-networkclient) | [**Win32\_NetworkLoginProfile**](/windows/win32/cimwin32prov/win32-networkloginprofile) | [**Win32\_NetworkProtocol**](/windows/win32/cimwin32prov/win32-networkprotocol) | [**Win32\_NTEventlogFile**](/previous-versions/windows/desktop/legacy/aa394225(v=vs.85)) | -[**Win32\_OperatingSystem**](/windows/win32/cimwin32prov/win32-operatingsystem) | ![cross mark.](images/checkmark.png) +[**Win32\_OperatingSystem**](/windows/win32/cimwin32prov/win32-operatingsystem) | Yes [**Win32\_OSRecoveryConfiguration**](/windows/win32/cimwin32prov/win32-osrecoveryconfiguration) | [**Win32\_PageFileSetting**](/windows/win32/cimwin32prov/win32-pagefilesetting) | [**Win32\_ParallelPort**](/windows/win32/cimwin32prov/win32-parallelport) | [**Win32\_PCMCIAController**](/windows/win32/cimwin32prov/win32-pcmciacontroller) | [**Win32\_PhysicalMedia**](/previous-versions/windows/desktop/cimwin32a/win32-physicalmedia) | -[**Win32\_PhysicalMemory**](/windows/win32/cimwin32prov/win32-physicalmemory) | ![cross mark.](images/checkmark.png) +[**Win32\_PhysicalMemory**](/windows/win32/cimwin32prov/win32-physicalmemory) | Yes [**Win32\_PnPDevice**](/windows/win32/cimwin32prov/win32-pnpdevice) | [**Win32\_PnPEntity**](/windows/win32/cimwin32prov/win32-pnpentity) | [**Win32\_PointingDevice**](/windows/win32/cimwin32prov/win32-pointingdevice) | @@ -277,25 +277,25 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw [**Win32\_POTSModem**](/windows/win32/cimwin32prov/win32-potsmodem) | [**Win32\_Printer**](/windows/win32/cimwin32prov/win32-printer) | [**Win32\_PrinterConfiguration**](/windows/win32/cimwin32prov/win32-printerconfiguration) | -[**Win32\_Processor**](/windows/win32/cimwin32prov/win32-processor) | ![cross mark.](images/checkmark.png) -[**Win32\_QuickFixEngineering**](/windows/win32/cimwin32prov/win32-quickfixengineering) | ![cross mark.](images/checkmark.png) +[**Win32\_Processor**](/windows/win32/cimwin32prov/win32-processor) | Yes +[**Win32\_QuickFixEngineering**](/windows/win32/cimwin32prov/win32-quickfixengineering) | Yes [**Win32\_Registry**](/windows/win32/cimwin32prov/win32-registry) | [**Win32\_SCSIController**](/windows/win32/cimwin32prov/win32-scsicontroller) | [**Win32\_SerialPort**](/windows/win32/cimwin32prov/win32-serialport) | [**Win32\_SerialPortConfiguration**](/windows/win32/cimwin32prov/win32-serialportconfiguration) | [**Win32\_ServerFeature**](/windows/win32/wmisdk/win32-serverfeature) | -[**Win32\_Service**](/windows/win32/cimwin32prov/win32-service) | ![cross mark.](images/checkmark.png) -[**Win32\_Share**](/windows/win32/cimwin32prov/win32-share) | ![cross mark.](images/checkmark.png) +[**Win32\_Service**](/windows/win32/cimwin32prov/win32-service) | Yes +[**Win32\_Share**](/windows/win32/cimwin32prov/win32-share) | Yes [**Win32\_SoundDevice**](/windows/win32/cimwin32prov/win32-sounddevice) | [**Win32\_SystemAccount**](/windows/win32/cimwin32prov/win32-systemaccount) | -[**Win32\_SystemBIOS**](/windows/win32/cimwin32prov/win32-systembios) | ![cross mark.](images/checkmark.png) +[**Win32\_SystemBIOS**](/windows/win32/cimwin32prov/win32-systembios) | Yes [**Win32\_SystemDriver**](/windows/win32/cimwin32prov/win32-systemdriver) | -[**Win32\_SystemEnclosure**](/windows/win32/cimwin32prov/win32-systemenclosure) | ![cross mark.](images/checkmark.png) +[**Win32\_SystemEnclosure**](/windows/win32/cimwin32prov/win32-systemenclosure) | Yes [**Win32\_TapeDrive**](/windows/win32/cimwin32prov/win32-tapedrive) | -[**Win32\_TimeZone**](/windows/win32/cimwin32prov/win32-timezone) | ![cross mark.](images/checkmark.png) +[**Win32\_TimeZone**](/windows/win32/cimwin32prov/win32-timezone) | Yes [**Win32\_UninterruptiblePowerSupply**](/previous-versions//aa394503(v=vs.85)) | [**Win32\_USBController**](/windows/win32/cimwin32prov/win32-usbcontroller) | -[**Win32\_UTCTime**](/previous-versions/windows/desktop/wmitimepprov/win32-utctime) | ![cross mark.](images/checkmark.png) +[**Win32\_UTCTime**](/previous-versions/windows/desktop/wmitimepprov/win32-utctime) | Yes [**Win32\_VideoController**](/windows/win32/cimwin32prov/win32-videocontroller) | **Win32\_WindowsUpdateAgentVersion** |