Merge pull request #266760 from TimShererWithAquent/graphps39

Bulk update | 174285 MS Graph PowerShell cmdlet update Phase 3

Author: v-dirichards

articles/automation/manage-office-365.md

@@ -4,7 +4,7 @@ description: This article tells how to use Azure Automation to manage Office 365
 services: automation
 ms.date: 11/05/2020
 ms.topic: conceptual
-ms.custom: has-azure-ad-ps-ref
+ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
 ---
 
 # Manage Office 365 services
@@ -20,28 +20,21 @@ You need the following to manage Office 365 subscription services in Azure Autom
 * Microsoft Entra ID. See [Use Microsoft Entra ID in Azure Automation to authenticate to Azure](automation-use-azure-ad.md).
 * An Office 365 tenant, with an account. See [Set up your Office 365 tenant](/sharepoint/dev/spfx/set-up-your-developer-tenant).
 
-## Install the MSOnline and MSOnlineExt modules
+## Install Microsoft Graph PowerShell
 
-Use of Office 365 within Azure Automation requires Microsoft Entra ID for Windows PowerShell (`MSOnline` module). You'll also need the module [`MSOnlineExt`](https://www.powershellgallery.com/packages/MSOnlineExt/1.0.35), which simplifies Microsoft Entra management in single- and multi-tenant environments. Install the modules as described in [Use Microsoft Entra ID in Azure Automation to authenticate to Azure](automation-use-azure-ad.md).
+Use of Office 365 within Azure Automation requires the Microsoft Graph PowerShell module.
+
+```powershell
+Install-Module Microsoft.Graph -Scope CurrentUser
+```
 
 >[!NOTE]
->To use MSOnline PowerShell, you must be a member of Microsoft Entra ID. Guest users can't use the module.
+>To use Microsoft Graph PowerShell, you must be a member of Microsoft Entra ID. Guest users can't use the module.
 
 ## Create an Azure Automation account
 
 To complete the steps in this article, you need an account in Azure Automation. See [Create an Azure Automation account](./quickstarts/create-azure-automation-account-portal.md).
 
-## Add MSOnline and MSOnlineExt as assets
-
-Now add the installed MSOnline and MSOnlineExt modules to enable Office 365 functionality. Refer to [Manage modules in Azure Automation](shared-resources/modules.md).
-
-1. In the Azure portal, select **Automation Accounts**.
-2. Choose your Automation account.
-3. Select **Modules Gallery** under **Shared Resources**.
-4. Search for MSOnline.
-5. Select the `MSOnline` PowerShell module and click **Import** to import the module as an asset.
-6. Repeat steps 4 and 5 to locate and import the `MSOnlineExt` module.
-
 ## Create a credential asset (optional)
 
 It's optional to create a credential asset for the Office 365 administrative user who has permissions to run your script. It can help, though, to keep from exposing user names and passwords inside PowerShell scripts. For instructions, see [Create a credential asset](automation-use-azure-ad.md#create-a-credential-asset).
@@ -55,36 +48,32 @@ To run Office 365 subscription services, you need an Office 365 service account
 ## Connect to the Microsoft Entra online service
 
 >[!NOTE]
->To use the MSOnline module cmdlets, you must run them from Windows PowerShell. PowerShell Core does not support these cmdlets.
+>To use the Microsoft Graph PowerShell module cmdlets, you must run them from Windows PowerShell. PowerShell Core does not support these cmdlets.
 
-You can use the MSOnline module to connect to Microsoft Entra ID from the Office 365 subscription. The connection uses an Office 365 user name and password or uses multi-factor authentication (MFA). You can connect using the Azure portal or a Windows PowerShell command prompt (does not have to be elevated).
+You can connect to Microsoft Entra ID from the Office 365 subscription. The connection uses an Office 365 user name and password or uses multi-factor authentication (MFA). You can connect using the Azure portal or a Windows PowerShell command prompt (does not have to be elevated).
 
-A PowerShell example is shown below. The [Get-Credential](/powershell/module/microsoft.powershell.security/get-credential) cmdlet prompts for credentials and stores them in the `Msolcred` variable. Then the [Connect-MsolService](/powershell/module/msonline/connect-msolservice) cmdlet uses the credentials to connect to the Azure directory online service. If you want to connect to a specific Azure environment, use the `AzureEnvironment` parameter.
+A PowerShell example is shown below. For more information, see [Connect-MgGraph](/powershell/module/microsoft.graph.authentication/connect-mggraph).
 
 ```powershell
-$Msolcred = Get-Credential
-Connect-MsolService -Credential $MsolCred -AzureEnvironment "AzureCloud"
+Connect-MgGraph -Scopes "Directory.Read.All"
 ```
 
-If you don't receive any errors, you've connected successfully. A quick test is to run an Office 365 cmdlet, for example, `Get-MsolUser`, and see the results. If you receive errors, note that a common problem is an incorrect password.
-
->[!NOTE]
->You can also use the AzureRM module or the Az module to connect to Microsoft Entra ID from the Office 365 subscription. The main connection cmdlet is [Connect-AzureAD](/powershell/module/azuread/connect-azuread). This cmdlet supports the `AzureEnvironmentName` parameter for specific Office 365 environments.
+If you don't receive any errors, you've connected successfully. A quick test is to run an Office 365 cmdlet, for example, [Get-MgUser](/powershell/module/microsoft.graph.users/get-mguser), and see the results.
 
 ## Create a PowerShell runbook from an existing script
 
-You access Office 365 functionality from a PowerShell script. Here's an example of a script for a credential named `Office-Credentials` with user name of `[email protected]`. It uses `Get-AutomationPSCredential` to import the Office 365 credential.
+You access Office 365 functionality from a PowerShell script.
 
 ```powershell
 $emailFromAddress = "[email protected]"
 $emailToAddress = "[email protected]"
 $emailSMTPServer = "outlook.office365.com"
 $emailSubject = "Office 365 License Report"
-
 $credObject = Get-AutomationPSCredential -Name "Office-Credentials"
-Connect-MsolService -Credential $credObject
 
-$O365Licenses = Get-MsolAccountSku | Out-String
+Connect-MgGraph -Scopes "Directory.Read.All"
+
+$O365Licenses = Get-MgSubscribedSku | Out-String
 Send-MailMessage -Credential $credObject -From $emailFromAddress -To $emailToAddress -Subject $emailSubject -Body $O365Licenses -SmtpServer $emailSMTPServer -UseSSL
 ```