Merge remote-tracking branch 'refs/remotes/origin/master' into atp-o365

This commit is contained in:
Joey Caparas 2017-06-28 13:17:06 -07:00
commit 9d83053d86
304 changed files with 1302 additions and 753 deletions

View File

@ -4,81 +4,9 @@
"need_generate_intellisense": false,
"docsets_to_publish": [
{
"docset_name": "education",
"build_source_folder": "education",
"build_output_subfolder": "education",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "internet-explorer",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "browsers/internet-explorer",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "itpro-hololens",
"build_source_folder": "devices/hololens",
"build_output_subfolder": "devices/hololens",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "mdop",
"docset_name": "mdop-VSTS",
"build_source_folder": "mdop",
"build_output_subfolder": "mdop",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "microsoft-edge",
"build_source_folder": "browsers/edge",
"build_output_subfolder": "browsers/edge",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "smb",
"build_source_folder": "smb",
"build_output_subfolder": "smb",
"build_output_subfolder": "mdop-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
@ -92,216 +20,12 @@
"version": 0
},
{
"docset_name": "store-for-business",
"build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "surface",
"build_source_folder": "devices/surface",
"build_output_subfolder": "devices/surface",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "surface-hub",
"build_source_folder": "devices/surface-hub",
"build_output_subfolder": "devices/surface-hub",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-access-protection",
"build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-app-management",
"build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-client-management",
"build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-configuration",
"build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-development",
"build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-device-security",
"build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-hub",
"build_source_folder": "windows/hub",
"build_output_subfolder": "windows-hub",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-threat-protection",
"build_source_folder": "windows/threat-protection",
"build_output_subfolder": "win-threat-protection",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-whats-new",
"build_source_folder": "windows/whats-new",
"build_output_subfolder": "win-whats-new",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "keep-secure",
"build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-manage",
"docset_name": "windows-manage-VSTS",
"build_source_folder": "windows/manage",
"build_output_subfolder": "windows-manage",
"build_output_subfolder": "windows-manage-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@ -312,12 +36,76 @@
"version": 0
},
{
"docset_name": "windows-plan",
"docset_name": "smb-VSTS",
"build_source_folder": "smb",
"build_output_subfolder": "smb-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "surface-hub-VSTS",
"build_source_folder": "devices/surface-hub",
"build_output_subfolder": "surface-hub-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "microsoft-edge-VSTS",
"build_source_folder": "browsers/edge",
"build_output_subfolder": "microsoft-edge-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-development-VSTS",
"build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-plan-VSTS",
"build_source_folder": "windows/plan",
"build_output_subfolder": "windows-plan",
"build_output_subfolder": "windows-plan-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@ -328,12 +116,12 @@
"version": 0
},
{
"docset_name": "windows-update",
"build_source_folder": "windows/update",
"build_output_subfolder": "windows-update",
"docset_name": "win-client-management-VSTS",
"build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@ -344,12 +132,44 @@
"version": 0
},
{
"docset_name": "windows-deploy",
"docset_name": "win-threat-protection-VSTS",
"build_source_folder": "windows/threat-protection",
"build_output_subfolder": "win-threat-protection-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-app-management-VSTS",
"build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-deploy-VSTS",
"build_source_folder": "windows/deploy",
"build_output_subfolder": "windows-deploy",
"build_output_subfolder": "windows-deploy-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@ -360,12 +180,12 @@
"version": 0
},
{
"docset_name": "windows-configure",
"build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure",
"docset_name": "keep-secure-VSTS",
"build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
@ -376,9 +196,57 @@
"version": 0
},
{
"docset_name": "bcs",
"docset_name": "surface-VSTS",
"build_source_folder": "devices/surface",
"build_output_subfolder": "surface-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-hub-VSTS",
"build_source_folder": "windows/hub",
"build_output_subfolder": "windows-hub-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "internet-explorer-VSTS",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "internet-explorer-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "bcs-VSTS",
"build_source_folder": "bcs",
"build_output_subfolder": "bcs",
"build_output_subfolder": "bcs-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": false,
@ -390,6 +258,150 @@
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-access-protection-VSTS",
"build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-device-security-VSTS",
"build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "education-VSTS",
"build_source_folder": "education",
"build_output_subfolder": "education-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "store-for-business-VSTS",
"build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-configuration-VSTS",
"build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-update-VSTS",
"build_source_folder": "windows/update",
"build_output_subfolder": "windows-update-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-whats-new-VSTS",
"build_source_folder": "windows/whats-new",
"build_output_subfolder": "win-whats-new-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "itpro-hololens-VSTS",
"build_source_folder": "devices/hololens",
"build_output_subfolder": "itpro-hololens-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-configure-VSTS",
"build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
}
],
"notification_subscribers": [
@ -398,7 +410,7 @@
"branches_to_filter": [
""
],
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/win-cpub-itpro-docs",
"git_repository_url_open_to_public_contributors": "https://cpubwin.visualstudio.com/_git/it-client",
"skip_source_output_uploading": false,
"need_preview_pull_request": true,
"dependent_repositories": [
@ -428,9 +440,9 @@
"Publish",
"Pdf"
]
},
"need_generate_pdf_url_template": true,
"resolve_user_profile_using_github": true,
"Targets": {
"Pdf": {
"template_folder": "_themes.pdf"

View File

@ -29,7 +29,13 @@
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {},
"globalMetadata": {
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "TechNet.bcs"
}
}
},
"fileMetadata": {},
"template": [],
"dest": "bcs"

View File

@ -20,7 +20,12 @@
"ms.technology": "microsoft-edge",
"ms.topic": "article",
"ms.author": "lizross",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.microsoft-edge"
}
}
},
"externalReference": [
],

View File

@ -21,7 +21,12 @@
"author": "eross-msft",
"ms.technology": "internet-explorer",
"ms.topic": "article",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.internet-explorer"
}
}
},
"externalReference": [
],

View File

@ -34,7 +34,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "jdecker",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.itpro-hololens"
}
}
},
"fileMetadata": {},
"template": [

View File

@ -23,7 +23,12 @@
"author": "jdeckerms",
"ms.sitesec": "library",
"ms.author": "jdecker",
"ms.date": "05/23/2017"
"ms.date": "05/23/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.surface-hub"
}
}
},
"externalReference": [
],

View File

@ -50,6 +50,9 @@ When the other Surface Hub receives the link, the recipient can tap on the link,
After youre done, you can export a copy of the Whiteboard collaboration for yourself through the Share charm and leave the board for others to continue working.
>[!TIP]
>When you start a collaboration session, Whiteboard creates a folder named **Whiteboard App Data** in your OneDrive for Business to store your shared whiteboards. After some collaboration sessions, this folder may continue to sync or process changes indefinitely. You can fix this by choosing to not sync the **Whiteboard App Data** folder to your device. Disabling sync for this folder won't limit your ability to use Whiteboard for collaboration sessions.
## How to control and manage Whiteboard to Whiteboard collaboration
Whiteboard has settings that can be managed via MDM. These allow you to disable or enable collaboration functionality in case your organization cant meet the prerequisites or youd rather not have your organization use this feature.

View File

@ -20,7 +20,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "jdecker",
"ms.date": "05/09/2017"
"ms.date": "05/09/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.surface"
}
}
},
"externalReference": [
],

View File

@ -20,7 +20,12 @@
"audience": "windows-education",
"ms.topic": "article",
"breadcrumb_path": "/education/breadcrumb/toc.json",
"ms.date": "05/09/2017"
"ms.date": "05/09/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.education"
}
}
},
"externalReference": [
],

View File

