Merge branch 'master' into App-v-revision

windows/application-management/TOC.md

@@ -4,7 +4,8 @@
 ## [Enable or block Windows Mixed Reality apps in the enterprise](manage-windows-mixed-reality.md)
 ## [Understand apps in Windows 10](apps-in-windows-10.md)
 ## [Add apps and features in Windows 10](add-apps-and-features.md)
-### [Repackage win32 apps in the MSIX format](msix-app-packaging-tool.md)
+## [Repackage win32 apps in the MSIX format](msix-app-packaging-tool.md)
+### [Learn how to repackage win32 apps in the MSIX format](msix-app-packaging-tool-walkthrough.md)
 ## [Application Virtualization (App-V) for Windows](app-v/appv-for-windows.md)
 ### [Getting Started with App-V](app-v/appv-getting-started.md)
 #### [What's new in App-V for Windows 10, version 1703 and earlier](app-v/appv-about-appv.md)

windows/application-management/msix-app-packaging-tool-walkthrough.md

@@ -0,0 +1,160 @@
+---
+title: Learn how to repackage your existing win32 applications to the MSIX format. This walkthrough provides in-depth detail on how the MSIX app packaging tool can be used.
+description: Learn how to use the MSIX packaging tool with this in-depth walkthrough.
+keywords: ["MSIX", "application", "app", "win32", "packaging tool"]
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.localizationpriority: medium
+ms.author: mikeblodge
+ms.topic: article
+ms.date: 08/027/2018
+---
+
+# MSIX Packaging tool walkthrough
+
+Learn how to repackage your legacy win32 application installers to MSIX, without the need for making code changes to your apps. The MSIX Packaging Tool allows you to modernize your app to take adavantage of Microsoft Store or Microsoft Store for Business to deploy apps on Windows 10 in S mode.
+
+## Terminology
+
+
+|Term  |Definition  |
+|---------|---------|
+|MPT     |  MSIX Packaging Tool. An enterprise grade tool that allows to package apps in the enterprise easily as MSIX without app code changes.       |
+|PSF     |   Package Support Framework. An open source framework to allow the packaging tool and the IT Admin to apply targeted fixes to the app in order to bypass some of the modern environment constrains. Some fixes will be added automatically by the tool and some will be added manually.      |
+|Modification Package     |  MSIX package to stores app preferences/settings and add-ins, decoupled from the main package.       |
+|Installer     |  Application installer can be an MSI, EXE, App-V , ClickOnce.       |
+|Project template file     | Template file that saves the settings and parameters used for a certain package conversion. Information captured in the template includes general Tooling packaging options, settings in the options menus like exclusion lists, package deployment settings, application install location, package manifest information like Package Family Name, publisher, version and package properties like capabilities and advanced enterprise features.        |
+
+## Creating an Application package
+
+![Create a package](images/welcomescreen.png)
+
+When the tool is first launched, you will be prompted to provide consent to sending telemtry data. It's important to note that the diagnostic data you share only comes from the app and is never used to identify or contact you. This just helps us fix things faster for you.
+
+![creating an application package](images/Selectinstaller.png)
+
+Creating an Application package is the most commonly used option. This is where you will create an MSIX package from an installer, or by manual installation of application payload. 
+- If an installer is being used, browse to and select the desired application installer and click **Next**.
+    - This field accepts a valid existing file path.
+    - The field can be empty if you are manually packaging.
+- If there is no installer (manual packaging) click **Next**.
+
+*Optionally*
+- Check the box under "Use Existing MSIX Package", browse, and select an existing MSIX package you'd like to update.
+- Check the box under "Use installer Preferences" and enter the desired argument in the provided field. This field accepts any string.
+
+### Packaging method
+![selecting the package environment](images/selectenvironmentthiscomputer.png)
+- Select the packaging environment by selecting one of the radio buttons:
+    - "Create package on an existing virtual machine" if you plan to do the package creation on a VM. Click **Next**. (You will be presented with user and password fields to provide credentials for the VM if there are any).
+    - "Create package on this computer" if you plan to package the application on the current machine where the tool is installed. Click **Next**.
+
+### Create package on this computer
+
+![Create a package on this computer](images/packageinfo.png)
+
+You've selected to package your application on the current machine where the tool is installed. Nice job! Provide the information pertaining to the app. The tool will try to auto-fill these fields based on the information available from the installer. You will always have a choice to update the entries as needed. If the field as an asterisk*, it's required, but you already knew that. Inline help is provided if the entry is not valid. 
+
+- Package name:
+    - Required and corresponds to package identity Name in the manifest to describe the contents of the package. 
+    - Must match the Name subject information of the certificate used to sign a package. 
+    - Is not shown to the end user. 
+    - Is case-sensitive and cannot have a space. 
+    - Can accept string between 3 and 50 characters in length that consists of alpha-numeric, period, and dash characters. 
+    - Cannot end with a period and be one of these: "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", and "LPT9." 
+- Package display name:
+    - Required and corresponds to package <DisplayName> in the manifest to display a friendly package name to the user, in start menu and settings pages.
+    - Field accepts A string between 1 and 256 characters in length and is localizable.
+- Publisher name
+    - Required and corresponds to package <Publisher Name> that describes the publisher information.  
+    - The Publisher attribute must match the publisher subject information of the certificate used to sign a package. 
+    - This field accepts a string between 1 and 8192 characters in length that fits the regular expression of a distinguished name : "(CN | L | O | OU | E | C | S | STREET | T | G | I | SN | DC | SERIALNUMBER | Description | PostalCode | POBox | Phone | X21Address | dnQualifier | (OID.(0 | [1-9][0-9])(.(0 | [1-9][0-9]))+))=(([^,+="<>#;])+ | ".")(, ((CN | L | O | OU | E | C | S | STREET | T | G | I | SN | DC | SERIALNUMBER | Description | PostalCode | POBox | Phone | X21Address | dnQualifier | (OID.(0 | [1-9][0-9])(.(0 | [1-9][0-9]))+))=(([^,+="<>#;])+ | ".")))*".
+- Publisher display name
+    - Reuqired and corresponds to package <PublisherDisplayName> in the manifest to display a friendly publisher name to the user, in App installer and settings pages.
+    - Field accepts A string between 1 and 256 characters in length and is localizable. 
+- Version
+    - Required and corresponds to package <Identity Version> in the manifest to describe the The version number of the package. 
+    - This field accepts a version string in quad notation, "Major.Minor.Build.Revision". 
+- Install location
+    - This is the location that the installer is going to copy the application payload to (usually Programs Files folder). 
+    - This field is optional but recommended. 
+    - Browse to and select a folder path. 
+    - Make sure this filed matches Installers Install location while you go through the application install operation.
+
+### Prepare computer
+
+![prepare your computer](images/preparecomputer.png)
+
+- You are provided with options to prepare the computer for packaging. 
+- MSIX Packaging Tool Driver is required and the tool will automatically try to enable it if it is not enabled. 
+   > [!NOTE]
+   > MSIX Packaging tool driver monitors the system to capture the changes that an installer is making on the system which allows MSIX Packaging Tool to create a package based on those changes.
+  - The tool will first check with DISM to see if the driver is installed. 
+- [Optional] Check the box for “Windows Search is Active” and select “disable selected” if you choose to disable the search service. 
+    - This is not required, only recommended. 
+    - Once disabled, the tool will update the status field to “disabled” 
+- [Optional] Check the box for “Windows Update is Active” and select “disable selected” if you choose to disable the Update service. 
+    - This is not required, only recommended. 
+    - Once disabled, the tool will update the status field to “disabled” 
+- “Pending reboot” checkbox is disabled by default. You'll need to manually restart the machine and then launch the tool again if you are prompted that pending operations need a reboot. 
+    - This not required, only recommended. 
+When you're done preparing the machine, click **Next**. 
+
+### Installation
+
+![Installation phase for capturing the install operations](images/installation.png)
+
+- This is installation phase where the tool is monitoring and capturing the application install operations. 
+- If you've provided an installer, the tool will launch the installer and you'll need to go through the installer wizard to install the application. 
+    - Make sure the installation path matches what was defined earlier in the package information page. 
+    - You'll need to create a shortcut in desktop for the newly installed application. 
+    - Once you're done with the application installation wizard, make sure you finish or close on the installation wizard. 
+    - If you need to run multiple installers you can do that manually at this point. 
+    - If the app needs other pre-reqs, you need to install them now. 
+    - If the application needs .Net 3.5/20, add the optional feature to Windows. 
+- If installer was not provided, manually copy the application binaries to the install location that you've defined earlier in package information. 
+- When you've completed installing the application, click **Next**. 
+
+### Manage first launch tasks
+
+![Managing first launch tasks](images/managefirstlaunchtasks.png)
+
+- This page shows application executables that the tool captured. 
+- We recommended launching the application at least once to capture any first launch tasks. 
+- If there are multiple applications, check the box that corresponds to the main entry point. 
+- If you don't see the application .exe here, manually browse to and run it. 
+- Click **Next** 
+
+![pop up asking for confirmation you are done monitoring](images/donemonitoring..png)
+
+You'll be prompted with a pop up asking for confirmation that you're finished with application installation and managing first launch tasks. 
+- If you're done, click **Yes, move on**. 
+- If you're not done, click **No, I'm not done**. You'll be taken back to the last page to where you can launch applications, install or copy other files, and dlls/executables. 
+
+### Package support report
+
+![Package support, runtime fixes that might be appliciable to the app](images/packagesupport.png)
+
+- Here you'll have a chance to add PSF runtime fixes that might be applicable to the application. *(not supported in preview)*
+    - The tool will make some suggestions and apply fixes that it thinks are applicable. 
+    - You'll have the opportunity to add, remove or edit PSF runtime fixes 
+    - You can see a list of PSFs provided by the community from Github. 
+    - You'll also see a packaging report on this page. The report will call out noteworthy items for example:
+        - If certain restricted capabilities like allowElevation is added 
+        - If certain files were excluded from the package. 
+        - Etc 
+Once done, click **Next**. 
+
+## Create package
+
+![Creating the new package](images/createpackage.png)
+
+- Provide a location to save the MSIX package.
+- By default, packages are saved in local app data folder.
+- You can define the default save location in Settings menu.
+- If you'd like to continue to edit the content and properties of the package before saving the MSIX package, you can select “Package editor” and be taken to package editor. 
+- If you prefer to sign the package with a pre-made certificate for testing, browse to and select the certificate. 
+- Click **Create** to create the MSIX package. 
+
+You'll be presented with the pop up when the package is created. This pop up will include the name, publisher, and save location of the newly created package. You can close this pop up and get redirected to the welcome page. You can also select package editor to see and modify the package content and properties. 

