Skip to content

Commit 14ad48f

Browse files
Merge branch 'master' into dev/NetworkSite_RoamingPolicy
2 parents 688a19e + 1151c42 commit 14ad48f

File tree

257 files changed

+4635
-1310
lines changed

Some content is hidden

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

257 files changed

+4635
-1310
lines changed

exchange/docfx.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
"ms.date": "09/25/2017",
8282
"ms.topic": "reference",
8383
"ms.service": "exchange-powershell",
84+
"products": [
85+
"https://authoring-docs-microsoft.poolparty.biz/devrel/0b654e73-5728-4af3-8c2e-17bfbf4c9f23",
86+
"https://authoring-docs-microsoft.poolparty.biz/devrel/8bce367e-2e90-4b56-9ed5-5e4e9f3a2dc3"
87+
],
8488
"ms.devlang": "powershell",
8589
"feedback_system": "GitHub",
8690
"feedback_github_repo": "MicrosoftDocs/office-docs-powershell",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Create a self-signed x.509 certificate using one of the following methods:
207207

208208
## Step 4: Attach the certificate to the Azure AD application
209209

210-
After you register the certificate with your application, you can use the public key (`.pfx` file) or the thumbprint for authentication.
210+
After you register the certificate with your application, you can use the private key (`.pfx` file) or the thumbprint for authentication.
211211