@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: edu
author: CelesteDG
ms.author: celested
ms.date: 06/26/2017
---
# Change history for Microsoft Education Get started
@ -18,7 +19,7 @@ This topic lists the changes in the Microsoft Education IT admin get started.
| New or changed topic | Description |
| --- | ---- |
| [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md) | Includes the following updates:</br></br> - New configuration guidance for IT administrators to deploy Microsoft Teams.</br> - Updated steps for School Data Sync to show the latest workflow and user experience. |
| [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md) | Includes the following updates:</br></br> - New configuration guidance for IT administrators to deploy Microsoft Teams.</br> - Updated steps for School Data Sync to show the latest workflow and user experience.</br> - Updated steps for Option 2: Try out Microsoft Education in a trial environment. You no longer need the SDS promo code to try SDS in a trial environment. |
## May 2017

View File

@ -9,6 +9,8 @@ ms.topic: hero-article
localizationpriority: high
ms.pagetype: edu
author: CelesteDG
ms.author: celested
ms.date: 06/26/2017
---
# Get started: Deploy and manage a full cloud IT solution with Microsoft Education
@ -101,25 +103,31 @@ To get started with Microsoft Education in a trial environment, follow these ste
1. [Set up a new Office 365 for Education tenant](#1-set-up-a-new-office-365-for-education-tenant).
Wait for your tenant to be education-verified before proceeding with the next step. Verification can take up to two weeks.
Wait for your tenant to be education-verified before proceeding with the next step. Verification can take up to a few days.
2. Click <a href="https://aka.ms/getsdspromocode" target="_blank">https://aka.ms/getsdspromocode</a> to apply a School Data Sync trial promo code to your Office 365 education tenant.
3. Follow the instructions in [Use School Data Sync to import student data](#2-use-school-data-sync-to-import-student-data).
4. Follow the instructions in [Try out Intune for Education](#schooluseso365tryi4e).
2. Once you have an education-verified tenant, click <a href="https://aka.ms/intuneforedupreviewtrial" target="_blank">https://aka.ms/intuneforedupreviewtrial</a> to apply the Intune for Education trial promo code.
1. In the Intune for Education Trial page, on the upper right, click **Sign in** next to **Want to add this to an existing subscription?**.
2. Sign in with your global admin credentials.
3. Sign in to <a href="https://portal.office.com/adminportal" target="_blank">Office 365 admin portal</a> and:
1. Select **Admin > Users** and then search for your admin account.
2. In the user page, select **Product licenses** and expand the **Office 365 Education** license you assigned to yourself.
3. Confirm that School Data Sync is turned on.
3. Skip ahead and follow the rest of the instructions in this walkthrough beginning with [2. Use School Data Sync to import student data](#2-use-school-data-sync-to-import-student-data).
### <a name="schooluseso365tryi4e"></a>Option 3: Try out Intune for Education
Already have an Office 365 for Education verified tenant? Just sign in with your global admin credentials to apply the Intune for Education preview trial code to your tenant and follow the rest of the walkthrough.
1. Click <a href="https://aka.ms/intuneforedupreviewtrial" target="_blank">https://aka.ms/intuneforedupreviewtrial</a> to get started.
2. In the **Intune for Education Trial** page, click **Sign in**.
2. In the **Intune for Education Trial** page, on the upper right, click **Sign in** next to **Want to add this to an existing subscription?**.
**Figure 2** - Intune for Education trial sign in page
![Intune for Education trial sign in page](images/i4e_trialsigninpage.png)
3. Enter your Office 365 global admin credentials to apply the Intune for Education trial to your tenant.
4. Skip ahead and follow the instructions in the walkthrough beginning with [4. Configure Microsoft Store for Education](#4-configure-microsoft-store-for-education).
4. If you don't already have Microsoft Teams deployed to your tenant, you can start with [3. Enable Microsoft Teams for your school](#3-enable-microsoft-teams-for-your-school) and then follow the rest of the instructions in this walkthrough.
## 1. Set up a new Office 365 for Education tenant
Schools can use Office 365 to save time and be more productive. Built with powerful tools and accessible from any device, setting it up is the first step in getting your school to the cloud.
@ -174,21 +182,6 @@ Follow all the steps in this section to use SDS and sample CSV files in a trial
To learn more about the CSV files that are required and the info you need to include in each file, see <a href="https://aka.ms/sdscsvattributes" target="_blank">CSV files for School Data Sync</a>. If you run into any issues, see <a href="https://aka.ms/sdserrors" target="_blank">School Data Sync errors and troubleshooting</a>.
**<a name="assignclassroom"></a>Assign Classroom license**
The Classroom application is retired, but you will need to assign the Classroom Preview license to global admin accounts that will be used to administer SDS. The single license allows global admins to access both Classroom Preview and School Data Sync.
1. In the <a href="https://portal.office.com/adminportal" target="_blank">Office 365 admin center</a>, select **Users > Active users**.
2. Select the checkbox for your global admin account.
3. In the account details window, under **Product licenses**, click **Edit**.
4. In the **Product licenses** page, turn on **Microsoft Classroom** and then click **Save**.
5. Confirm that you can access SDS. To do this:
- Navigate to <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a> and click **Sign in**. When prompted, enter your global admin username and password to access the SDS portal. Or,
- From the Office 365 admin portal, go to **Admin centers** and click on **School Data Sync** to go to the SDS portal.
> [!NOTE]
> Only global admins can access SDS.
**<a name="usesdstoimportdata"></a>Use SDS to import student data**
1. If you haven't done so already, go to the SDS portal, <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a>.
@ -196,7 +189,7 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 6** - Settings for managing SDS
![Settings for managing SDS](images/sds_sds_and_classroom_off.png)
![Settings for managing SDS](images/sds_settings_manage_sds_firstsignin.png)
3. Turn on **School Data Sync**. You will get a notification that it is turned on. Click **OK**.
@ -204,7 +197,7 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 7** - New menu options appear after SDS is turned on
![New menu options appear after SDS is turned on](images/sds_sds_on_newmenu_items.png)
![New menu options appear after SDS is turned on](images/sds_sds_on_newmenuitemsappear.png)
4. Click **+ Add Profile** from the sync dashboard or from the menu on the left to start syncing school data.
@ -212,84 +205,93 @@ The Classroom application is retired, but you will need to assign the Classroom
**Figure 8** - New SDS profile setup wizard
![New SDS profile setup wizard](images/sds_updated_addnewprofile.png)
![New SDS profile setup wizard](images/sds_add_new_profile_062317.png)
6. For the new profile, in the **Before you begin...** screen:
1. Enter a name for your profile, such as *Contoso_Profile_1*.
2. Select a sync method for your profile. For this walkthrough, select **CSV Files**.
5. For the new profile, in the **How do you want to connect to your school?** screen:
1. Enter a name for your profile, such as *Contoso_Elementary_Profile*.
2. Select a sync method for your profile. For this walkthrough, select **Upload CSV Files**.
3. Select the type of CSV files that you're using. For this walkthrough, select **CSV files: SDS Format**.
4. Click **Start**.
Note that for any sync method that you choose, you can click the **View steps** link to get more information about the steps you need to take depending on the sync method of your choosing.
3. Click **Start**.
7. In the **Sync options** screen:
1. In the **Select new or existing users** section, you can select either **New users** or **Existing users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
<!--
- Choose **New users** if this is a brand new tenant and this is the first time that you're adding users.
Choose the **New users** option if you are using an unaltered version of the sample CSV files from [Download sample school data](#downloadcsvsamples) or if you created your own CSV files with new users.
- Choose **Existing users** if you already have a live production tenant, with teachers and students that already have active accounts in Office 365 (cloud only or synced from on-premise Active Directory).
Using the **Existing users** option, SDS will not attempt to create new users. Instead, it uses the identity matching options in the next section of the setup wizard to match the students and teachers in your CSV files to the user accounts that already exist in Azure. All additiional details for the students and teachers contained within the CSV files will be written as extension attributes on top of the already existing user objects. You can find more information about these settings on the main SDS deployment page for CSV-based deployments in <a href="http://aka.ms/sdscsv" target="_blank">How to deploy School Data Sync by using CSV files</a>.
-->
6. In the **Sync options** screen:
1. In the **Select new or existing users** section, you can select either **Existing users** or **New users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
2. In the **Import data** section:
1. Click **Upload Files** to bring up the **Select data files to be uploaded** window.
2. In the **Select data files to be uploaded** window, click **+ Add Files** and navigate to the directory where you saved the six CSV files required for data import.
3. In the File Explorer window, you will see a folder for the sample CSV files for the UK and six sample CSV files for the US. Select the CSV files that match your region/locale, and then click **Open**.
4. In the **Select data files to be uploaded** window, confirm that all six CSV files (School.csv, Section.csv, Student.csv, StudentEnrollment.csv, Teacher.csv, and TeacherRoster.csv) are listed and then click **Upload**.
4. After all the files are successfully uploaded, click **OK**.
> [!NOTE]
> After you click **Upload**, the status in the **Select data files to be uploaded** window will indicate that files are being uploaded and verified.
5. After all the files are successfully uploaded, click **OK**.
3. Select the domain for the schools/sections. This domain will be used for the Section email addresses created during setup. If you have more than one domain, make sure you select the appropriate domain for the sync profile and subsequent sections being created.
4. In the **Select school and section properties** section, ensure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties, or deselect any properties, make sure you have the properties and values contained within the CSV files. For the walkthrough, you don't have to change the default.
5. In the **Sync option for Section Group Display Name**, check the box if you want to allow teachers to overwrite the section names. Otherwise, SDS will always reset the display name value for sections to the value contained within the CSV files.
6. In the **License Options** section, check the box to enable the Classroom Preview license for all synced students and teachers within the sync profile.
7. Check the **Intune for Education** checkbox to allow users to receive the Intune for Education license and to create the SDS dynamic groups and security groups, which be used within Intune for Education.
6. In the **Student enrollment option** section:
* If you want to sync your student roster data immediately, leave the box unchecked.
* If you prefer to sync student enrollment/rostering data at a later date, check this box and then pick a date by clicking the empty box and selecting the appropriate date in the calendar when you would like to begin syncing your student roster data. Some schools prefer to delay syncing student roster data so they don't expose rosters before the start of the new term, semester, or school year.
7. In the **License Options** section, check the box for **Intune for Education** to allow students and teachers to receive the Intune for Education license. This will also create the SDS dynamic groups and security groups, which will be used within Intune for Education.
8. Click **Next**.
**Figure 9** - Sync options for the new profile
![Specify sync options for the new SDS profile](images/sds_profile_syncoptions.png)
![Specify sync options for the new SDS profile](images/sds_profile_sync_options_062317.png)
8. In the **Teacher options** screen:
7. In the **Teacher options** screen:
1. Select the domain for the teachers. SDS appends the selected domain suffix to the teacher's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The teacher will log in to Office 365 with the UserPrincipalName once the account is created.
2. In the **Select teacher properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
3. In the **Teacher licenses** section, choose the SKU to assign licenses for teachers. For this walkthrough, choose **STANDARDWOFFPACK_FACULTY**.
3. In the **Teacher licenses** section, choose the SKU to assign licenses for teachers. For example, **STANDARDWOFFPACK_FACULTY**.
4. Click **Next**.
**Figure 10** - Specify options for teacher mapping
![Specify options for teacher mapping](images/sds_profile_teacheroptions.png)
![Specify options for teacher mapping](images/sds_profile_teacher_options_062317.png)
9. In the **Student options** screen:
8. In the **Student options** screen:
1. Select the domain for the students. SDS appends the selected domain suffix to the student's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The student will log in to Office 365 with the UserPrincipalName once the account is created.
2. In the **Select student properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
3. In the **Student licenses** section, choose the SKU to assign licenses for students. For this walkthrough, choose **STANDARDWOFFPACK_STUDENT**.
3. In the **Student licenses** section, choose the SKU to assign licenses for students. For example, **STANDARDWOFFPACK_STUDENT**.
4. Click **Next**.
**Figure 11** - Specify options for student mapping
![Specify options for student mapping](images/sds_profile_studentoptions.png)
![Specify options for student mapping](images/sds_profile_student_options_062317.png)
10. In the profile **Review** page, review the summary and confirm that the options selected are correct. Click **Create profile**.
You will see a notification that your profile is being created.
11. You will see a page for your profile. The status might indicate that it's still being set up.
9. In the profile **Review** page, review the summary and confirm that the options selected are correct.
10. Click **Create profile**. You will see a notification that your profile is being submitted and then you will see a page for your profile.
**Figure 12** - SDS profile page
![SDS profile page](images/sds_profile_profilepage.png)
![SDS profile page](images/sds_profile_profilepage_settingup_062317.png)
12. After the profile is created and finished **Setting up**, confirm that the status for your profile now says **Sync enabled**.
11. After the profile is created and the status indicates as **Setting up**, refresh the page until you see the status change to **Sync in progress**. Beneath the **Sync in progress** status, you will see which of the 5 sync stages SDS is working on:
* Stage 1 - Validating data
* Stage 2 - Processing schools and sections
* Stage 3 - Processing students and teachers
* Stage 4 - Adding students and teachers into sections
* Stage 5 - Setting up security groups
If the status still indicates that the profile is being set up, try refreshing the page until you see the status change to **Sync enabled**.
If you don't see a **Sync in progress** status on the sync profile, and receive an error message instead, this indicates that SDS has encountered data issues during the pre-sync validation check and has not started syncing your data. This gives you the opportunity to fix the errors identified by the pre-sync validation checks before continuing. Once you've fixed any errors or if you prefer to continue with the errors and begin syncing your data anyway, click the **Resume sync** button to start the sync process.
**Figure 13** - New profile is sync enabled
Once you've completed all five sync stages, your profile status will update one final time.
* If you haven't encountered any errors, you will see a green check mark which states **Everything is ok**, and the profile status will change to **Sync complete. Ready for more data.**
* If SDS encountered sync errors, you will see a red status icon that indicates an error, and a profile status of **Sync complete. Profile contains multiple errors**. Download the available error report to identify and fix your sync errors. Once complete, upload new files as needed and re-sync your data until errors are resolved.
![Confirm that the new profile is sync enabled](images/sds_profile_syncenabled.png)
Here are some examples of what the sync status can look like:
> [!TIP]
> If you get errors during the pre-sync validation process, your profile status will change to **x Error**. To continue, review or resolve any pre-sync validation errors, and then click **Resume Sync** to start the synchronization cycle.
**Figure 13** - New profile: Sync in progress
![Sync in progress for the new profile](images/sds_profile_status_syncinprogress_062317.png)
**Figure 14** - New profile: Sync complete - no errors
![New profile sync complete with no errors](images/sds_profile_status_everythingok_062317.png)
**Figure 15** - New profile: Sync complete - with errors
![New profile sync complete with errors](images/sds_profile_status_syncerrors_062317.png)
Sync times, like file download times, can vary widely depending on when you start the sync, how much data you are syncing, the complexity of your data (such as the number of users, schools, and class enrollments), overall system/network load, and other factors. Two people who start a sync at the same time may not have their syncs complete at the same time.
@ -309,25 +311,25 @@ To get started, IT administrators need to use the Office 365 Admin Center to ena
3. Go to **Settings > Services & add-ins**.
4. On the **Services & add-ins** page, select **Microsoft Teams**.
**Figure 14** - Select Microsoft Teams from the list of services & add-ins
**Figure 16** - Select Microsoft Teams from the list of services & add-ins
![Enable Microsoft Teams for your school](images/o365_settings_services_msteams.png)
5. On the Microsoft Teams settings screen, select the license that you want to configure, **Student** or **Faculty and Staff**.
5. On the Microsoft Teams settings screen, select the license that you want to configure, **Student** or **Faculty and Staff**. Select **Faculty and Staff**.
**Figure 15** - Select the license that you want to configure
**Figure 17** - Select the license that you want to configure
![Select the Microsoft Teams license that you want to configure](images/o365_msteams_settings.png)
6. After you select the license type, set the toggle to turn on Microsoft Teams for your organization.
**Figure 16** - Turn on Microsoft Teams for your organization
**Figure 18** - Turn on Microsoft Teams for your organization
![Turn on Microsoft Teams for your organization](images/o365_msteams_turnon.png)
7. Click **Save**.
You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins** getting started guide in the <a href="https://aka.ms/MeetTeamsEdu" target="_blank">Meet Microsoft Teams</a> page.
You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins* getting started guide in the <a href="https://aka.ms/MeetTeamsEdu" target="_blank">Meet Microsoft Teams</a> page.
## 4. Configure Microsoft Store for Education
You'll need to configure Microsoft Store for Education to accept the services agreement and make sure your Microsoft Store account is associated with Intune for Education.
@ -339,20 +341,20 @@ You'll need to configure Microsoft Store for Education to accept the services ag
This will take you to the Microsoft Store for Education portal.
**Figure 17** - Microsoft Store for Education portal
**Figure 19** - Microsoft Store for Education portal
![Microsoft Store for Education portal](images/msfe_store_portal.png)
3. In the Microsoft Store portal, click **Manage** to go to the Microsoft Store **Overview** page.
4. Find the **Overview** page, find the **Store settings** tile and click **Management tools**.
**Figure 18** - Select management tools from the list of Store settings options
**Figure 20** - Select management tools from the list of Store settings options
![Select management tools from list of Store settings options](images/msfe_storesettings_select_managementtools.png)
4. In the **Management tools** page, find **Microsoft Intune** on the list and click **Activate** to get Intune for Education ready for use with Microsoft Store for Education.
**Figure 19** - Activate Intune for Education as the management tool
**Figure 21** - Activate Intune for Education as the management tool
![Activate Intune for Education as the management tool](images/msfe_managementtools_activateintune.png)
@ -386,20 +388,20 @@ Intune for Education provides an **Express configuration** option so you can get
1. Log into the <a href="https://intuneeducation.portal.azure.com/" target="_blank">Intune for Education console</a>. You will see the Intune for Education dashboard once you're logged in.
**Figure 20** - Intune for Education dashboard
**Figure 22** - Intune for Education dashboard
![Intune for Education dashboard](images/i4e_portal.png)
2. On the dashboard, click **Launch Express Configuration**, or select the **Express configuration** option on the menu on the left.
3. In the **Welcome to Intune for Education** screen, click **Get started**.
**Figure 21** - Click Get started to set up Intune for Education
**Figure 23** - Click Get started to set up Intune for Education
![Click Get Started to configure groups, apps, and settings](images/i4e_expressconfiguration_welcome.png)
4. In the **Get school information (optional)** screen, it should indicate that SDS is already configured. Click **Next**.
**Figure 22** - SDS is configured
**Figure 24** - SDS is configured
![SDS is already configured](images/i4e_expressconfiguration_sdsconfigured.png)
@ -412,7 +414,7 @@ Intune for Education provides an **Express configuration** option so you can get
> [!TIP]
> At the top of the screen, did you notice the **Choose group** button change to a green check mark? This means we are done with that step. If you change your mind or need to make changes, simply click on the button to go back to that step. Try it!
>
> **Figure 23** - Click on the buttons to go back to that step
> **Figure 25** - Click on the buttons to go back to that step
>
> ![Click on the buttons to back to that step](images/i4e_expressconfiguration_choosebuttontogoback.png)
@ -425,7 +427,7 @@ Intune for Education provides an **Express configuration** option so you can get
> [!TIP]
> Web apps are pushed as links in the Windows Start menu under **All apps**. If you want apps to appear in Microsoft Edge browser tabs, use the **Homepages** setting for Microsoft Edge through **Express configuration** or **Manage Users and Devices**.
**Figure 24** - Choose the apps that you want to install for the group
**Figure 26** - Choose the apps that you want to install for the group
![Choose apps to install for the group](images/i4e_expressconfiguration_chooseapps_selected_cropped.png)
@ -435,7 +437,7 @@ Intune for Education provides an **Express configuration** option so you can get
8. In the **Choose settings** screen, we will set the settings to apply to the group. Click the reverse caret (downward-facing arrow) to expand the settings group and get more information about each setting in that settings group.
**Figure 25** - Expand the settings group to get more details
**Figure 27** - Expand the settings group to get more details
![Expand the settings group to get more info](images/i4e_expressconfiguration_choosesettings_expandcollapse_cropped_052217.png)
@ -443,20 +445,20 @@ Intune for Education provides an **Express configuration** option so you can get
- In the **Microsoft Edge settings** group, change the **Do-Not-Track headers** setting to **Require**.
- In the **App settings** group, change the **Microsoft Store for Business apps** setting to **Block**, and then set the **Require Microsoft Store for Business apps to be installed from private store** to **Require**.
**Figure 26** - Set some additional settings
**Figure 28** - Set some additional settings
![Set some additional settings](images/i4e_expressconfiguration_choosesettings_additionalsettings_cropped.png)
10. Click **Next**. In the **Review** screen, you will see a summary of the apps and settings you selected to apply.
**Figure 27** - Review the group, apps, and settings you configured
**Figure 29** - Review the group, apps, and settings you configured
![Review the group, apps, and settings you configured](images/i4e_expressconfiguration_review.png)
11. Click **Save** to end express configuration.
12. You will see the **You're done!** screen which lets you choose one of two options.
**Figure 28** - All done with Intune for Education express configuration
**Figure 30** - All done with Intune for Education express configuration
![Done with Intune for Education express configuration](images/i4e_expressconfiguration_alldone.png)
@ -473,13 +475,13 @@ Intune for Education provides an **Express configuration** option so you can get
1. In the <a href="https://intuneeducation.portal.azure.com/" target="_blank">Intune for Education console</a>, click **Apps** from the menu on the left.
**Figure 29** - Click on **Apps** to see the list of apps for your tenant
**Figure 31** - Click on **Apps** to see the list of apps for your tenant
![Click Apps to see the list of apps for your tenant](images/i4e_dashboard_clickapps.png)
2. In the **Store apps** section, click **+ New app**. This will take you to the Microsoft Store for Education portal and you will already be signed in.
**Figure 30** - Select the option to add a new Store app
**Figure 32** - Select the option to add a new Store app
![Select the option to add a new Store app](images/i4e_apps_newstoreapp_selected.png)
@ -498,7 +500,7 @@ Intune for Education provides an **Express configuration** option so you can get
For example, if you bought Duolingo and Khan Academy, they will show up in your inventory along with the apps that Microsoft automatically provisioned for your education tenant.
**Figure 31** - Apps inventory in Microsoft Store for Education
**Figure 33** - Apps inventory in Microsoft Store for Education
![Apps inventory in Store for Business](images/msfe_manageapps_inventory_grouped.png)
@ -513,32 +515,32 @@ Now that you've bought the apps, use Intune for Education to specify the group t
1. In the <a href="https://intuneeducation.portal.azure.com/" target="_blank">Intune for Education console</a>, click the **Groups** option from the menu on the left.
**Figure 32** - Groups page in Intune for Education
**Figure 34** - Groups page in Intune for Education
![Groups page in Intune for Education](images/i4e_groupspage.png)
2. In the **Groups** page, select **All Users** from the list of groups on the left, and then click **Users** in the taskbar at the top of the **All Users** page.
**Figure 33** - List of all users in the tenant
**Figure 35** - List of all users in the tenant
![List of all users in the tenant](images/i4e_groups_allusers_users_steps.png)
3. In the taskbar at the top, select **Apps** and then click **Edit apps** to see a list of available apps.
**Figure 34** - Edit apps to assign them to users
**Figure 36** - Edit apps to assign them to users
![Edit apps to assign them to users](images/i4e_groups_allusers_appspage_editapps.png)
4. Select the apps to deploy to the group. A blue checkmark will appear next to the apps you select.
**Figure 35** - Select the apps to deploy to the group
**Figure 37** - Select the apps to deploy to the group
![Select the apps to deploy to the group](images/i4e_groups_allusers_selectappstodeploy.png)
5. Once you're done, click **Save** at the bottom of the page to deploy the selected apps to the group.
6. You'll be notified that app assignments are being updated. The updated **All Users** groups page now include the apps you selected.
**Figure 36** - Updated list of assigned apps
**Figure 38** - Updated list of assigned apps
![Updated list of assigned apps](images/i4e_groups_allusers_updatedappslist.png)
@ -586,13 +588,13 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
1. If you don't have a Wi-Fi network configured, make sure you connect the device to the Internet through a wired or Ethernet connection.
2. Go through the Windows device setup experience. On a new or reset device, this starts with the **Let's start with region. Is this right?** screen.
**Figure 37** - Let's start with region
**Figure 39** - Let's start with region
![Let's start with region](images/win10_letsstartwithregion.png)
3. Continue with setup. In the **How would you like to set up?** screen, select **Set up for an organization**.
**Figure 38** - Select setup for an organization
**Figure 40** - Select setup for an organization
![Select setup for an organization](images/win10_setupforanorg.png)
@ -611,7 +613,7 @@ Verify that the device is set up correctly and boots without any issues.
> [!NOTE]
> It may take some time before some apps are pushed down to your device from Intune for Education. Check again later if you don't see some of the apps you provisioned for the user.
**Figure 39** - Sample list of apps for a user
**Figure 41** - Sample list of apps for a user
![Apps list contains the apps provisioned for the user](images/win10_start_checkapps.png)
@ -623,7 +625,7 @@ Let's now verify that the device is joined to your organization's Azure AD and s
2. Select **Groups** and select **All Devices**.
3. In the **All Devices** page, see the list of devices and verify that the device you're signed into appears on the list.
**Figure 40** - List of all managed devices
**Figure 42** - List of all managed devices
![Verify that the device is managed in Intune for Education](images/i4e_groups_alldevices_listofaadjdevices.png)
@ -631,7 +633,7 @@ Let's now verify that the device is joined to your organization's Azure AD and s
5. Select **Accounts > Access work or school**.
6. In the **Access work or school** page, confirm that the device is connected to the organization's Azure AD.
**Figure 41** - Confirm that the Windows 10 device is joined to Azure AD
**Figure 43** - Confirm that the Windows 10 device is joined to Azure AD
![Confirm that the Windows 10 device is joined to Azure AD](images/win10_confirmaadj.png)
@ -647,7 +649,7 @@ If you need to make changes or updates to any of the apps or settings for the gr
2. Click **Groups** and then choose **Settings** in the taskbar at the top of the page.
3. You will see the same settings groups that you saw in express setup for Intune for Education as well as other settings categories such as **Windows Defender settings**, **Device sharing**, **Edition upgrade**, and so on.
**Figure 42** - See the list of available settings in Intune for Education
**Figure 44** - See the list of available settings in Intune for Education
![See the list of available settings in Intune for Education](images/i4e_groups_settingslist_full.png)
@ -669,7 +671,7 @@ Follow the steps in this section to enable a single person to add many devices t
2. Configure the device settings for the school's Active Directory. To do this, go to the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>.
3. Select **Azure Active Directory > Users and groups > Device settings**.
**Figure 43** - Device settings in the new Azure portal
**Figure 45** - Device settings in the new Azure portal
![Configure device settings in the new Azure portal](images/azure_newportal_usersandgroups_devicesettings.png)
@ -686,7 +688,7 @@ Follow the steps in this section to ensure that settings for the each user follo
3. Select **Azure Active Directory > Users and groups > Device settings**.
4. Find the setting **Users may sync settings and enterprise app data** and change the value to **All**.
**Figure 44** - Enable settings to roam with users
**Figure 46** - Enable settings to roam with users
![Enable settings to roam with users](images/azure_usersandgroups_devicesettings_ers.png)
@ -714,7 +716,7 @@ Adding a new device to your cloud-based tenant is easy. For new devices, you can
For example, if a teacher connects their personal device to the school network, they'll see the following screen after typing in their account information.
**Figure 45** - Device is now managed by Intune for Education
**Figure 47** - Device is now managed by Intune for Education
![Device is managed by Intune for Education](images/byob_aad_enrollment_intune.png)
@ -724,7 +726,7 @@ Adding a new device to your cloud-based tenant is easy. For new devices, you can
5. After the user's credentails are validated, the window will refresh and will now include an entry that shows the device is now connected to the organization's MDM. This means the device is now enrolled in Intune for Education MDM and the account should have access to the organization's resources.
**Figure 46** - Device is connected to organization's MDM
**Figure 48** - Device is connected to organization's MDM
![Device is connected to organization's MDM](images/win10_connectedtoorgmdm.png)

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

View File

@ -4,6 +4,8 @@ hide_bc: true
title: Microsoft Education documentation and resources | Microsoft Docs
description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers.
author: CelesteDG
ms.author: celested
ms.date: ms.date: 06/12/2017
---
<div id="main" class="v2">
<div class="container">

View File

@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: edu
author: CelesteDG
ms.author: celested
ms.date: 06/19/2017
---
# Change history for Windows 10 for Education

View File

@ -7,6 +7,7 @@ ms.sitesec: library
localizationpriority: high
author: CelesteDG
ms.author: celested
ms.date: 06/19/2017
---
# Windows 10 configuration recommendations for education customers

View File

@ -7,6 +7,7 @@ ms.sitesec: library
localizationpriority: high
author: CelesteDG
ms.author: celested
ms.date: 06/19/2017
ms.prod: W10
---

View File

@ -9,6 +9,7 @@ ms.pagetype: edu
localizationpriority: high
author: CelesteDG
ms.author: celested
ms.date: 06/26/2017
---
# Use the Set up School PCs app
@ -67,6 +68,7 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
> [!WARNING]
> Only use the provisioning package on PCs that you want to configure and lock down for students. After you apply the provisioning package to a student PC, the PC must be reset to remove the settings.
* The student PCs must be in range of the Wi-Fi network that you configured in Set up School PCs or have a wired Ethernet connection when you set them up. Otherwise, setup will fail.
* If the PC has already been set up and you want to return to the first-run experience to apply a new package, you can reset the PC to get to a clean state and get it back to the first-run experience and ready to provision again.
To do this:
@ -91,18 +93,16 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm
Learn more about what Set up School PCs does, including provisioning details, in [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md).
## Prerequisites
## Set up School PCs app step-by-step
- [Download the latest Set up School PCs app from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
- Install the app on your work PC and make sure you're connected to your school's network.
- You must be an administrator on Office 365 and Azure Active Directory, and have Microsoft Store for Education configured. It's best if you sign up for and configure Intune for Education before using the Set up School PCs app.
- Have a USB drive, 1 GB or larger, to save the provisioning package. We recommend an 8 GB or larger USB drive if you're installing Office.
What you need:
## Set up School PCs step-by-step
- The **Set up School PCs** app, installed on your work PC and connected to your school's network.
To get started, [download the latest Set up School PCs app from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4ls40).
- A USB drive, 1 GB or larger. We recommend an 8 GB or larger USB drive if you're installing Office.
### Create the provisioning package in the app
### Create the provisioning package
The **Set up School PCs** app guides you through the configuration choices for the student PCs.
@ -193,7 +193,9 @@ The **Set up School PCs** app guides you through the configuration choices for t
3. Click **Next** or **Skip** depending on whether you want to set up Take a Test.
8. In the **Add recommended apps** page, you can choose from a set of recommended Microsoft Store apps to provision. The recommended apps include the following:
* **Office 365 for Windows 10 S (Education Preview)** - Your student PCs must be running Windows 10 S to install this app. If you try to install this app on other editions of Windows, setup will fail.
* **Office 365 for Windows 10 S (Education Preview)**
* Office 365 for Windows 10 S will only work on student PCs running Windows 10 S. If you try to install this app on other editions of Windows, setup will fail.
* When adding the Office 365 for Windows 10 S to a package, the device you use to run Set up School PCs does not have to be running Windows 10 S.
* **Minecraft: Education Edition** - Free trial
* Popular **STEM and Makerspace apps**

View File

@ -21,7 +21,12 @@
"ms.sitesec": "library",
"ms.topic": "article",
"ms.author": "jamiet",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.mdop"
}
}
},
"externalReference": [
],

View File

@ -30,7 +30,12 @@
"externalReference": [],
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/smb/breadcrumb/toc.json"
"breadcrumb_path": "/windows/smb/breadcrumb/toc.json",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "TechNet.smb"
}
}
},
"fileMetadata": {},
"template": [],

View File

@ -36,7 +36,12 @@
"ms.author": "trudyha",
"ms.technology": "windows",
"ms.topic": "article",
"ms.date": "05/09/2017"
"ms.date": "05/09/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.store-for-business"
}
}
},
"fileMetadata": {},
"template": [],

