Skip to content

Commit 195b061

Browse files
authored
Merge branch 'master' into patch-252
2 parents 3eb3c27 + 362d104 commit 195b061

File tree

48 files changed

+2348
-1760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2348
-1760
lines changed

.openpublishing.publish.config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,5 +253,8 @@
253253
"target_framework": "net45",
254254
"version": "latest"
255255
}
256-
]
256+
],
257+
"docs_build_engine": {
258+
"name": "docfx_v3"
259+
}
257260
}

.openpublishing.redirection.json

Lines changed: 1281 additions & 1281 deletions
Large diffs are not rendered by default.

exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ description: "Learn about using the Exchange Online V2 module in scripts and oth
2020
# App-only authentication for unattended scripts in the EXO V2 module
2121

2222
> [!NOTE]
23-
> This feature is currently in Public Preview, and is available in the `2.0.3-Preview` release of Exchange Online PowerShell V2 Module. For instructions on how to install or update to this version of the module, see [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
23+
> This feature and the required `2.0.3` version of the EXO V2 module are now Generally Available. For instructions on how to install or update to this version of the module, see [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
2424
2525
Auditing and reporting scenarios in Exchange Online often involve scripts that run unattended. In most cases, these unattended scripts access Exchange Online PowerShell using Basic authentication (a username and password). Even when the connection to Exchange Online PowerShell uses modern authentication, the credentials are stored in a local file or a secret vault that's accessed at run-time.
2626

@@ -41,6 +41,14 @@ The following examples show how to use the Exchange Online PowerShell V2 module
4141
```
4242

4343
When you use the _CertificateThumbPrint_ parameter, the certificate needs to be installed on the computer where you are running the command. The certificate should be installed in the user certificate store.
44+
45+
- Connect using a certificate object:
46+
47+
```powershell
48+
Connect-ExchangeOnline -Certificate <%X509Certificate2 Object%> -AppID "36ee4c6c-0812-40a2-b820-b22ebd02bce3" -Organization "contosoelectronics.onmicrosoft.com"
49+
```
50+
51+
When you use the _Certificate_ parameter, the certificate does not need to be installed on the computer where you are running the command. This parameter is applicable for scenarios where the certificate object is stored remotely and fetched at runtime during script execution.
4452

4553
## How does it work?
4654

exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: eop
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid:
1212
ROBOTS: NOINDEX

exchange/docs-conceptual/basic-auth-connect-to-exo-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: exchange-online
9+
ms.service: exchange-powershell
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
1212
ms.custom:

exchange/docs-conceptual/basic-auth-connect-to-scc-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: o365-security-and-compliance
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid:
1212
ROBOTS: NOINDEX

exchange/docs-conceptual/cmdlet-property-sets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: exchange-online
9+
ms.service: exchange-powershell
1010
ms.reviewer: navgupta
1111
localization_priority: Priority
1212
ms.collection: Strat_EX_Admin

exchange/docs-conceptual/connect-to-exchange-online-powershell.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager: dansimp
55
ms.date:
66
ms.audience: Admin
77
ms.topic: article
8-
ms.service: exchange-online
8+
ms.service: exchange-powershell
99
ms.reviewer: navgupta
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
@@ -27,7 +27,7 @@ To use the older Exchange Online Remote PowerShell Module to connect to Exchange
2727

2828
## What do you need to know before you begin?
2929

30-
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
30+
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module). The rest of the instructions in the topic assume that you've already installed the module.
3131

3232
- If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for Exchange Online Protection (EOP), your EOP PowerShell connection instructions are the same as Exchange Online PowerShell as described in this topic.
3333

@@ -36,14 +36,16 @@ To use the older Exchange Online Remote PowerShell Module to connect to Exchange
3636
3737
## Connect to Exchange Online PowerShell using MFA
3838

39-
If you account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Exchange Online PowerShell without using MFA](#connect-to-exchange-online-powershell-without-using-mfa) section.
39+
If your account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Exchange Online PowerShell without using MFA](#connect-to-exchange-online-powershell-without-using-mfa) section.
4040

4141
1. In a Windows PowerShell window, load the EXO V2 module by running the following command:
4242

4343
```powershell
4444
Import-Module ExchangeOnlineManagement
4545
```
4646

47+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
48+
4749
2. The command that you need to run uses the following syntax:
4850

4951
```powershell
@@ -103,6 +105,8 @@ If your account doesn't use multi-factor authentication, use the steps in this s
103105
Import-Module ExchangeOnlineManagement
104106
```
105107

108+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
109+
106110
2. Run the following command:
107111

108112
```powershell

exchange/docs-conceptual/connect-to-exchange-online-protection-powershell.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager: dansimp
55
ms.date:
66
ms.audience: Admin
77
ms.topic: article
8-
ms.service: exchange-online
8+
ms.service: exchange-powershell
99
ms.reviewer: navgupta
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
@@ -29,21 +29,23 @@ To use the older, less secure remote PowerShell connection instructions that [wi
2929

3030
If your organization is on-premises Exchange, and you have Exchange Enterprise CAL with Services licenses for EOP, your EOP PowerShell connection instructions are the same as Exchange Online PowerShell. Use the Exchange Online PowerShell connection instructions in [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) instead of the instructions in this topic.
3131

32-
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
32+
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module). The rest of the instructions in the topic assume that you've already installed the module.
3333

3434
> [!TIP]
3535
> Having problems? Ask for help in the [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351) forum.
3636
3737
## Connect to Exchange Online Protection PowerShell using MFA
3838

39-
If you account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Exchange Online Protection PowerShell without using MFA](#connect-to-exchange-online-protection-powershell-without-using-mfa) section.
39+
If your account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Exchange Online Protection PowerShell without using MFA](#connect-to-exchange-online-protection-powershell-without-using-mfa) section.
4040

4141
1. In a Windows PowerShell window, load the EXO V2 module by running the following command:
4242

4343
```powershell
4444
Import-Module ExchangeOnlineManagement
4545
```
4646

47+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
48+
4749
2. The command that you need to run uses the following syntax:
4850

4951
```powershell
@@ -84,6 +86,8 @@ If your account doesn't use multi-factor authentication, use the steps in this s
8486
Import-Module ExchangeOnlineManagement
8587
```
8688

89+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
90+
8791
2. Run the following command:
8892

8993
```powershell

exchange/docs-conceptual/connect-to-exchange-servers-using-remote-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-itpro
9+
ms.prod: exchange-server-it-pro
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
1212
ms.custom:

exchange/docs-conceptual/connect-to-scc-powershell.md

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager: dansimp
55
ms.date:
66
ms.audience: Admin
77
ms.topic: article
8-
ms.service: exchange-online
8+
ms.service: exchange-powershell
99
ms.reviewer: navgupta
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
@@ -27,26 +27,29 @@ To use the older Exchange Online Remote PowerShell Module to connect to Security
2727

2828
## What do you need to know before you begin?
2929

30-
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
30+
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module). The rest of the instructions in the topic assume that you've already installed the module.
3131

3232
## Connect to Security & Compliance PowerShell using MFA
3333

34-
If you account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Security & Compliance Center PowerShell without using MFA](#connect-to-security--compliance-center-powershell-without-using-mfa) section.
34+
If your account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Security & Compliance Center PowerShell without using MFA](#connect-to-security--compliance-center-powershell-without-using-mfa) section.
3535

3636
1. In a Windows PowerShell window, load the EXO V2 module by running the following command:
3737

3838
```powershell
3939
Import-Module ExchangeOnlineManagement
4040
```
4141

42+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
43+
4244
2. The command that you need to run uses the following syntax:
4345

4446
```powershell
45-
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>]
47+
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>]
4648
```
4749

4850
- _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
49-
- The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
51+
- The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
52+
- When you use the _UserPrincipalName_ parameter, you don't need to use the
5053

5154
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
5255

@@ -57,19 +60,20 @@ If you account uses multi-factor authentication, use the steps in this section.
5760
**This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
5861

5962
```powershell
60-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.outlook.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
63+
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.outlook.de/PowerShell-LiveID
6164
```
6265

6366
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
6467

6568
```powershell
66-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
69+
Connect-IPPSSession -UserPrincipalName -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
6770
```
6871

6972
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
7073

7174
```powershell
72-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
75+
Connect-IPPSSession -UserPrincipalName -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
76+
```
7377

7478
For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
7579

@@ -90,6 +94,8 @@ If your account doesn't use multi-factor authentication, use the steps in this s
9094
Import-Module ExchangeOnlineManagement
9195
```
9296

