diff --git a/education/windows/images/mc-ee-video-icon.png b/education/windows/images/mc-ee-video-icon.png
new file mode 100644
index 0000000000..61c8a0f681
Binary files /dev/null and b/education/windows/images/mc-ee-video-icon.png differ
diff --git a/education/windows/images/mcee-icon.png b/education/windows/images/mcee-icon.png
new file mode 100644
index 0000000000..32ed1cf134
Binary files /dev/null and b/education/windows/images/mcee-icon.png differ
diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md
index 0e3dfcd0ba..f0c3df0aea 100644
--- a/education/windows/school-get-minecraft.md
+++ b/education/windows/school-get-minecraft.md
@@ -10,7 +10,7 @@ author: trudyha
searchScope:
- Store
ms.author: trudyha
-ms.date: 10/13/2017
+ms.date: 1/5/2018
---
# For IT administrators - get Minecraft: Education Edition
@@ -152,7 +152,7 @@ You can install the app on your PC. This gives you a chance to test the app and
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**, and then click **Install**.
- 
+
3. Click **Install**.
diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md
index 3999707536..59d779962f 100644
--- a/education/windows/set-up-school-pcs-technical.md
+++ b/education/windows/set-up-school-pcs-technical.md
@@ -9,7 +9,7 @@ ms.pagetype: edu
ms.localizationpriority: high
author: CelesteDG
ms.author: celested
-ms.date: 12/12/2017
+ms.date: 02/02/2018
---
# Technical reference for the Set up School PCs app
diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md
index 7cf6b0d940..14bbe54561 100644
--- a/education/windows/teacher-get-minecraft.md
+++ b/education/windows/teacher-get-minecraft.md
@@ -10,8 +10,7 @@ author: trudyha
searchScope:
- Store
ms.author: trudyha
-ms.date: 10/13/2017
----
+ms.date: 1/5/2018
# For teachers - get Minecraft: Education Edition
@@ -41,9 +40,9 @@ Learn how teachers can get and distribute Minecraft: Education Edition.
6. **Minecraft: Education Edition** opens in the Microsoft Store for Education. Select **Get the app**. This places **Minecraft: Education Edition** in your Microsoft Store inventory.
- 
+
-If you need additional licenses for **Minecraft: Education Edition**, see [Purchase additional licenses](https://technet.microsoft.com/edu/windows/education-scenarios-store-for-business#purchase-additional-licenses).
+If you need additional licenses for **Minecraft: Education Edition**, see [Purchase additional licenses](https://docs.microsoft.com/education/windows/education-scenarios-store-for-business#purchase-additional-licenses).
## Distribute Minecraft
@@ -53,7 +52,7 @@ After Minecraft: Education Edition is added to your Microsoft Store for Educatio
- You can assign the app to others.
- You can download the app to distribute.
-
+
### Install for me
You can install the app on your PC. This gives you a chance to work with the app before using it with your students.
@@ -61,7 +60,7 @@ You can install the app on your PC. This gives you a chance to work with the app
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**, and then click **Install**.
- 
+
3. Click **Install**.
@@ -72,7 +71,7 @@ Enter email addresses for your students, and each student will get an email with
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**.
- 
+
3. Click **Invite people**.
diff --git a/store-for-business/acquire-apps-microsoft-store-for-business.md b/store-for-business/acquire-apps-microsoft-store-for-business.md
index 181fb19436..3c59ec92f0 100644
--- a/store-for-business/acquire-apps-microsoft-store-for-business.md
+++ b/store-for-business/acquire-apps-microsoft-store-for-business.md
@@ -56,9 +56,9 @@ There are a couple of things we need to know when you pay for apps. You can add
6. If you don’t have a payment method saved in **Billing - Payment methods**, we will prompt you for one.
7. Add your credit card or debit card info, and click **Next**. Your card info is saved as a payment option on **Billing - Payment methods**.
-You’ll also need to have your business address saved on ****Billing - Account profile***. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://docs.microsoft.com/microsoft-store/update-microsoft-store-for-business-account-settings#organization-tax-information).
+You’ll also need to have your business address saved on **Billing - Account profile**. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://docs.microsoft.com/microsoft-store/update-microsoft-store-for-business-account-settings#organization-tax-information).
-Microsoft Store adds the app to your inventory. From **Inventory** or **Apps & software**, you can:
+Microsoft Store adds the app to your inventory. From **Products & services**, you can:
- Distribute the app: add to private store, or assign licenses
- View app licenses: review current licenses, reclaim and reassign licenses
- View app details: review the app details page and purchase more licenses
diff --git a/store-for-business/add-profile-to-devices.md b/store-for-business/add-profile-to-devices.md
index cee7f01a25..d63ff3800d 100644
--- a/store-for-business/add-profile-to-devices.md
+++ b/store-for-business/add-profile-to-devices.md
@@ -7,7 +7,7 @@ ms.sitesec: library
ms.pagetype: store
author: TrudyHa
ms.author: TrudyHa
-ms.date: 1/4/2018
+ms.date: 1/29/2018
ms.localizationpriority: high
---
@@ -20,7 +20,7 @@ Windows AutoPilot Deployment Program simplifies device set up for IT Admins. For
Watch this video to learn more about Windows AutoPilot in Micrsoft Store for Business.
-
+[!video https://www.microsoft.com/en-us/videoplayer/embed/3b30f2c2-a3e2-4778-aa92-f65dbc3ecf54?autoplay=false]
## What is Windows AutoPilot Deployment Program?
In Microsoft Store for Business, you can manage devices for your organization and apply an *AutoPilot deployment profile* to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device.
diff --git a/store-for-business/education/TOC.md b/store-for-business/education/TOC.md
index 63f52ca1ce..f5ff057e17 100644
--- a/store-for-business/education/TOC.md
+++ b/store-for-business/education/TOC.md
@@ -26,6 +26,8 @@
### [Manage access to private store](/microsoft-store/manage-access-to-private-store?toc=/microsoft-store/education/toc.json)
### [Manage private store settings](/microsoft-store/manage-private-store-settings?toc=/microsoft-store/education/toc.json)
### [Configure MDM provider](/microsoft-store/configure-mdm-provider-microsoft-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Manage Windows device deployment with Windows AutoPilot Deployment](/microsoft-store/add-profile-to-devices?toc=/microsoft-store/education/toc.json)
+### [Microsoft Store for Business and Education PowerShell module - preview](/microsoft-store/microsoft-store-for-business-education-powershell-module?toc=/microsoft-store/education/toc.json)
## [Device Guard signing portal](/microsoft-store/device-guard-signing-portal?toc=/microsoft-store/education/toc.json)
### [Add unsigned app to code integrity policy](/microsoft-store/add-unsigned-app-to-code-integrity-policy?toc=/microsoft-store/education/toc.json)
### [Sign code integrity policy with Device Guard signing](/microsoft-store/sign-code-integrity-policy-with-device-guard-signing?toc=/microsoft-store/education/toc.json)
diff --git a/store-for-business/images/mc-ee-video-icon.png b/store-for-business/images/mc-ee-video-icon.png
new file mode 100644
index 0000000000..61c8a0f681
Binary files /dev/null and b/store-for-business/images/mc-ee-video-icon.png differ
diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md
index b214cbdc2a..1ac5a9f388 100644
--- a/windows/client-management/mdm/TOC.md
+++ b/windows/client-management/mdm/TOC.md
@@ -281,6 +281,8 @@
#### [SurfaceHub DDF file](surfacehub-ddf-file.md)
### [TPMPolicy CSP](tpmpolicy-csp.md)
#### [TPMPolicy DDF file](tpmpolicy-ddf-file.md)
+### [UEFI CSP](uefi-csp.md)
+#### [UEFI DDF file](uefi-ddf.md)
### [UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)
#### [UnifiedWriteFilter DDF file](unifiedwritefilter-ddf.md)
### [Update CSP](update-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 a72cf5ff8f..5a601e0ca8 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -7,7 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 12/05/2017
+ms.date: 02/02/2018
---
# Configuration service provider reference
@@ -2079,6 +2079,34 @@ Footnotes:
+
+[Uefi CSP](uefi-csp.md)
+
+
+
+
+
Home
+
Pro
+
Business
+
Enterprise
+
Education
+
Mobile
+
Mobile Enterprise
+
+
+
+
4
+
4
+
4
+
4
+
+
+
+
+
+
+
+
[UnifiedWriteFilter CSP](unifiedwritefilter-csp.md)
diff --git a/windows/client-management/mdm/dmclient-csp.md b/windows/client-management/mdm/dmclient-csp.md
index c48d6ddd3b..e69e71e093 100644
--- a/windows/client-management/mdm/dmclient-csp.md
+++ b/windows/client-management/mdm/dmclient-csp.md
@@ -13,6 +13,9 @@ ms.date: 11/01/2017
# DMClient 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.
+
The DMClient configuration service provider is used to specify additional enterprise-specific mobile device management configuration settings for identifying the device in the enterprise domain, security mitigation for certificate renewal, and server-triggered enterprise unenrollment.
The following diagram shows the DMClient configuration service provider in tree format.
@@ -257,6 +260,11 @@ Optional. Number of days after last sucessful sync to unenroll.
Supported operations are Add, Delete, Get, and Replace. Value type is integer.
+**Provider/*ProviderID*/AADSendDeviceToken**
+Device. Added in Windows 10 next major update. For AZure AD backed enrollments, this will cause the client to send a Device Token if the User Token can not be obtained.
+
+Supported operations are Add, Delete, Get, and Replace. Value type is bool.
+
**Provider/*ProviderID*/Poll**
Optional. Polling schedules must utilize the DMClient CSP. The Registry paths previously associated with polling using the Registry CSP are now deprecated.
@@ -690,19 +698,45 @@ Required. Added in Windows 10, version 1709. This node determines how long we wi
Supported operations are Get and Replace. Value type is integer.
**Provider/*ProviderID*/FirstSyncStatus/ServerHasFinishedProvisioning**
-Required. Added in Windows 10, version 1709. This node is set by the server to inform the UX that the server has finished provisioning the device. This was added so that the server can “change its mind" about what it needs to provision on the device. When this node is set, many other DM Client nodes will no longer be able to be changed. If this node is not True, the UX will consider the provisioning a failure. Once set to true, it would reject attempts to change it back to false with CFGMGR_E_COMMANDNOTALLOWED.
+Required. Added in Windows 10, version 1709. This node is set by the server to inform the UX that the server has finished provisioning the device. This was added so that the server can “change its mind" about what it needs to provision on the device. When this node is set, many other DM Client nodes will no longer be able to be changed. If this node is not True, the UX will consider the provisioning a failure. Once set to true, it would reject attempts to change it back to false with CFGMGR_E_COMMANDNOTALLOWED. This node applies to the per user expected policies and resources lists.
Supported operations are Get and Replace. Value type is boolean.
-**Provider/*ProviderID*/FirstSyncStatus/IsSyncDone**Required. Added in Windows 10, version 1709. This node, when doing a get, tells the server if the “First Syncs" are done and the device is fully provisioned. When doing a Set, this triggers the UX to override whatever state it is in and tell the user that the device is provisioned. It cannot be set from True to False (it will not change its mind on whether or not the sync is done), and it cannot be set from True to True (to prevent notifications from firing multiple times).
+**Provider/*ProviderID*/FirstSyncStatus/IsSyncDone**
+Required. Added in Windows 10, version 1709. This node, when doing a get, tells the server if the “First Syncs" are done and the device is fully provisioned. When doing a Set, this triggers the UX to override whatever state it is in and tell the user that the device is provisioned. It cannot be set from True to False (it will not change its mind on whether or not the sync is done), and it cannot be set from True to True (to prevent notifications from firing multiple times). This node only applies to the user MDM status page (on a per user basis).
Supported operations are Get and Replace. Value type is boolean.
**Provider/*ProviderID*/FirstSyncStatus/WasDeviceSuccessfullyProvisioned**
-Required. Added in Windows 10, version 1709. Integer node determining if a device was successfully provisioned. 0 is failure, 1 is success, 2 is in progress. Once the value is changed to 0 or 1, the value cannot be changed again. The client will change the value of success or failure and update the node. The server can, however, force a failure or success message to appear on the device by setting this value and then setting the IsSyncDone node to true.
+Required. Added in Windows 10, version 1709. Integer node determining if a device was successfully provisioned. 0 is failure, 1 is success, 2 is in progress. Once the value is changed to 0 or 1, the value cannot be changed again. The client will change the value of success or failure and update the node. The server can, however, force a failure or success message to appear on the device by setting this value and then setting the IsSyncDone node to true. This node only applies to the user MDM status page (on a per user basis).
Supported operations are Get and Replace. Value type is integer.
+**Provider/*ProviderID*/FirstSyncStatus/BlockInStatusPage**
+Required. Device Only. Added in Windows 10, next major update. This node determines whether or not the MDM progress page is blocking in the Azure AD joined or DJ++ case, as well as which remediation options are available.
+
+Supported operations are Get and Replace. Value type is integer.
+
+**Provider/*ProviderID*/FirstSyncStatus/AllowCollectLogsButton**
+Required. Added in Windows 10, next major update. This node decides whether or not the MDM progress page displays the Collect Logs button.
+
+Supported operations are Get and Replace. Value type is bool.
+
+**Provider/*ProviderID*/FirstSyncStatus/CustomErrorText**
+Required. Added in Windows 10, next major update. This node allows the MDM to set custom error text, detailing what the user needs to do in case of error.
+
+Supported operations are Add, Get, Delete, and Replace. Value type is string.
+
+**Provider/*ProviderID*/FirstSyncStatus/SkipDeviceStatusPage**
+Required. Device only. Added in Windows 10, next major update. This node decides wheter or not the MDM device progress page skips after Azure AD joined or Hybrid Azure AD joined in OOBE.
+
+Supported operations are Get and Replace. Value type is bool.
+
+**Provider/*ProviderID*/FirstSyncStatus/SkipUserStatusPage**
+Required. Device only. Added in Windows 10, next major update. This node decides wheter or not the MDM user progress page skips after Azure AD joined or DJ++ after user login.
+
+Supported operations are Get and Replace. Value type is bool.
+
**Provider/*ProviderID*/EnhancedAppLayerSecurity**
Required node. Added in Windows 10, version 1709.
diff --git a/windows/client-management/mdm/dmclient-ddf-file.md b/windows/client-management/mdm/dmclient-ddf-file.md
index 22082b40c3..51a46a8897 100644
--- a/windows/client-management/mdm/dmclient-ddf-file.md
+++ b/windows/client-management/mdm/dmclient-ddf-file.md
@@ -13,11 +13,14 @@ ms.date: 12/05/2017
# DMClient 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 **DMClient** configuration service provider. DDF files are used only with OMA DM provisioning XML.
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, version 1907.
+The XML below is for Windows 10, next major update.
``` syntax
@@ -28,7 +31,355 @@ The XML below is for Windows 10, version 1907.
1.2DMClient
- ./Vendor/MSFT
+ ./User/Vendor/MSFT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.microsoft/1.5/MDM/DMClient
+
+
+
+ Provider
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+ FirstSyncStatus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ExpectedPolicies
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to Policies the ISV expects to provision, delimited by the character L"\xF000" (the CSP_LIST_DELIMITER). This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ExpectedNetworkProfiles
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to Wi-Fi profiles and VPN profiles the ISV expects to provision, delimited by the character L"\xF000". This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ExpectedMSIAppPackages
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to App Packages the ISV expects to provision via EnterpriseDesktopAppManagement CSP, delimited by the character L"\xF000". The LocURI will be followed by a semicolon and a number, representing the amount of apps included in the App Package. We will not verify that number. E.G. ./User/Vendor/MSFT/EnterpriseDesktopAppManagement/MSI/ProductID1/Status;4"\xF000" ./User/Vendor/MSFT/EnterpriseDesktopAppManagement/MSI/ProductID2/Status;2 Which will represent that App Package ProductID1 contains 4 apps, whereas ProductID2 contains 2 apps. This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ExpectedModernAppPackages
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to App Packages the ISV expects to provision via EnterpriseModernAppManagement CSP, delimited by the character L"\xF000". The LocURI will be followed by a semicolon and a number, representing the amount of apps included in the App Package. We will not verify that number. E.G. ./Vendor/MSFT/EnterpriseModernAppManagement/AppManagement/AppStore/PackageFamilyName/PackageFullName/Name;4"\xF000" ./Vendor/MSFT/EnterpriseModernAppManagement/AppManagement/AppStore/PackageFamilyName/PackageFullName2/Name;2 Which will represent that App Package PackageFullName contains 4 apps, whereas PackageFullName2 contains 2 apps. This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ExpectedPFXCerts
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to certs the ISV expects to provision via ClientCertificateInstall CSP, delimited by the character L"\xF000" (the CSP_LIST_DELIMITER). This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ExpectedSCEPCerts
+
+
+
+
+
+
+
+ This node contains a list of LocURIs that refer to SCEP certs the ISV expects to provision via ClientCertificateInstall CSP, delimited by the character L"\xF000" (the CSP_LIST_DELIMITER). This is per user.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ ServerHasFinishedProvisioning
+
+
+
+
+
+ This node is set by the server to inform the UX that the server has finished provisioning the device. This was added so that the server can “change its mind" about what it needs to provision on the device. When this node is set, many other DM Client nodes will no longer be able to be changed. If this node is not True, the UX will consider the provisioning a failure. Once set to true, it would reject attempts to change it back to false with CFGMGR_E_COMMANDNOTALLOWED. This node applies to the per user expected policies and resources lists.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ IsSyncDone
+
+
+
+
+
+ This node, when doing a get, tells the server if the “First Syncs" are done and the device is fully provisioned. When doing a Set, this triggers the UX to override whatever state it is in and tell the user that the device is provisioned. It cannot be set from True to False (it will not change its mind on whether or not the sync is done), and it cannot be set from True to True (to prevent notifications from firing multiple times). This node only applies to the user MDM status page (on a per user basis).
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ WasDeviceSuccessfullyProvisioned
+
+
+
+
+
+ Integer node determining if a Device was Successfully provisioned. 0 is failure, 1 is success, 2 is in progress. Once the value is changed to 0 or 1, the value cannot be changed again. The client will change the value of success or failure and update the node. The server can, however, force a failure or success message to appear on the device by setting this value and then setting the IsSyncDone node to true. This node only applies to the user MDM status page (on a per user basis).
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ AllowCollectLogsButton
+
+
+
+
+
+ false
+ This node decides whether or not the MDM progress page displays the Collect Logs button. This node only applies to the user MDM status page (on a per user basis).
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ CustomErrorText
+
+
+
+
+
+
+
+ This node allows the MDM to set custom error text, detailing what the user needs to do in case of error. This node only applies to the user MDM status page (on a per user basis).
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+
+
+
+
+ DMClient
+ ./Device/Vendor/MSFT
@@ -622,6 +973,30 @@ The XML below is for Windows 10, version 1907.
+
+ AADSendDeviceToken
+
+
+
+
+
+
+
+ Send the device AAD token, if the user one can't be returned
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+ Push
@@ -1221,7 +1596,7 @@ The XML below is for Windows 10, version 1907.
- This node is set by the server to inform the UX that the server has finished provisioning the device. This was added so that the server can “change its mind" about what it needs to provision on the device. When this node is set, many other DM Client nodes will no longer be able to be changed. If this node is not True, the UX will consider the provisioning a failure. Once set to true, it would reject attempts to change it back to false with CFGMGR_E_COMMANDNOTALLOWED.
+ This node is set by the server to inform the UX that the server has finished provisioning the device. This was added so that the server can “change its mind" about what it needs to provision on the device. When this node is set, many other DM Client nodes will no longer be able to be changed. If this node is not True, the UX will consider the provisioning a failure. Once set to true, it would reject attempts to change it back to false with CFGMGR_E_COMMANDNOTALLOWED. This node applies to the per user expected policies and resources lists.
@@ -1243,7 +1618,7 @@ The XML below is for Windows 10, version 1907.
- This node, when doing a get, tells the server if the “First Syncs" are done and the device is fully provisioned. When doing a Set, this triggers the UX to override whatever state it is in and tell the user that the device is provisioned. It cannot be set from True to False (it will not change its mind on whether or not the sync is done), and it cannot be set from True to True (to prevent notifications from firing multiple times).
+ This node, when doing a get, tells the server if the “First Syncs" are done and the device is fully provisioned. When doing a Set, this triggers the UX to override whatever state it is in and tell the user that the device is provisioned. It cannot be set from True to False (it will not change its mind on whether or not the sync is done), and it cannot be set from True to True (to prevent notifications from firing multiple times). This node only applies to the user MDM status page (on a per user basis).
@@ -1265,7 +1640,7 @@ The XML below is for Windows 10, version 1907.
- Integer node determining if a Device was Successfully provisioned. 0 is failure, 1 is success, 2 is in progress. Once the value is changed to 0 or 1, the value cannot be changed again. The client will change the value of success or failure and update the node. The server can, however, force a failure or success message to appear on the device by setting this value and then setting the IsSyncDone node to true.
+ Integer node determining if a Device was Successfully provisioned. 0 is failure, 1 is success, 2 is in progress. Once the value is changed to 0 or 1, the value cannot be changed again. The client will change the value of success or failure and update the node. The server can, however, force a failure or success message to appear on the device by setting this value and then setting the IsSyncDone node to true. This node only applies to the user MDM status page (on a per user basis).
@@ -1280,6 +1655,137 @@ The XML below is for Windows 10, version 1907.
+
+ BlockInStatusPage
+
+
+
+
+
+ 0
+ Device Only. This node determines whether or not the MDM progress page is blocking in the AADJ or DJ++ case, as well as which remediation options are available.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ AllowCollectLogsButton
+
+
+
+
+
+ false
+ This node decides whether or not the MDM progress page displays the Collect Logs button. This node only applies to the device MDM status page.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ CustomErrorText
+
+
+
+
+
+
+
+ This node allows the MDM to set custom error text, detailing what the user needs to do in case of error. This node only applies to the user MDM status page (on a per user basis).
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ SkipDeviceStatusPage
+
+
+
+
+
+ true
+ Device only. This node decides wheter or not the MDM device progress page skips after AADJ or Hybrid AADJ in OOBE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ SkipUserStatusPage
+
+
+
+
+
+ false
+ Device only. This node decides wheter or not the MDM user progress page skips after AADJ or DJ++ after user login.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+ EnhancedAppLayerSecurity
diff --git a/windows/client-management/mdm/images/provisioning-csp-dmclient-th2.png b/windows/client-management/mdm/images/provisioning-csp-dmclient-th2.png
index 88398bc1c5..486779f038 100644
Binary files a/windows/client-management/mdm/images/provisioning-csp-dmclient-th2.png and b/windows/client-management/mdm/images/provisioning-csp-dmclient-th2.png differ
diff --git a/windows/client-management/mdm/images/provisioning-csp-uefi.png b/windows/client-management/mdm/images/provisioning-csp-uefi.png
new file mode 100644
index 0000000000..6900dd0c83
Binary files /dev/null and b/windows/client-management/mdm/images/provisioning-csp-uefi.png differ
diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
index 820cf5dfd6..8c40978809 100644
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@@ -10,12 +10,16 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 01/12/2018
+ms.date: 02/05/2018
---
# What's new in MDM enrollment and management
+> [!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 provides information about what's new and breaking changes in Windows 10 mobile device management (MDM) enrollment and management experience across all Windows 10 devices.
For details about Microsoft mobile device management protocols for Windows 10 see [\[MS-MDM\]: Mobile Device Management Protocol](http://go.microsoft.com/fwlink/p/?LinkId=619346) and [\[MS-MDE2\]: Mobile Device Enrollment Protocol Version 2]( http://go.microsoft.com/fwlink/p/?LinkId=619347).
@@ -1517,6 +1521,18 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
Updated the description for AllowWarningForOtherDiskEncryption to describe changes added in Windows 10, next major update.
+
[DMClient CSP](dmclient-csp.md)
+
Added ./User/Vendor/MSFT/DMClient/Provider/[ProviderID]/FirstSyncStatus node. Also added the following nodes in Windows 10, next major update:
+
+
AADSendDeviceToken
+
BlockInStatusPage
+
AllowCollectLogsButton
+
CustomErrorText
+
SkipDeviceStatusPage
+
SkipUserStatusPage
+
+
+
[RemoteWipe CSP](remotewipe-csp.md)
Added the following nodes in Windows 10, next major update:
@@ -1530,6 +1546,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
[Defender CSP](defender-csp.md)
Added new node (OfflineScan) in Windows 10, next major update.
+
+
[UEFI CSP](uefi-csp.md)
+
Added a new CSP in Windows 10, next major update.
+
diff --git a/windows/client-management/mdm/office-csp.md b/windows/client-management/mdm/office-csp.md
index b3eec1da15..f031f91a4b 100644
--- a/windows/client-management/mdm/office-csp.md
+++ b/windows/client-management/mdm/office-csp.md
@@ -6,13 +6,13 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 11/01/2017
+ms.date: 01/26/2018
---
# Office CSP
-The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device via the Office Deployment Tool. For more information, see [Configuration options for the Office Deployment Tool](https://technet.microsoft.com/en-us/library/jj219426.aspx).
+The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device via the Office Deployment Tool (ODT). For more information, see [Configuration options for the Office Deployment Tool](https://technet.microsoft.com/en-us/library/jj219426.aspx).
This CSP was added in Windows 10, version 1703.
For additional information, see [Office DDF](office-ddf.md).
@@ -144,31 +144,54 @@ To get the current status of Office 365 on the device.
997
Installation in progress
-
Windows Information Protection
+
-
13 (ERROR_INVALID_DATA)
-
Cannot verify signature of the downloaded ODT
+
13
+
ERROR_INVALID_DATA
+
Cannot verify signature of the downloaded Office Deployment Tool (ODT)
Failure
-
1460 (ERROR_TIMEOUT)
-
Failed to download ODT
+
1460
+
ERROR_TIMEOUT
+
Failed to download ODT
Failure
-
1603 (ERROR_INSTALL_FAILURE)
-
Failed any pre-req check.
+
1602
+
ERROR_INSTALL_USEREXIT
+
User cancelled the installation
+
Failure
+
+
+
1603
+
ERROR_INSTALL_FAILURE
+
Failed any pre-req check.
SxS (Tried to install when 2016 MSI is installed)
-
Bit mismatch
+
Bit mismatch between the currently installed Office and the Office that was attempting to be installed (such as when you try to install a 32-bit version while 64-bit version is currently installed.)
Failure
+
17000
+
ERROR_PROCESSPOOL_INITIALIZATION
+
Failed to start C2RClient
+
Failure
+
+
+
17001
+
ERROR_QUEUE_SCENARIO
+
Failed to queue installation scenario in C2RClient
+
Failure
+
+
17002
-
Failed to complete the process. Possible reasons:
+
ERROR_COMPLETING_SCENARIO
+
Failed to complete the process. Possible reasons:
+
Installation cancelled by user
Installation cancelled by another installation
Out of disk space during installation
@@ -177,13 +200,60 @@ To get the current status of Office 365 on the device.
Failure
-
17004
-
Unknown SKU
+
17003
+
ERROR_ANOTHER_RUNNING_SCENARIO
+
Another scenario is running
Failure
-
0x8000ffff (E_UNEXPECTED)
-
Tried to uninstall when there is no C2R Office on the machine.
+
17004
+
ERROR_COMPLETING_SCENARIO_NEED_CLEAN_UP
+
Possible reasons:
+
+
Unknown SKUs
+
Content does't exist on CDN
+
such as trying to install an unsupported LAP, like zh-sg
+
CDN issue that content is not available
+
+
Signature check issue, such as failed the signature check for Office content
+
User cancelled
+
+
+
Failure
+
+
+
17005
+
ERROR_SCENARIO_CANCELLED_AS_PLANNED
+
Failure
+
+
+
17006
+
ERROR_SCENARIO_CANCELLED
+
Blocked update by running apps
+
Failure
+
+
+
17007
+
ERROR_REMOVE_INSTALLATION_NEEDED
+
The client is requesting client clean up in a "Remove Installation" scenario
+
Failure
+
+
+
17100
+
ERROR_HANDLING_COMMAND_LINE
+
C2RClient command line error
+
Failure
+
+
+
0x80004005
+
E_FAIL
+
ODT cannot be used to install Volume license
+
Failure
+
+
+
0x8000ffff
+
E_UNEXPECTED
+
Tried to uninstall when there is no C2R Office on the machine.
Failure
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 715c403580..07dec60956 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -376,30 +376,6 @@ The following diagram shows the Policy configuration service provider in tree fo
### TaskScheduler policies
diff --git a/windows/client-management/mdm/uefi-csp.md b/windows/client-management/mdm/uefi-csp.md
new file mode 100644
index 0000000000..0b6de467ab
--- /dev/null
+++ b/windows/client-management/mdm/uefi-csp.md
@@ -0,0 +1,87 @@
+---
+title: UEFI CSP
+description: The Uefi CSP interfaces to UEFI's Device Firmware Configuration Interface (DFCI) to make BIOS configuration changes.
+ms.author: maricia
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
+ms.date: 02/01/2018
+---
+
+# UEFI 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.
+
+The UEFI configuration service provider (CSP) interfaces to UEFI's Device Firmware Configuration Interface (DFCI) to make BIOS configuration changes. This CSP was added in Windows 10, next major update.
+
+The following diagram shows the UEFI CSP in tree format.
+
+
+
+The following list describes the characteristics and parameters.
+
+**./Vendor/MSFT/Uefi**
+Root node.
+
+**UefiDeviceIdentifier**
+Retrieves XML from UEFI which describes the device identifier.
+
+Supported operation is Get.
+
+**IdentityInfo**
+Node for provisioned signers operations.
+
+
+**IdentityInfo/Current**
+Retrieves XML from UEFI which describes the current UEFI identity information.
+
+Supported operation is Get.
+
+**IdentityInfo/Apply**
+Apply an identity information package to UEFI. Input is the signed package in base64 encoded format.
+
+Supported operation is Replace.
+
+**IdentityInfo/ApplyResult**
+Retrieves XML describing the results of previous ApplyIdentityInfo operation.
+
+Supported operation is Get.
+
+**AuthInfo**
+Node for permission information operations.
+
+**AuthInfo/Current**
+Retrieves XML from UEFI which describes the current UEFI permission/authentication information.
+
+Supported operation is Get.
+
+**AuthInfo/Apply**
+Apply a permission/authentication information package to UEFI. Input is the signed package in base64 encoded format.
+
+Supported operation is Replace.
+
+**AuthInfo/ApplyResult**
+Retrieves XML describing the results of previous ApplyAuthInfo operation.
+
+Supported operation is Get.
+
+**Config**
+Node for device configuration
+
+**Config/Current**
+Retrieves XML from UEFI which describes the current UEFI configuration.
+
+Supported operation is Get.
+
+**Config/Apply**
+Apply a configuration package to UEFI. Input is the signed package in base64 encoded format.
+
+Supported operation is Replace.
+
+**Config/ApplyResult**
+Retrieves XML describing the results of previous ApplyConfig operation.
+
+Supported operation is Get.
diff --git a/windows/client-management/mdm/uefi-ddf.md b/windows/client-management/mdm/uefi-ddf.md
new file mode 100644
index 0000000000..5f8e6403eb
--- /dev/null
+++ b/windows/client-management/mdm/uefi-ddf.md
@@ -0,0 +1,330 @@
+---
+title: UEFI DDF file
+description: UEFI DDF file
+ms.author: maricia
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
+ms.date: 02/01/2018
+---
+
+# UEFI 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 **Uefi** 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 the current version for this CSP.
+
+``` syntax
+
+]>
+
+ 1.2
+
+ Uefi
+ ./Vendor/MSFT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.microsoft/1.0/MDM/Uefi
+
+
+
+ UefiDeviceIdentifier
+
+
+
+
+ Retrieves XML from UEFI which describes the device identifier.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ IdentityInfo
+
+
+
+
+ Provisioned signers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Current
+
+
+
+
+ Retrieves XML from UEFI which describes the current UEFI identity information
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ Apply
+
+
+
+
+ Apply an identity information package to UEFI. Input is the signed package in base64 encoded format.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ApplyResult
+
+
+
+
+ Retrieves XML describing the results of previous ApplyIdentityInfo operation.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+
+ AuthInfo
+
+
+
+
+ Permission Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Current
+
+
+
+
+ Retrieves XML from UEFI which describes the current UEFI permission/authentication information.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ Apply
+
+
+
+
+ Apply a permission/authentication information package to UEFI. Input is the signed package in base64 encoded format.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ApplyResult
+
+
+
+
+ Retrieves XML describing the results of previous ApplyAuthInfo operation.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+
+ Config
+
+
+
+
+ Device Configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Current
+
+
+
+
+ Retrieves XML from UEFI which describes the current UEFI configuration.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ Apply
+
+
+
+
+ Apply a configuration package to UEFI. Input is the signed package in base64 encoded format.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ApplyResult
+
+
+
+
+ Retrieves XML describing the results of previous ApplyConfig operation.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+
+
+```
\ No newline at end of file
diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
index 9826f1672e..649b0054e6 100644
--- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@@ -1445,7 +1445,7 @@ To change the level of diagnostic and usage data sent when you **Send your devic
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DataCollection\\AllowTelemetry**, with a value of 0-3, as appropriate for your deployment (see below for the values for each level).
> [!NOTE]
-> If the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI.
+> If the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI. The **Security** option is only availble in Windows 10 Enterprise edition.
-or-