View File

@ -38,9 +38,12 @@ We need an email address in case we need to contact you about your Microsoft Sto
Taxes for Microsoft Store for Business purchases are determined by your business address. Businesses in these countries can provide their VAT number or local equivalent:
- Austria
- Belgium
- Bulgaria
- Croatia
- Cyprus
- Czech Republic
- Denmark
- Estonia
- Finland
- France
- Germany
@ -48,6 +51,10 @@ Taxes for Microsoft Store for Business purchases are determined by your business
- Hungary
- Ireland
- Italy
- Latvia
- Liechtenstein
- Lithuania
- Luxembourg
- Malta
- Netherlands
- Norway
@ -65,8 +72,10 @@ These countries can provide their VAT number or local equivalent in **Payments &
|Market| Tax identifier |
|------|----------------|
| Australia | ABN (optional) |
| Brazil | CNPJ (required) |
| India | CST ID, VAT ID (both are optional) |
| New Zealand | GST Registration number (optional) |
| Taiwan | VAT ID (optional) |
### Tax-exempt status

View File

@ -17,34 +17,39 @@ author: brianlic-msft
Credential Guard has certain application requirements. Credential Guard blocks specific authentication capabilities. Therefore applications that require such capabilities will not function when Credential Guard is enabled. For further information, see [Application requirements](https://docs.microsoft.com/en-us/windows/access-protection/credential-guard/credential-guard-requirements#application-requirements).
The following known issues have been fixed by servicing releases made available in the Cumulative Security Updates for April 2017:
The following known issue has been fixed by servicing releases made available in the Cumulative Security Updates for April 2017:
- KB4015217: [Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
- [KB4015217 Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
This issue can potentially lead to unexpected account lockouts.
See also Knowledge Base articles [KB4015219](https://support.microsoft.com/en-us/help/4015219/windows-10-update-kb4015219) and
This issue can potentially lead to unexpected account lockouts. See also Microsoft® Knowledge Base articles [KB4015219](https://support.microsoft.com/en-us/help/4015219/windows-10-update-kb4015219) and
[KB4015221](https://support.microsoft.com/en-us/help/4015221/windows-10-update-kb4015221)
The following issue is under investigation. For available workarounds, see the following Knowledge Base article:
- [Installing AppSense Environment Manager on Windows 10 machines causes LSAiso.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945) * <sup>[1]</sup>
*Registration required to access this article.
<sup>[1]</sup> For further technical information on LSAiso.exe, see this MSDN article: [Isolated User Mode (IUM) Processes](https://msdn.microsoft.com/library/windows/desktop/mt809132(v=vs.85).aspx)
The following issue affects Cisco AnyConnect Secure Mobility Client:
- [Blue screen on Windows 10 computers running Device Guard and Credential Guard with Cisco Anyconnect 4.3.04027](https://quickview.cloudapps.cisco.com/quickview/bug/CSCvc66692)**
- [Blue screen on Windows 10 computers running Device Guard and Credential Guard with Cisco Anyconnect 4.3.04027](https://quickview.cloudapps.cisco.com/quickview/bug/CSCvc66692) \*
**Registration required to access this article.
*Registration required to access this article.
Products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 clients to exhibit high CPU usage. For further information, see the following Knowledge Base article:
The following issue affects McAfee Application and Change Control (MACC):
- [KB88869 Windows 10 machines exhibit high CPU sage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869) <sup>[1]</sup>
- KB88869: [Windows 10 machines exhibit high CPU usage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869)
The following issue is under investigation:
The following issue affects AppSense Environment Manager.
For further information, see the following Knowledge Base article:
- [Installing AppSense Environment Manager on Windows 10 machines causes LSAISO.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945) <sup>[1]</sup> \**
The following issue affects Citrix applications:
- Windows 10 machines exhibit high CPU usage with Citrix applications installed when Credential Guard is enabled. <sup>[1]</sup>
<sup>[1]</sup> Products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 or Windows Server 2016 machines to exhibit high CPU usage. For technical and troubleshooting information, see the following Microsoft Knowledge Base article:
- [KB4032786 High CPU usage in the LSAISO process on Windows 10 or Windows Server 2016](https://support.microsoft.com/en-us/help/4032786)
For further technical information on LSAISO.exe, see the MSDN article: [Isolated User Mode (IUM) Processes](https://msdn.microsoft.com/library/windows/desktop/mt809132(v=vs.85).aspx)
\** Registration is required to access this article.
- Windows 10 machines exhibit high CPU usage with Citrix applications installed when Credential Guard is enabled.
## Vendor support

View File

@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.win-access-protection"
}
}
},
"fileMetadata": {},
"template": [],

View File

@ -155,6 +155,7 @@ There are 3 types of log files that occur when you sequence multiple apps at the
- **Log.txt file**. Located in the **Output Package** folder. This file contains all code included in the NewAppVSequencerPackage cmdlet, including the allowed parameters.
### Related topics
- [Download the Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
- [How to install the App-V Sequencer](appv-install-the-sequencer.md)

View File

@ -158,6 +158,7 @@ There are 3 types of log files that occur when you sequence multiple apps at the
- **Log.txt file**. Located in the **Output Package** folder. This file contains all code included in the NewAppVSequencerPackage cmdlet, including the allowed parameters.
### Related topics
- [Download the Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
- [How to install the App-V Sequencer](appv-install-the-sequencer.md)

View File

@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "elizapo",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.win-app-management"
}
}
},
"fileMetadata": {},
"template": [],

View File

@ -36,7 +36,12 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "dongill",
"ms.date": "04/05/2017"
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.win-client-management"
}
}
},
"fileMetadata": {},
"template": [],

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# ActiveSync CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# ActiveSync DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Add an Azure AD tenant and Azure AD subscription

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AllJoynManagement CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AllJoynManagement DDF

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# APPLICATION configuration service provider

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# ApplicationRestrictions XSD

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AppLocker CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AppLocker DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AppLocker XSD

View File

@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Deploy and configure App-V apps using MDM

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Assign seat

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AssignedAccess CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# AssignedAccess DDF

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
<head>

View File

@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# BitLocker CSP

View File

@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# BitLocker DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# BOOTSTRAP CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# BrowserFavorite CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Bulk assign and reclaim seats from users

View File

@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CellularSettings CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Certificate authentication device enrollment

View File

@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Certificate Renewal

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CertificateStore CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CertificateStore DDF file

View File

@ -6,6 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CleanPC CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CleanPC DDF

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# ClientCertificateInstall CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# ClientCertificateInstall DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CM\_CellularEntries CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CM\_ProxyEntries CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CMPolicy CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CMPolicyEnterprise CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CMPolicyEnterprise DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Configuration service provider reference

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Create a custom configuration service provider

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CustomDeviceUI CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# CustomDeviceUI DDF

View File

@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Data structures for Windows Store for Business
@ -28,6 +29,7 @@ Here's the list of data structures used in the Windows Store for Business REST A
- [LicenseType](#licensetype)
- [LocalizedProductDetail](#localizedproductdetail)
- [OfflineLicense](#offlinelicense)
- [PackageContentInfo](#packagecontentinfo)
- [PackageLocation](#packagelocation)
- [ProductArchitectures](#productarchitectures)
- [ProductDetails](#productdetails)
@ -85,26 +87,22 @@ Specifies the properties of the alternate identifier.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>seatDetails</p></td>
<td><p>Collection of [SeatDetails](#seatdetails)</p></td>
<td><p></p></td>
<td><p>collection of [SeatDetails](#seatdetails)</p></td>
</tr>
<tr class="even">
<td><p>failedSeatOperations</p></td>
<td><p>Collection of [FailedSeatRequest](#failedseatrequest)</p></td>
<td><p></p></td>
<td><p>collection of [FailedSeatRequest](#failedseatrequest)</p></td>
</tr>
</tbody>
</table>
@ -117,31 +115,26 @@ Specifies the properties of the alternate identifier.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>failureReason</p></td>
<td><p>string</p></td>
<td><p></p></td>
</tr>
<tr class="even">
<td><p>productKey</p></td>
<td><p>[ProductKey](#productkey)</p></td>
<td><p></p></td>
</tr>
<tr class="odd">
<td><p>userName</p></td>
<td><p>string</p></td>
<td><p></p></td>
</tr>
</tbody>
</table>
@ -173,7 +166,7 @@ Specifies the properties of the alternate identifier.
<tr class="even">
<td><p>contentId</p></td>
<td><p>string</p></td>
<td><p>Identifies a specific application</p></td>
<td><p>Identifies a specific application.</p></td>
</tr>
<tr class="odd">
<td><p>location</p></td>
@ -208,11 +201,11 @@ Specifies the properties of the alternate identifier.
<tr class="odd">
<td><p>fileSize</p></td>
<td><p>integer-64</p></td>
<td><p></p></td>
<td><p>Size of the file.</p></td>
</tr>
<tr class="even">
<td><p>packageRank</p></td>
<td><p>integer-3232</p></td>
<td><p>integer-32</p></td>
<td><p>Optional</p></td>
</tr>
</tbody>
@ -225,26 +218,22 @@ Specifies the properties of the alternate identifier.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="66%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>open</p></td>
<td></td>
<td><p>Open distribution policy - licenses/seats can be assigned/consumed without limit</p></td>
</tr>
<tr class="even">
<td><p>restricted</p></td>
<td></td>
<td><p>Restricted distribution policy - licenses/seats must be assigned/consumed according to the available count</p></td>
</tr>
</tbody>
@ -277,7 +266,7 @@ Specifies the properties of the alternate identifier.
<tr class="even">
<td><p>seatCapacity</p></td>
<td><p>integer-64</p></td>
<td><p>Total number of seats that have been purchased for an application</p></td>
<td><p>Total number of seats that have been purchased for an application.</p></td>
</tr>
<tr class="odd">
<td><p>availableSeats</p></td>
@ -296,12 +285,12 @@ Specifies the properties of the alternate identifier.
</tr>
<tr class="even">
<td><p>distributionPolicy</p></td>
<td><p>InventoryDistributionPolicy</p></td>
<td><p>[InventoryDistributionPolicy](#inventorydistributionpolicy)</p></td>
<td></td>
</tr>
<tr class="odd">
<td><p>status</p></td>
<td><p>InventoryStatus</p></td>
<td><p>[InventoryStatus](#inventorystatus)</p></td>
<td></td>
</tr>
</tbody>
@ -329,11 +318,11 @@ Specifies the properties of the alternate identifier.
<tr class="odd">
<td><p>continuationToken</p></td>
<td><p>string</p></td>
<td><p>continuationToken is only available if there is a next page</p></td>
<td><p>Only available if there is a next page.</p></td>
</tr>
<tr class="even">
<td><p>inventoryEntries</p></td>
<td><p>collection of</p></td>
<td><p>collection of [InventoryEntryDetails](#inventoryentrydetails)</p></td>
<td><p></p></td>
</tr>
</tbody>
@ -346,27 +335,23 @@ Specifies the properties of the alternate identifier.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="66%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>active</p></td>
<td><p></p></td>
<td><p>Entry is available in the organizations inventory</p></td>
<td><p>Entry is available in the organizations inventory.</p></td>
</tr>
<tr class="even">
<td><p>removed</p></td>
<td><p></p></td>
<td><p>Entry has been removed from the organizations inventory</p></td>
<td><p>Entry has been removed from the organizations inventory.</p></td>
</tr>
</tbody>
</table>
@ -378,8 +363,8 @@ Specifies the properties of the alternate identifier.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="66%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
@ -497,43 +482,13 @@ Specifies the properties of the localized product.
 
## ProductArchitectures
<table>
<colgroup>
<col width="100%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>neutral</p></td>
</tr>
<tr class="even">
<td><p>arm</p></td>
</tr>
<tr class="odd">
<td><p>x86</p></td>
</tr>
<tr class="even">
<td><p>x64</p></td>
</tr>
</tbody>
</table>
 
## PackageContentInfo
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
@ -582,6 +537,36 @@ Specifies the properties of the localized product.
 
## ProductArchitectures
<table>
<colgroup>
<col width="100%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>neutral</p></td>
</tr>
<tr class="even">
<td><p>arm</p></td>
</tr>
<tr class="odd">
<td><p>x86</p></td>
</tr>
<tr class="even">
<td><p>x64</p></td>
</tr>
</tbody>
</table>
 
## ProductDetails
@ -611,7 +596,7 @@ Specifies the properties of the localized product.
</tr>
<tr class="odd">
<td><p>supportedLanguages</p></td>
<td><p>collection of strings</p></td>
<td><p>collection of string</p></td>
<td><p>The set of localized languages for an application.</p></td>
</tr>
<tr class="even">
@ -644,10 +629,74 @@ Specifies the properties of the localized product.
 
## ProductImage
Specifies the properties of the product image.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>location</p></td>
<td><p>URI</p></td>
<td><p>Location of the download image.</p></td>
</tr>
<tr class="even">
<td><p>purpose</p></td>
<td><p>string</p></td>
<td><p>Tag for the purpose of the image, e.g. "screenshot" or "logo".</p></td>
</tr>
<tr class="odd">
<td><p>height</p></td>
<td><p>string</p></td>
<td><p>Height of the image in pixels.</p></td>
</tr>
<tr class="even">
<td><p>width</p></td>
<td><p>string</p></td>
<td><p>Width of the image in pixels.</p></td>
</tr>
<tr class="odd">
<td><p>caption</p></td>
<td><p>string</p></td>
<td><p>Unlimited length.</p></td>
</tr>
<tr class="even">
<td><p>backgroundColor</p></td>
<td><p>string</p></td>
<td><p>Format "#RRGGBB"</p></td>
</tr>
<tr class="odd">
<td><p>foregroundColor</p></td>
<td><p>string</p></td>
<td><p>Format "#RRGGBB"</p></td>
</tr>
<tr class="even">
<td><p>fileSize</p></td>
<td><p>integer-64</p></td>
<td><p>Size of the file.</p></td>
</tr>
</tbody>
</table>
 
## ProductKey
Specifies the proerties of the product key.
Specifies the properties of the product key.
<table>
<colgroup>
@ -678,104 +727,6 @@ Specifies the proerties of the product key.
 
## ProductImage
Specifies the proerties of the product image.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>location</p></td>
<td><p>URI</p></td>
<td><p>Location of the download images.</p></td>
</tr>
<tr class="even">
<td><p>purpose</p></td>
<td><p>string</p></td>
<td><p>App screenshots and icons</p></td>
</tr>
<tr class="odd">
<td><p>height</p></td>
<td><p>string</p></td>
<td><p>Height of the image in pixels.</p></td>
</tr>
<tr class="even">
<td><p>width</p></td>
<td><p>string</p></td>
<td><p>Width of the image in pixels.</p></td>
</tr>
<tr class="odd">
<td><p>caption</p></td>
<td><p>string</p></td>
<td><p>Unlimited</p></td>
</tr>
<tr class="even">
<td><p>backgroundColor</p></td>
<td><p>string</p></td>
<td><p>Format #RRGGBB</p></td>
</tr>
<tr class="odd">
<td><p>foregroundColor</p></td>
<td><p>string</p></td>
<td><p>Format #RRGGBB</p></td>
</tr>
<tr class="even">
<td><p>fileSize</p></td>
<td><p>long</p></td>
<td><p>Size of the file.</p></td>
</tr>
</tbody>
</table>
 
## PublisherDetails
Specifies the proerties of the publisher details.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>publisherName</p></td>
<td><p>string</p></td>
<td><p>Name of the publisher.</p></td>
</tr>
<tr class="even">
<td><p>publisherWebsite</p></td>
<td><p>string</p></td>
<td><p>Website of the publisher.</p></td>
</tr>
</tbody>
</table>
 
## ProductPackageDetails
@ -799,15 +750,15 @@ Specifies the proerties of the publisher details.
<td><p></p></td>
</tr>
<tr class="even">
<td><p>contentId</p></td>
<td><p>string</p></td>
<td><p>Identifies a specific application.</p></td>
</tr>
<tr class="odd">
<td><p>packageId</p></td>
<td><p>string</p></td>
<td></td>
</tr>
<tr class="odd">
<td><p>contentId</p></td>
<td><p>string</p></td>
<td><p>Identifies a specific application.</p></td>
</tr>
<tr class="even">
<td><p>location</p></td>
<td><p>[PackageLocation](#packagelocation)</p></td>
@ -831,7 +782,7 @@ Specifies the proerties of the publisher details.
<tr class="even">
<td><p>packageFormat</p></td>
<td><p>[ProductPackageFormat](#productpackageformat)</p></td>
<td><p>appx, appxbundle, xap</p></td>
<td><p>Extension of the package file.</p></td>
</tr>
<tr class="odd">
<td><p>platforms</p></td>
@ -839,19 +790,41 @@ Specifies the proerties of the publisher details.
<td><p></p></td>
</tr>
<tr class="even">
<td><p>packageId</p></td>
<td><p>string</p></td>
<td><p></p></td>
</tr>
<tr class="odd">
<td><p>fileSize</p></td>
<td><p>integer-64</p></td>
<td><p></p></td>
<td><p>Size of the file.</p></td>
</tr>
<tr class="even">
<tr class="odd">
<td><p>packageRank</p></td>
<td><p>integer-32</p></td>
<td><p>optional</p></td>
<td><p>Optional</p></td>
</tr>
</tbody>
</table>
 
## ProductPackageFormat
<table>
<colgroup>
<col width="100%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>appx</p></td>
</tr>
<tr class="even">
<td><p>appxBundle</p></td>
</tr>
<tr class="odd">
<td><p>xap</p></td>
</tr>
</tbody>
</table>
@ -890,40 +863,13 @@ Specifies the proerties of the publisher details.
 
## ProductPackageFormat
<table>
<colgroup>
<col width="100%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>appx</p></td>
</tr>
<tr class="even">
<td><p>appxBundle</p></td>
</tr>
<tr class="odd">
<td><p>xap</p></td>
</tr>
</tbody>
</table>
 
## ProductPlatform
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
@ -949,6 +895,40 @@ Specifies the proerties of the publisher details.
 
## PublisherDetails
Specifies the properties of the publisher details.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th>Name</th>
<th>Type</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td><p>publisherName</p></td>
<td><p>string</p></td>
<td><p>Name of the publisher.</p></td>
</tr>
<tr class="even">
<td><p>publisherWebsite</p></td>
<td><p>string</p></td>
<td><p>Website of the publisher.</p></td>
</tr>
</tbody>
</table>
 
## SeatAction
@ -1020,8 +1000,8 @@ Specifies the proerties of the publisher details.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
@ -1032,7 +1012,7 @@ Specifies the proerties of the publisher details.
<tbody>
<tr class="odd">
<td><p>seats</p></td>
<td><p>Collection of [SeatDetails](#seatdetails)</p></td>
<td><p>collection of [SeatDetails](#seatdetails)</p></td>
</tr>
<tr class="even">
<td><p>continuationToken</p></td>
@ -1072,8 +1052,8 @@ Specifies the proerties of the publisher details.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
@ -1096,7 +1076,7 @@ Specifies the proerties of the publisher details.
</tr>
<tr class="even">
<td><p>architectures</p></td>
<td><p>collection of ProductArchitectures</p></td>
<td><p>collection of [ProductArchitecture](#productarchitecture)</p></td>
</tr>
</tbody>
</table>
@ -1108,8 +1088,8 @@ Specifies the proerties of the publisher details.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
<col width="33%" />
<col width="66%" />
</colgroup>
<thead>
<tr class="header">
@ -1120,29 +1100,19 @@ Specifies the proerties of the publisher details.
<tbody>
<tr class="odd">
<td><p>major</p></td>
<td><p>integer-23</p></td>
<td><p>integer-32</p></td>
</tr>
<tr class="even">
<td><p>minor</p></td>
<td><p>integer-23</p></td>
<td><p>integer-32</p></td>
</tr>
<tr class="odd">
<td><p>build</p></td>
<td><p>integer-23</p></td>
<td><p>integer-32</p></td>
</tr>
<tr class="even">
<td><p>revision</p></td>
<td><p>integer-23</p></td>
<td><p>integer-32</p></td>
</tr>
</tbody>
</table>
 
 

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Defender CSP
@ -14,7 +15,7 @@ author: nickbrower
The Windows Defender configuration service provider is used to configure various Windows Defender actions across the enterprise.
The following image shows the Windows Defender configuration service provider in tree format
The following image shows the Windows Defender configuration service provider in tree format.
![defender csp diagram](images/provisioning-csp-defender.png)

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Defender DDF file

View File

@ -10,6 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# Design a custom configuration service provider

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DevDetail CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DevDetail DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeveloperSetup CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeveloperSetup DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeviceInstanceService CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeviceLock CSP

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeviceLock DDF file

View File

@ -7,6 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
---
# DeviceManageability CSP

Some files were not shown because too many files have changed in this diff Show More