97+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
98+
9399
2. Run the following command:
94100

95101
```powershell
@@ -101,10 +107,10 @@ If your account doesn't use multi-factor authentication, use the steps in this s
101107
3. The command that you need to run uses the following syntax:
102108

103109
```powershell
104-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri <URL>
110+
Connect-IPPSSession -Credential $UserCredential [-ConnectionUri <URL>] [-AzureADAuthorizationEndpointUri <URL>]
105111
```
106112

107-
The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
113+
The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
108114

109115
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
110116

@@ -115,19 +121,19 @@ If your account doesn't use multi-factor authentication, use the steps in this s
115121
**This example connects to Security & Compliance Center PowerShell in an Office 365 Germany organization**.
116122

117123
```powershell
118-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/
124+
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.de/common
119125
```
120126

121127
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
122128

123129
```powershell
124-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
130+
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
125131
```
126132

127133
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
128134

129135
```powershell
130-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
136+
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
131137
```
132138

133139
For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).

exchange/docs-conceptual/control-remote-powershell-access-to-exchange-servers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-itpro
9+
ms.prod: exchange-server-it-pro
1010
localization_priority: Normal
1111
ms.assetid: 064e3bb0-38bf-495e-9994-784f823b88dd
1212
description: "Administrators can learn how to block or allow users' remote PowerShell access to Exchange servers."

exchange/docs-conceptual/disable-access-to-exchange-online-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: exchange-online
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid: f969816a-2607-4655-9d47-9e8767fb5633
1212
search.appverid: MET150

exchange/docs-conceptual/exchange-management-shell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: "Exchange Server PowerShell (Exchange Management Shell)"
33
ms.author: chrisda
44
author: chrisda
5-
manager: sansimp
5+
manager: dansimp
66
ms.date:
77
ms.audience: ITPro
88
ms.topic: article
9-
ms.prod: exchange-server-itpro
9+
ms.prod: exchange-server-it-pro
1010
localization_priority: Normal
1111
ms.assetid: 925ad66f-2f05-4269-9923-c353d9c19312
1212
description: "Learn about Exchange Server PowerShell, also known as the Exchange Management Shell. This topic describes how PowerShell works on Exchange servers, and provides links to other topics that can help you learn how to use the Exchange Management Shell."

0 commit comments

Comments
 (0)