212212
1. On the **Apps registration** page from the end of [Step 2](#step-2-assign-api-permissions-to-the-application), select your application.
213213

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ For more information about filtering in the EXO V2 module, see [Filters in the E
2727

2828
The available property sets for the **Get-EXOCasMailbox** cmdlet and the properties they contain are described in the following table:
2929

30+
<br>
31+
3032
****
3133

3234
|PropertySet|Properties|
@@ -56,6 +58,10 @@ For more information, see:
5658

5759
The available property sets for the **Get-EXOMailbox** cmdlet and the properties they contain are described in the following table:
5860

61+
<br>
62+
63+
****
64+
5965
|PropertySet|Properties|
6066
|---|---|
6167
|**Minimum**|Alias <br> DisplayName <br> DistinguishedName <br> EmailAddresses <br> ExchangeVersion <br> ExternalDirectoryObjectId <br> Guid <br> Id <br> Name <br> OrganizationId <br> PrimarySmtpAddress <br> RecipientType <br> RecipientTypeDetails <br> UserPrincipalName|
@@ -94,6 +100,8 @@ For more information, see:
94100

95101
The available property sets for the **Get-EXOMailboxStatistics** cmdlet and the properties they contain are described in the following table:
96102

103+
<br>
104+
97105
****
98106

99107
|PropertySet|Properties|
@@ -111,6 +119,8 @@ For more information, see:
111119

112120
The available property sets for the **Get-EXORecipient** cmdlet and the properties they contain are described in the following table:
113121

122+
<br>
123+
114124
****
115125

116126
|PropertySet|Properties|

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

Lines changed: 16 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,35 @@ To use the older Exchange Online Remote PowerShell Module to connect to Exchange
4242
> [!TIP]
4343
> Having problems? Ask in the [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542) forum.
4444
45-
## Connect to Exchange Online PowerShell using MFA and modern authentication
45+
## Connect to Exchange Online PowerShell using modern authentication with or without MFA
4646

47-
If your account uses multi-factor authentication, use the steps in this section. Otherwise, skip to the [Connect to Exchange Online PowerShell using modern authentication](#connect-to-exchange-online-powershell-using-modern-authentication) section.
47+
These connection instructions use modern authentication and work with or without multi-factor authentication (MFA).
4848

49-
**Note**: For other sign in methods that are available in PowerShell 7, see the [PowerShell 7 log in experiences](#powershell-7-log-in-experiences) section later in this topic.
49+
For other sign in methods that are available in PowerShell 7, see the [PowerShell 7 log in experiences](#powershell-7-log-in-experiences) section later in this topic.
5050

5151
1. In a PowerShell window, load the EXO V2 module by running the following command:
5252

5353
```powershell
5454
Import-Module ExchangeOnlineManagement
5555
```
5656

57-
**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.
57+
**Notes**:
58+
59+
- 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.
60+
- You might be able to skip this step and run **Connect-ExchangeOnline** without loading the module first.
5861

5962
2. The command that you need to run uses the following syntax:
6063

6164
```powershell
62-
Connect-ExchangeOnline -UserPrincipalName <UPN> [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
65+
Connect-ExchangeOnline -UserPrincipalName <UPN> [-ShowBanner:$false] [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
6366
```
6467

6568
- _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
6669
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](/powershell/module/exchange/connect-exchangeonline).
6770
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](/office365/servicedescriptions/office-365-platform-service-description/partners).
6871
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](/powershell/module/microsoft.powershell.core/new-pssessionoption).
69-
- The progress bar is now shown by default, so `-ShowProgress $true` is no longer required. To hide the progress bar, use this exact syntax: `-ShowProgress:$false`.
72+
- You can often omit the _UserPrincipalName_ parameter in the next step to enter both the username and password after you run the **Connect-ExchangeOnline** command. If it doesn't work, then you need to use the _UserPrincipalName_ parameter.
73+
- If you aren't using MFA, you can often use the _Credential_ parameter instead of the _UserPrincipalName_ parameter. First, run the command `$Credential = Get-Credential`, enter your username and password, and then use the variable name for the _Credential_ parameter (`-Credential $Credential`). If it doesn't work, then you need to use the _UserPrincipalName_ parameter.
7074

7175
**This example connects to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
7276

@@ -98,85 +102,20 @@ If your account uses multi-factor authentication, use the steps in this section.
98102
Connect-ExchangeOnline -UserPrincipalName [email protected] -DelegatedOrganization adatum.onmicrosoft.com
99103
```
100104

101-
For detailed syntax and parameter information, see [Connect-ExchangeOnline](/powershell/module/exchange/connect-exchangeonline).
105+
3. In the sign-in window that opens, enter your password, and then click **Sign in**.
102106

103-
> [!NOTE]
104-
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
107+
![Enter your password in the Sign in to your account window](media/connect-exo-password-prompt.png)
105108

106-
```powershell
107-
Disconnect-ExchangeOnline
108-
```
109+
4. **MFA only**: A verification code is generated and delivered based on the response option that's configured for your account (for example, a text message or the Microsoft Authenticator app on your device).
109110

110-
## Connect to Exchange Online PowerShell using modern authentication
111+
In the verification window that opens, enter the verification code, and then click **Verify**.
111112

112-
If your account doesn't use multi-factor authentication, use the steps in this section.
113-
114-
**Note**: For other sign in methods that are available in PowerShell 7, see the [PowerShell 7 log in experiences](#powershell-7-log-in-experiences) section later in this topic.
115-
116-
1. In a PowerShell window, load the EXO V2 module by running the following command:
117-
118-
```powershell
119-
Import-Module ExchangeOnlineManagement
120-
```
121-
122-
**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.
123-
124-
2. Run the following command:
125-
126-
> [!NOTE]
127-
> You can skip this step and omit the _Credential_ parameter in the next step to be prompted to enter the username and password after you run the **Connect-ExchangeOnline** command. If you omit the _Credential_ parameter and include the _UserPrincipalName_ parameter in the next step, you're only prompted to enter the password after you run the **Connect-ExchangeOnline** command.
128-
129-
```powershell
130-
$UserCredential = Get-Credential
131-
```
132-
133-
In the credentials prompt, enter your work or school account and password.
134-
135-
3. The last command that you need to run uses the following syntax:
136-
137-
```powershell
138-
Connect-ExchangeOnline [-Credential $UserCredential] [-ShowBanner:$false] [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
139-
```
140-
141-
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](/powershell/module/exchange/connect-exchangeonline).
142-
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](/office365/servicedescriptions/office-365-platform-service-description/partners).
143-
- If you're behind a proxy server, store the output of the [New-PSSessionOption](/powershell/module/microsoft.powershell.core/new-pssessionoption) cmdlet in a variable (for example, `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value> [-ProxyAuthentication <Value>] [-ProxyCredential <Value>]`). Then, use the variable (`$ProxyOptions`) as the value for the _PSSessionOption_ parameter.
144-
- The progress bar is now shown by default, so `-ShowProgress $true` is no longer required. To hide the progress bar, use this exact syntax: `-ShowProgress:$false`.
145-
146-
**Connect to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
147-
148-
```powershell
149-
Connect-ExchangeOnline -Credential $UserCredential
150-
```
151-
152-
**Connect to Exchange Online PowerShell in an Office 365 Germany organization**:
153-
154-
```powershell
155-
Connect-ExchangeOnline -Credential $UserCredential -ExchangeEnvironmentName O365GermanyCloud
156-
```
157-
158-
**Connect to Exchange Online PowerShell in an Office 365 operated by 21Vianet organization**:
159-
160-
```powershell
161-
Connect-ExchangeOnline -Credential $UserCredential -ExchangeEnvironmentName O365China
162-
```
163-
164-
**Connect to Exchange Online PowerShell in a Microsoft 365 GCC High organization**:
165-
166-
```powershell
167-
Connect-ExchangeOnline -Credential $UserCredential -ExchangeEnvironmentName O365USGovGCCHigh
168-
```
169-
170-
**Connect to Exchange Online PowerShell in a Microsoft 365 DoD organization**:
171-
172-
```powershell
173-
Connect-ExchangeOnline -Credential $UserCredential -ExchangeEnvironmentName O365USGovDoD
174-
```
113+
![Enter your verification code in the Sign in to your account window](media/connect-exo-mfa-verify-prompt.png)
175114

176115
For detailed syntax and parameter information, see [Connect-ExchangeOnline](/powershell/module/exchange/connect-exchangeonline).
177116

178117
> [!NOTE]
179-
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command:
118+
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
180119
181120
```powershell
182121
Disconnect-ExchangeOnline

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ If your account uses multi-factor authentication, use the steps in this section.
7979
Connect-IPPSSession -UserPrincipalName -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
8080
```
8181

82-
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
82+
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
8383

8484
> [!NOTE]
8585
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
@@ -146,7 +146,7 @@ If your account doesn't use multi-factor authentication, use the steps in this s
146146
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
147147
```
148148

149-
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
149+
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
150150

151151
> [!NOTE]
152152
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command:

exchange/docs-conceptual/exchange-cmdlet-syntax.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ This article explains these conventions, and also the syntax that's required to
2727

2828
Exchange PowerShell help follows conventions that indicate what's required or optional, and how to enter parameters and values when you run a command. These command conventions are listed in the following table.
2929

30+
<br>
31+
32+
****
33+
3034
|Symbol|Description|
3135
|---|---|
3236
|`-`|A hyphen indicates a parameter. For example, `-Identity`.|
@@ -107,6 +111,10 @@ If you enclose the string in single quotation marks, the only special character
107111

108112
The following table shows the valid operators that you can use in an Exchange command. Some of these symbols were also described in the earlier [Command conventions in Exchange PowerShell](#command-conventions-in-exchange-powershell) section. However, these symbols have different meanings when they're used on the command line as operators. For example, the minus sign that's used to indicate a parameter can also be used in a command as a mathematical operator.
109113

114+
<br>
115+
116+
****
117+
110118
|Operator|Description|
111119
|---|---|
112120
|`=`|The equal sign is used as an assignment character. The value on the right side of the equal sign is assigned to the variable on the left side of the equal sign. The following characters are also assignment characters: <ul><li>`+=`: Add the value on the right side of the equal sign to the current value that's contained in the variable on the left side of the equal sign.</li><li>`-=`: Subtract the value on the right side of the equal sign from the current value that's contained in the variable on the left side of the equal sign.</li><li>`*=`: Multiply the current value of the variable on the left side of the equal sign by the value that's specified on the right side of the equal sign.</li><li>`/=`: Divide the current value of the variable on the left side of the equal sign by the value that's specified on the right side of the equal sign.</li><li> `%=`: Modify the current value of the variable on the left side of the equal sign by the value that's specified on the right side of the equal sign.</li></ul>|

0 commit comments

Comments
 (0)