windows/application-management/msix-app-packaging-tool.md

@@ -67,6 +67,20 @@ Examples:
 - MsixPackagingTool.exe create-package --template c:\users\documents\ConversionTemplate.xml
 - MSIXPackagingTool.exe create-package --template c:\users\documents\ConversionTemplate.xml  --virtualMachinePassword pswd112893
 
+## Creating an application package using virtual machines
+
+You can select to perform the packaging steps on a virtual machine. To do this: 
+- Click on Application package and select “Create package on an existing virtual machine” in the select environment page. 
+- The tool will then query for existing Virtual machines and allows you to select one form a drop down menu. 
+- Once a VM is selected the tool will ask for user and password. The username field accepts domain\user entries as well.
+
+When using local virtual machines as conversion environment, the tool leverages an authenticated remote PowerShell connection to configure the virtual machine. A lightweight WCF server then provides bidirectional communication between the host and target environment.
+
+Requirements:
+•	Virtual Machine need to have PSRemoting enabled. (Enable-PSRemoting command should be run on the VM)
+•	Virtual Machine needs to be configured for Windows Insider Program similar to the host machine. Minimum Windows 10 build 17701
+
+
 ## Conversion template file
 
 
@@ -168,7 +182,7 @@ Examples:
 ```
 
 ## Conversion template parameter reference
-Here is the complete list of parameters that you can use in the Conversion template file.
+Here is the complete list of parameters that you can use in the Conversion template file. When a virtual machine is conversion environment, all file paths(installer, savelocation, etc) should be declared relative to the host, where the tool is running)
 
 
 |ConversionSettings entries  |Description  |
@@ -189,7 +203,7 @@ Here is the complete list of parameters that you can use in the Conversion templ
 |SaveLocation     |[optional] An element to specify the save location of the tool. If not specified, the package will be saved under the Desktop folder.         |
 |SaveLocation::Path     |The path to the folder where the resulting MSIX package is saved.         |
 |Installer::Path     |The path to the application installer.         |
-|Installer::Arguments     |The arguments to pass to the installer. You must pass the arguments to force your installer to run unattended/silently.         |
+|Installer::Arguments     |The arguments to pass to the installer. You must pass the arguments to force your installer to run unattended/silently. If the installer is an msi or appv, pass an empty argument ie Installer=””.        |
 |Installer::InstallLocation     |[optional] The full path to your application's root folder for the installed files if it were installed (e.g. "C:\Program Files (x86)\MyAppInstalllocation").         |
 |VirtualMachine     |[optional] An element to specify that the conversion will be run on a local Virtual Machine.         |
 |VrtualMachine::Name     |The name of the Virtual Machine to be used for the conversion environment.         |

windows/client-management/mdm/bitlocker-csp.md

@@ -14,7 +14,7 @@ ms.date: 07/16/2018
 > [!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 BitLocker configuration service provider (CSP) is used by the enterprise to manage encryption of PCs and devices. This CSP was added in Windows 10, version 1703.
+The BitLocker configuration service provider (CSP) is used by the enterprise to manage encryption of PCs and devices. This CSP was added in Windows 10, version 1703. Starting in Windows 10, next major version, it is also supported in Windows 10 Pro.
 
 > [!Note]  
 > Settings are enforced only at the time encryption is started. Encryption is not restarted with settings changes.  

windows/client-management/mdm/configuration-service-provider-reference.md

@@ -7,7 +7,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 08/17/2018
+ms.date: 08/27/2018
 ---
 
 # Configuration service provider reference
@@ -276,7 +276,7 @@ Footnotes:
 </tr>
 <tr>
 	<td><img src="images/crossmark.png" alt="cross mark" /></td>
-	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
 	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
 	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
 	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>

windows/client-management/mdm/policy-configuration-service-provider.md

@@ -7,7 +7,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 08/17/2018
+ms.date: 08/24/2018
 ---
 
 # Policy CSP
@@ -3114,6 +3114,9 @@ The following diagram shows the Policy configuration service provider in tree fo
   <dd>
     <a href="./policy-csp-system.md#system-allowbuildpreview" id="system-allowbuildpreview">System/AllowBuildPreview</a>
   </dd>
+  <dd>
+    <a href="./policy-csp-system.md#system-allowdevicenameindiagnosticdata" id="system-allowdevicenameindiagnosticdata">System/AllowDeviceNameInDiagnosticData</a>
+  </dd>
   <dd>
     <a href="./policy-csp-system.md#system-allowembeddedmode" id="system-allowembeddedmode">System/AllowEmbeddedMode</a>
   </dd>
@@ -3138,12 +3141,21 @@ The following diagram shows the Policy configuration service provider in tree fo
   <dd>
     <a href="./policy-csp-system.md#system-bootstartdriverinitialization" id="system-bootstartdriverinitialization">System/BootStartDriverInitialization</a>
   </dd>
+  <dd>
+    <a href="./policy-csp-system.md#system-configuremicrosoft365uploadendpoint" id="system-configuremicrosoft365uploadendpoint">System/ConfigureMicrosoft365UploadEndpoint</a>
+  </dd>
   <dd>
     <a href="./policy-csp-system.md#system-configuretelemetryoptinchangenotification" id="system-configuretelemetryoptinchangenotification">System/ConfigureTelemetryOptInChangeNotification</a>
   </dd>
   <dd>
     <a href="./policy-csp-system.md#system-configuretelemetryoptinsettingsux" id="system-configuretelemetryoptinsettingsux">System/ConfigureTelemetryOptInSettingsUx</a>
   </dd>
+  <dd>
+    <a href="./policy-csp-system.md#system-disabledevicedelete" id="system-disabledevicedelete">System/DisableDeviceDelete</a>
+  </dd>
+  <dd>
+    <a href="./policy-csp-system.md#system-disablediagnosticdataviewer" id="system-disablediagnosticdataviewer">System/DisableDiagnosticDataViewer</a>
+  </dd>
   <dd>
     <a href="./policy-csp-system.md#system-disableenterpriseauthproxy" id="system-disableenterpriseauthproxy">System/DisableEnterpriseAuthProxy</a>
   </dd>
@@ -4839,12 +4851,16 @@ The following diagram shows the Policy configuration service provider in tree fo
 -   [Storage/AllowDiskHealthModelUpdates](./policy-csp-storage.md#storage-allowdiskhealthmodelupdates)
 -   [Storage/EnhancedStorageDevices](./policy-csp-storage.md#storage-enhancedstoragedevices)
 -   [System/AllowBuildPreview](./policy-csp-system.md#system-allowbuildpreview)
+-   [System/AllowDeviceNameInDiagnosticData](./policy-csp-system.md#system-allowdevicenameindiagnosticdata)
 -   [System/AllowFontProviders](./policy-csp-system.md#system-allowfontproviders)
 -   [System/AllowLocation](./policy-csp-system.md#system-allowlocation)
 -   [System/AllowTelemetry](./policy-csp-system.md#system-allowtelemetry)
 -   [System/BootStartDriverInitialization](./policy-csp-system.md#system-bootstartdriverinitialization)
+-   [System/ConfigureMicrosoft365UploadEndpoint](./policy-csp-system.md#system-configuremicrosoft365uploadendpoint)
 -   [System/ConfigureTelemetryOptInChangeNotification](./policy-csp-system.md#system-configuretelemetryoptinchangenotification)
 -   [System/ConfigureTelemetryOptInSettingsUx](./policy-csp-system.md#system-configuretelemetryoptinsettingsux)
+-   [System/DisableDeviceDelete](./policy-csp-system.md#system-disabledevicedelete)
+-   [System/DisableDiagnosticDataViewer](./policy-csp-system.md#system-disablediagnosticdataviewer)
 -   [System/DisableEnterpriseAuthProxy](./policy-csp-system.md#system-disableenterpriseauthproxy)
 -   [System/DisableOneDriveFileSync](./policy-csp-system.md#system-disableonedrivefilesync)
 -   [System/DisableSystemRestore](./policy-csp-system.md#system-disablesystemrestore)

windows/client-management/mdm/policy-csp-settings.md

@@ -793,7 +793,7 @@ The following list shows the supported values:
 
 <!--/Scope-->
 <!--Description-->
-Added in Windows 10, version 1703.  Allows IT Admins to either  prevent specific pages in the System Settings app from being visible or accessible, or to do so for all pages except those specified.  The mode will be specified by the policy string beginning with either the string "showonly:" or "hide:".  Pages are identified by a shortened version of their already published URIs, which is the URI minus the "ms-settings:" prefix. For example, if the URI for a settings page is "ms-settings:foo", the page identifier used in the policy will be just "foo".  Multiple page identifiers are separated by semicolons.
+Added in Windows 10, version 1703.  Allows IT Admins to either  prevent specific pages in the System Settings app from being visible or accessible, or to do so for all pages except those specified.  The mode will be specified by the policy string beginning with either the string "showonly:" or "hide:".  Pages are identified by a shortened version of their already published URIs, which is the URI minus the "ms-settings:" prefix. For example, if the URI for a settings page is "ms-settings:bluetooth", the page identifier used in the policy will be just "bluetooth".  Multiple page identifiers are separated by semicolons.
 
 The following example illustrates a policy that would allow access only to the about and bluetooth pages, which have URI "ms-settings:about" and "ms-settings:bluetooth" respectively:
 
@@ -807,17 +807,17 @@ The format of the PageVisibilityList value is as follows:
 -   There are two variants: one that shows only the given pages and one which hides the given pages.
 -   The first variant starts with the string "showonly:" and the second with the string "hide:".
 -	Following the variant identifier is a semicolon-delimited list of page identifiers, which must not have any extra whitespace.
--   Each page identifier is the ms-settings:xyz URI for the page, minus the ms-settings: prefix, so the identifier for the page with URI "ms-settings:wi-fi" would be just "wi-fi".
+-   Each page identifier is the ms-settings:xyz URI for the page, minus the ms-settings: prefix, so the identifier for the page with URI "ms-settings:network-wifi" would be just "network-wifi".
 
 The default value for this setting is an empty string, which is interpreted as show everything.
 
-Example 1, specifies that only the wifi and bluetooth pages should be shown (they have URIs ms-settings:wi-fi and ms-settings:bluetooth). All other pages (and the categories they're in) will be hidden:
+Example 1, specifies that only the wifi and bluetooth pages should be shown (they have URIs ms-settings:network-wifi and ms-settings:bluetooth). All other pages (and the categories they're in) will be hidden:
 
-showonly:wi-fi;bluetooth
+showonly:network-wifi;bluetooth
 
 Example 2, specifies that the wifi page should not be shown:
 
-hide:wifi
+hide:network-wifi
 
 <!--/Description-->
 <!--ADMXMapped-->

windows/client-management/mdm/policy-csp-system.md

@@ -6,7 +6,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 07/30/2018
+ms.date: 08/24/2018
 ---
 
 # Policy CSP - System
@@ -24,6 +24,9 @@ ms.date: 07/30/2018
   <dd>
     <a href="#system-allowbuildpreview">System/AllowBuildPreview</a>
   </dd>
+  <dd>
+    <a href="#system-allowdevicenameindiagnosticdata">System/AllowDeviceNameInDiagnosticData</a>
+  </dd>
   <dd>
     <a href="#system-allowembeddedmode">System/AllowEmbeddedMode</a>
   </dd>
@@ -48,12 +51,21 @@ ms.date: 07/30/2018
   <dd>
     <a href="#system-bootstartdriverinitialization">System/BootStartDriverInitialization</a>
   </dd>
+  <dd>
+    <a href="#system-configuremicrosoft365uploadendpoint">System/ConfigureMicrosoft365UploadEndpoint</a>
+  </dd>
   <dd>
     <a href="#system-configuretelemetryoptinchangenotification">System/ConfigureTelemetryOptInChangeNotification</a>
   </dd>
   <dd>
     <a href="#system-configuretelemetryoptinsettingsux">System/ConfigureTelemetryOptInSettingsUx</a>
   </dd>
+  <dd>
+    <a href="#system-disabledevicedelete">System/DisableDeviceDelete</a>
+  </dd>
+  <dd>
+    <a href="#system-disablediagnosticdataviewer">System/DisableDiagnosticDataViewer</a>
+  </dd>
   <dd>
     <a href="#system-disableenterpriseauthproxy">System/DisableEnterpriseAuthProxy</a>
   </dd>
@@ -142,6 +154,67 @@ The following list shows the supported values:
 
 <hr/>
 
+<!--Policy-->
+<a href="" id="system-allowdevicenameindiagnosticdata"></a>**System/AllowDeviceNameInDiagnosticData**  
+
+<!--SupportedSKUs-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+This policy allows the device name to be sent to Microsoft as part of Windows diagnostic data.  If you disable or do not configure this policy setting, then device name will not be sent to Microsoft as part of Windows diagnostic data.
+
+<!--/Description-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Allow device name to be sent in Windows diagnostic data*
+-   GP name: *AllowDeviceNameInDiagnosticData*
+-   GP element: *AllowDeviceNameInDiagnosticData*
+-   GP path: *Data Collection and Preview Builds*
+-   GP ADMX file name: *DataCollection.admx*
+
+<!--/ADMXMapped-->
+<!--SupportedValues-->
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+
+<hr/>
+
 <!--Policy-->
 <a href="" id="system-allowembeddedmode"></a>**System/AllowEmbeddedMode**  
 
@@ -691,6 +764,72 @@ ADMX Info:
 
 <hr/>
 
+<!--Policy-->
+<a href="" id="system-configuremicrosoft365uploadendpoint"></a>**System/ConfigureMicrosoft365UploadEndpoint**  
+
+<!--SupportedSKUs-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+This policy sets the upload endpoint for this device’s diagnostic data as part of the Microsoft 365 Update Readiness program.
+          
+If your organization is participating in the program and has been instructed to configure a custom upload endpoint, then use this setting to define that endpoint.
+
+The value for this setting will be provided by Microsoft as part of the onboarding process for the program.
+
+Value type is string.
+<!--/Description-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Configure Microsoft 365 Update Readiness upload endpoint*
+-   GP name: *ConfigureMicrosoft365UploadEndpoint*
+-   GP element: *ConfigureMicrosoft365UploadEndpoint*
+-   GP path: *Data Collection and Preview Builds*
+-   GP ADMX file name: *DataCollection.admx*
+
+<!--/ADMXMapped-->
+<!--SupportedValues-->
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+
+<hr/>
+
 <!--Policy-->
 <a href="" id="system-configuretelemetryoptinchangenotification"></a>**System/ConfigureTelemetryOptInChangeNotification**  
 
@@ -741,15 +880,6 @@ ADMX Info:
 -   GP ADMX file name: *DataCollection.admx*
 
 <!--/ADMXMapped-->
-<!--SupportedValues-->
-
-<!--/SupportedValues-->
-<!--Example-->
-
-<!--/Example-->
-<!--Validation-->
-
-<!--/Validation-->
 <!--/Policy-->
 
 <hr/>
@@ -808,6 +938,123 @@ ADMX Info:
 -   GP path: *Data Collection and Preview Builds*
 -   GP ADMX file name: *DataCollection.admx*
 
+<!--/ADMXMapped-->
+<!--/Policy-->
+
+<hr/>
+
+<!--Policy-->
+<a href="" id="system-disabledevicedelete"></a>**System/DisableDeviceDelete**  
+
+<!--SupportedSKUs-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+This policy setting controls whether the Delete diagnostic data button is enabled in Diagnostic & Feedback Settings page.
+If you enable this policy setting, the Delete diagnostic data button will be disabled in Settings page, preventing the deletion of diagnostic data collected by Microsoft from the device. 
+If you disable or don't configure this policy setting, the Delete diagnostic data button will be enabled in Settings page, which allows people to erase all diagnostic data collected by Microsoft from that device.
+
+<!--/Description-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Disable deleting diagnostic data *
+-   GP name: *DisableDeviceDelete*
+-   GP element: *DisableDeviceDelete*
+-   GP path: *Data Collection and Preview Builds*
+-   GP ADMX file name: *DataCollection.admx*
+
+<!--/ADMXMapped-->
+<!--SupportedValues-->
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+
+<hr/>
+
+<!--Policy-->
+<a href="" id="system-disablediagnosticdataviewer"></a>**System/DisableDiagnosticDataViewer**  
+
+<!--SupportedSKUs-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>5</sup></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+This policy setting controls whether users can enable and launch the Diagnostic Data Viewer from the Diagnostic & Feedback Settings page.
+If you enable this policy setting, the Diagnostic Data Viewer will not be enabled in Settings page, and it will prevent the viewer from showing diagnostic data collected by Microsoft from the device.  
+If you disable or don't configure this policy setting, the Diagnostic Data Viewer will be enabled in Settings page.
+
+<!--/Description-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Disable diagnostic data viewer. *
+-   GP name: *DisableDiagnosticDataViewer*
+-   GP element: *DisableDiagnosticDataViewer*
+-   GP path: *Data Collection and Preview Builds*
+-   GP ADMX file name: *DataCollection.admx*
+
 <!--/ADMXMapped-->
 <!--SupportedValues-->
 
@@ -1194,5 +1441,3 @@ Footnote:
 
 <!--/Policies-->
 
-
-