From baea27f588d2845398e7fed081209330e08f5844 Mon Sep 17 00:00:00 2001
From: Alekhya Jupudi <89069896+alekyaj@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:34:44 +0530
Subject: [PATCH 1/9] Windows: Minecraft for EDU updates
The updates here are made as per Task: 5959100. Thanks!
---
education/windows/school-get-minecraft.md | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md
index 38b068d300..6c05523c6c 100644
--- a/education/windows/school-get-minecraft.md
+++ b/education/windows/school-get-minecraft.md
@@ -20,27 +20,30 @@ ms.topic: conceptual
**Applies to:**
-- Windows 10
+- Windows 10
When you sign up for a [Minecraft: Education Edition](https://education.minecraft.net) trial, or purchase a [Minecraft: Education Edition](https://education.minecraft.net) subscription. Minecraft will be added to the inventory in your Microsoft Store for Education which is associated with your Azure Active Directory (Azure AD) tenant. Your Microsoft Store for Education is only displayed to members of your organization.
>[!Note]
>If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you request Minecraft: Education Edition. For more information see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans).
-## Settings for Office 365 A3 or Office 365 A5 customers
+## Settings for Microsoft 365 A3 or Microsoft 365 A5 customers
Schools that purchased these products have an extra option for making Minecraft: Education Edition available to their students:
-- Office 365 A3 or Office 365 A5
-- Enterprise Mobility + Security E3 or Enterprise Mobility + Security E5
+
+- Microsoft 365 A3 or Microsoft 365 A5
- Minecraft: Education Edition
-If your school has these products in your tenant, admins can choose to enable Minecraft: Education Edition for students using Office 365 A3 or Office 365 A5. On your Office 365 A3 or Office 365 A5 details page in **Microsoft Store for Education**, under **Settings & actions**, you can select **Allow access to Minecraft: Education Edition for users of Office 365 A3 or Office 365 A5**.
+If your school has these products in your tenant, admins can choose to enable Minecraft: Education Edition for students using Microsoft 365 A3 or Microsoft 365 A5. From the left-hand menu in Microsoft Admin Center, select Users. From the Users list, select the users you want to add or remove for Minecraft: Education Edition access. Add the relevant A3 or A5 license if it hasn't been assigned already.
-When this setting is selected, students in your tenant can use Minecraft: Education Edition even if they do not have a trial or a direct license assigned to them.
+> [!Note]
+> If you add a faculty license, the user will be assigned an instructor role in the application and will have elevated permissions.
-If you turn off this setting after students have been using Minecraft: Education Edition, they will have 25 more days to use Minecraft: Education Edition before they do not have access.
+After selecting the appropriate product license, ensure Minecraft: Education Edition is toggled on or off, depending on if you want to add or remove Minecraft: Education Edition from the user (it will be on by default).
-## Add Minecraft to your Microsoft Store for Education
+If you turn off this setting after students have been using Minecraft: Education Edition, they will have up to 30 more days to use Minecraft: Education Edition before they don't have access.
+
+## Add Minecraft to your Microsoft Store for Education
You can start with the Minecraft: Education Edition trial to get individual copies of the app. For more information, see [Minecraft: Education Edition - direct purchase](#individual-copies).
From d63f6ab56b1fadbcad791354565eb9eaeaa82619 Mon Sep 17 00:00:00 2001
From: Alekhya Jupudi <89069896+alekyaj@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:01:24 +0530
Subject: [PATCH 2/9] Alt text fixes as per suggestion
---
education/windows/school-get-minecraft.md | 45 +++++++++++++----------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md
index 6c05523c6c..1870717145 100644
--- a/education/windows/school-get-minecraft.md
+++ b/education/windows/school-get-minecraft.md
@@ -76,6 +76,7 @@ Now that the app is in your Microsoft Store for Education inventory, you can cho
If you need additional licenses for **Minecraft: Education Edition**, see [Purchase additional licenses](./education-scenarios-store-for-business.md#purchase-additional-licenses).
### Minecraft: Education Edition - volume licensing
+
Qualified education institutions can purchase Minecraft: Education Edition licenses through their Microsoft channel partner. Schools need to be part of the Enrollment for Education Solutions (EES) volume licensing program. Educational institutions should work with their channel partner to determine which Minecraft: Education Edition licensing offer is best for their institution. The process looks like this:
- Your channel partner will submit and process your volume license order, your licenses will be shown on [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), and the licenses will be available in your [Microsoft Store for Education](https://www.microsoft.com/business-store) inventory.
@@ -83,13 +84,17 @@ Qualified education institutions can purchase Minecraft: Education Edition licen
- Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com) to distribute and manage the Minecraft: Education Edition licenses. For more information on distribution options, see [Distribute Minecraft](#distribute-minecraft)
## Minecraft: Education Edition payment options
+
You can pay for Minecraft: Education Edition with a debit or credit card, or with an invoice.
### Debit or credit cards
+
During the purchase, click **Get started! Add a way to pay.** Provide the info needed for your debit or credit card.
### Invoices
+
Invoices are now a supported payment method for Minecraft: Education Edition. There are a few requirements:
+
- Admins only (not supported for Teachers)
- $500 invoice minimum for your initial purchase
- $15,000 invoice maximum (for all invoices within your organization)
@@ -112,6 +117,7 @@ After you've finished the purchase, you can find your invoice by checking **Mine
> After you complete a purchase, it can take up to twenty-four hours for the app to appear in **Apps & software**.
**To view your invoice**
+
1. In Microsoft Store for Education, click **Manage** and then click **Apps & software**.
2. Click **Minecraft: Education Edition** in the list of apps.
3. On **Minecraft: Education Edition**, click **View Bills**.
@@ -120,7 +126,7 @@ After you've finished the purchase, you can find your invoice by checking **Mine
4. On **Invoice Bills**, click the invoice number to view and download your invoice. It downloads as a .pdf.
- 
+ 
The **Payment Instructions** section on the first page of the invoice has information on invoice amount, due date, and how to pay with electronic funds transfer, or with a check.
@@ -154,21 +160,21 @@ For Minecraft: Education Edition, you can use auto assign subscription to contro
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com)
2. Click Manage.
-
+
You'll see Minecraft: Education Edition product page.
-
+

-
+
-Or-
-
- 
-
-3. Slide the **Auto assign subscription** or click **Turn off auto assign subscription**.
+
+ 
+3. Slide the **Auto assign subscription** or click **Turn off auto assign subscription**.
### Install for me
-You can install the app on your PC. This gives you a chance to test the app and know how you might help others in your organization use the app.
-1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
+You can install the app on your PC. This gives you a chance to test the app and know how you might help others in your organization use the app.
+
+1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**, and then click **Install**.
@@ -176,20 +182,19 @@ You can install the app on your PC. This gives you a chance to test the app and
3. Click **Install**.
### Assign to others
-Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. You can assign the app to individuals, groups, or add it to your private store, where students and teachers in your organization can download the app.
+Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. You can assign the app to individuals, groups, or add it to your private store, where students and teachers in your organization can download the app.
**To assign to others**
-1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
+
+1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**.

-3. Click **Invite people**.
-
+3. Click **Invite people**.
4. Type the name, or email address of the student or group you want to assign the app to, and then click **Assign**.
- You can only assign the app to students with work or school accounts. If you don't find the student, you might need to add a work or school account for the student.
-
+ You can only assign the app to students with work or school accounts. If you don't find the student, you might need to add a work or school account for the student.

**To finish Minecraft install (for students)**
@@ -225,14 +230,15 @@ Download for others allows teachers or IT admins to download an app that they ca
Minecraft: Education Edition will not install if there are updates pending for other apps on the PC. Before installing Minecraft, check to see if there are pending updates for Microsoft Store apps.
**To check for app updates**
+
1. Start Microsoft Store app on the PC (click **Start**, and type **Store**).
2. Click the account button, and then click **Downloads and updates**.
- 
+ 
3. Click **Check for updates**, and install all available updates.
- 
+ 
4. Restart the computer before installing Minecraft: Education Edition.
@@ -241,8 +247,7 @@ You'll download a .zip file, extract the files, and then use one of the files to
1. **Download Minecraft Education Edition.zip**. From the **Minecraft: Education Edition** page, click **Download for others** tab, and then click **Download**.
- 
-
+ 
2. **Extract files**. Find the .zip file that you downloaded and extract the files. This is usually your **Downloads** folder, unless you chose to save the .zip file to a different location. Right-click the file and choose **Extract all**.
3. **Save to USB drive**. After you've extracted the files, save the Minecraft: Education Edition folder to a USB drive, or to a network location that you can access from each PC.
4. **Install app**. Use the USB drive to copy the Minecraft folder to each Windows 10 PC where you want to install Minecraft: Education Edition. Open Minecraft: Education Edition folder, right-click **InstallMinecraftEducationEdition.bat** and click **Run as administrator**.
From 61ea1958cba4e119a68efb917b2d875096623844 Mon Sep 17 00:00:00 2001
From: Alekhya Jupudi <89069896+alekyaj@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:09:39 +0530
Subject: [PATCH 3/9] Acrolinx fix
---
education/windows/school-get-minecraft.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md
index 1870717145..5fc9b496f6 100644
--- a/education/windows/school-get-minecraft.md
+++ b/education/windows/school-get-minecraft.md
@@ -25,7 +25,7 @@ ms.topic: conceptual
When you sign up for a [Minecraft: Education Edition](https://education.minecraft.net) trial, or purchase a [Minecraft: Education Edition](https://education.minecraft.net) subscription. Minecraft will be added to the inventory in your Microsoft Store for Education which is associated with your Azure Active Directory (Azure AD) tenant. Your Microsoft Store for Education is only displayed to members of your organization.
>[!Note]
->If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you request Minecraft: Education Edition. For more information see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans).
+>If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you request Minecraft: Education Edition. For more information, see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans).
## Settings for Microsoft 365 A3 or Microsoft 365 A5 customers
@@ -47,7 +47,7 @@ If you turn off this setting after students have been using Minecraft: Education
You can start with the Minecraft: Education Edition trial to get individual copies of the app. For more information, see [Minecraft: Education Edition - direct purchase](#individual-copies).
-If you’ve been approved and are part of the Enrollment for Education Solutions volume license program, you can purchase a volume licenses for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license).
+If you’ve been approved and are part of the Enrollment for Education Solutions volume license program, you can purchase a volume license for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license).
### Minecraft: Education Edition - direct purchase
From f31faa51060444e84d28ae1e0b6510feb2529bc4 Mon Sep 17 00:00:00 2001
From: gkomatsu
Date: Wed, 20 Apr 2022 08:41:26 -0700
Subject: [PATCH 4/9] Description update for auto-subscription policy
Added warning to clarify the policy is in preview state.
Fixed description of auto-subscription policy. It was mistakenly copying the description of LoadAadCredKeyFromProfile policy
---
windows/client-management/mdm/policy-csp-remotedesktop.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/windows/client-management/mdm/policy-csp-remotedesktop.md b/windows/client-management/mdm/policy-csp-remotedesktop.md
index 5941d52099..8098c08682 100644
--- a/windows/client-management/mdm/policy-csp-remotedesktop.md
+++ b/windows/client-management/mdm/policy-csp-remotedesktop.md
@@ -18,6 +18,8 @@ manager: dansimp
## RemoteDesktop policies
+> [!Warning]
+> Some information relates to prerelease products, which may be substantially modified before it's commercially released. Microsoft makes no warranties, expressed or implied, concerning the information provided here.
-
@@ -64,7 +66,7 @@ manager: dansimp
-This policy allows the user to load the DPAPI cred key from their user profile and decrypt any previously encrypted DPAPI data in the user profile or encrypt any new DPAPI data.
+This policy allows to set the default connection URL for Remote Desktop Application. If you define this policy the specified URL is configured as the default subscription URL to Azure Virtual Desktop work spaces.
From f9632b8bc5e88fd359f42b76865d79c274fee805 Mon Sep 17 00:00:00 2001
From: gkomatsu
Date: Wed, 20 Apr 2022 16:02:32 -0700
Subject: [PATCH 5/9] Update policy-csp-remotedesktop.md
Update to reflect feedback from David
---
.../mdm/policy-csp-remotedesktop.md | 32 +++----------------
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/windows/client-management/mdm/policy-csp-remotedesktop.md b/windows/client-management/mdm/policy-csp-remotedesktop.md
index 8098c08682..a673c8f950 100644
--- a/windows/client-management/mdm/policy-csp-remotedesktop.md
+++ b/windows/client-management/mdm/policy-csp-remotedesktop.md
@@ -30,17 +30,10 @@ manager: dansimp
-> [!TIP]
-> These are ADMX-backed policies and require a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-**RemoteDesktop/AutoSubscription<**
+**RemoteDesktop/AutoSubscription**
@@ -59,26 +52,17 @@ manager: dansimp
[Scope](./policy-configuration-service-provider.md#policy-scope):
> [!div class = "checklist"]
-> * Device
+> * User
-This policy allows to set the default connection URL for Remote Desktop Application. If you define this policy the specified URL is configured as the default subscription URL to Azure Virtual Desktop work spaces.
+This policy allows administrators to enable automatic subscription for the Microsoft Remote Desktop client. If you define this policy, the specified URL is used by the client to silently subscribe the logged on user and retrieve the remote resources assigned to them. To automatically subscribe to Azure Virtual Desktop in the Azure Public cloud, set the URL to .
-
-
-ADMX Info:
-- GP Friendly name: *Customize warning messages*
-- GP name: *AutoSubscription*
-- GP path: *System/Remote Desktop*
-- GP ADMX file name: *remotedesktop.admx*
-
-
@@ -109,7 +93,7 @@ ADMX Info:
-This policy allows the user to load the DPAPI cred key from their user profile and decrypt any previously encrypted DPAPI data in the user profile or encrypt any new DPAPI data.
+This policy allows the user to load the DPAPI cred key from their user profile and decrypt any previously encrypted DPAPI data in the user profile or encrypt any new DPAPI data. This policy is needed when using FSLogix user profiles from Azure AD-joined VMs.
@@ -121,14 +105,6 @@ The following list shows the supported values:
-
-ADMX Info:
-- GP Friendly name: *Allow DPAPI cred keys to be loaded from user profiles during logon for AADJ accounts*
-- GP name: *LoadAadCredKeyFromProfile*
-- GP path: *System/RemoteDesktop*
-- GP ADMX file name: *remotedesktop.admx*
-
-
From d7eac987b4f82486574dbac4c3870b2d6c140602 Mon Sep 17 00:00:00 2001
From: Venkat Akkinepally
Date: Wed, 20 Apr 2022 17:04:24 -0700
Subject: [PATCH 6/9] Change incorrect information in MCC for ISP doc
---
windows/deployment/do/mcc-isp.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/deployment/do/mcc-isp.md b/windows/deployment/do/mcc-isp.md
index 406565ed09..dd4a7afbbc 100644
--- a/windows/deployment/do/mcc-isp.md
+++ b/windows/deployment/do/mcc-isp.md
@@ -27,7 +27,7 @@ ms.topic: article
Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many physical servers or VMs as needed, and is managed from a cloud portal. Microsoft cloud services handle routing of consumer devices to the cache server for content downloads.
-MCC is a hybrid (a mix of on-prem and cloud resources) SaaS solution built as an Azure IoT Edge module; it is a Docker compatible Linux container that is deployed to your Windows devices. IoT Edge for Linux on Windows (EFLOW) was chosen because it is a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It’s built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC will be a Linux IoT Edge module running on the Windows Host OS. Azure IoT Edge consists of three components that the MCC infrastructure will utilize:
+Microsoft Connected Cache is a Hybrid (mix of on-prem and cloud resources) solution composed of a Docker compatible Linux container deployed to your server and a cloud management portal. Microsoft chose Azure IoT Edge (more information on IoT Edge [in the appendix](#iot-edge-runtime)) as a secure and reliable control plane, and even though your scenario is not related to IoT, Azure IoT Edge is our secure Linux container deployment and management infrastructure. Azure IoT Edge consists of three components that the Microsoft Connected Cache infrastructure will utilize:
1. A cloud-based interface that enables secure, remote installation, monitoring, and management of MCC nodes.
2. A runtime that securely manages the modules deployed to each device.
From 104d54bee3dfe01df86f72b595e0d7147f8fad0b Mon Sep 17 00:00:00 2001
From: Venkat Akkinepally
Date: Wed, 20 Apr 2022 17:13:54 -0700
Subject: [PATCH 7/9] Modify important onboarding information
---
windows/deployment/do/mcc-enterprise.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows/deployment/do/mcc-enterprise.md b/windows/deployment/do/mcc-enterprise.md
index 8078d99554..2622d23564 100644
--- a/windows/deployment/do/mcc-enterprise.md
+++ b/windows/deployment/do/mcc-enterprise.md
@@ -114,7 +114,7 @@ For questions regarding these instructions contact [msconnectedcache@microsoft.c
As part of the MCC preview onboarding process an Azure subscription ID must be provided to Microsoft.
> [!IMPORTANT]
-> [Contact Microsoft](mailto:mccforenterprise@microsoft.com?subject=[MCC%20for%20Enterprise]%20Please%20add%20our%20Azure%20subscription%20to%20the%20allow%20list) and provide this information if you have not already. You'll not be able to proceed if you skip this step.
+> [Take this survey](https://aka.ms/MSConnectedCacheSignup) and provide your Azure subscription ID and contact information to be added to the allow list for this preview. You will not be able to proceed if you skip this step.
For information about creating or locating your subscription ID, see [Steps to obtain an Azure Subscription ID](#steps-to-obtain-an-azure-subscription-id).
@@ -122,7 +122,7 @@ For information about creating or locating your subscription ID, see [Steps to o
The MCC Azure management portal is used to create and manage MCC nodes. An Azure Subscription ID is used to grant access to the preview and to create the MCC resource in Azure and Cache nodes.
-Send email to the MCC team ([mccforenterprise@microsoft.com](mailto:mccforenterprise@microsoft.com)) with your Azure subscription ID to get access to the preview. The team will send you a link to the Azure portal which will allow you to create the resource described below.
+Once you take the survey above and the MCC team adds your subscription id to the allow list, you will be given a link to the Azure portal where you can create the resource described below.
1. On the Azure Portal home page, choose **Create a resource**:

From 59e207f77644faba43d6b989bee3d8d20ce23294 Mon Sep 17 00:00:00 2001
From: gkomatsu
Date: Thu, 21 Apr 2022 09:13:48 -0700
Subject: [PATCH 8/9] Update policy-csp-remotedesktop.md
Changed URL format from link to non-link
---
windows/client-management/mdm/policy-csp-remotedesktop.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/client-management/mdm/policy-csp-remotedesktop.md b/windows/client-management/mdm/policy-csp-remotedesktop.md
index a673c8f950..b4b1b65ef8 100644
--- a/windows/client-management/mdm/policy-csp-remotedesktop.md
+++ b/windows/client-management/mdm/policy-csp-remotedesktop.md
@@ -59,7 +59,7 @@ manager: dansimp
-This policy allows administrators to enable automatic subscription for the Microsoft Remote Desktop client. If you define this policy, the specified URL is used by the client to silently subscribe the logged on user and retrieve the remote resources assigned to them. To automatically subscribe to Azure Virtual Desktop in the Azure Public cloud, set the URL to .
+This policy allows administrators to enable automatic subscription for the Microsoft Remote Desktop client. If you define this policy, the specified URL is used by the client to silently subscribe the logged on user and retrieve the remote resources assigned to them. To automatically subscribe to Azure Virtual Desktop in the Azure Public cloud, set the URL to 'https://rdweb.wvd.microsoft.com/api/arm/feeddiscovery'.
From 1204ee761c4771c2c3d9130211c8a508e2fbdeb9 Mon Sep 17 00:00:00 2001
From: gkomatsu
Date: Thu, 21 Apr 2022 14:18:34 -0700
Subject: [PATCH 9/9] Update policy-csp-remotedesktop.md
Updated URL with `
---
windows/client-management/mdm/policy-csp-remotedesktop.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/client-management/mdm/policy-csp-remotedesktop.md b/windows/client-management/mdm/policy-csp-remotedesktop.md
index b4b1b65ef8..7d2559655b 100644
--- a/windows/client-management/mdm/policy-csp-remotedesktop.md
+++ b/windows/client-management/mdm/policy-csp-remotedesktop.md
@@ -59,7 +59,7 @@ manager: dansimp
-This policy allows administrators to enable automatic subscription for the Microsoft Remote Desktop client. If you define this policy, the specified URL is used by the client to silently subscribe the logged on user and retrieve the remote resources assigned to them. To automatically subscribe to Azure Virtual Desktop in the Azure Public cloud, set the URL to 'https://rdweb.wvd.microsoft.com/api/arm/feeddiscovery'.
+This policy allows administrators to enable automatic subscription for the Microsoft Remote Desktop client. If you define this policy, the specified URL is used by the client to silently subscribe the logged on user and retrieve the remote resources assigned to them. To automatically subscribe to Azure Virtual Desktop in the Azure Public cloud, set the URL to `https://rdweb.wvd.microsoft.com/api/arm/feeddiscovery`.