Skip to content

Commit 04719b0

Browse files
authored
Merge branch 'master' into patch-10
2 parents 8900496 + 1c532d7 commit 04719b0

File tree

8 files changed

+63
-29
lines changed

8 files changed

+63
-29
lines changed

exchange/exchange-ps/exchange/Add-UnifiedGroupLinks.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ Add-UnifiedGroupLinks -Identity "Legal Department" -LinkType Members -Links chri
4545

4646
This example adds members [email protected] and [email protected] to the Microsoft 365 Group named Legal Department.
4747

48+
### Example 2
49+
```powershell
50+
$users= Get-User -ResultSize unlimited | where {$_.Department -eq "Marketing" -AND $_.RecipientType -eq "UserMailbox"}
51+
Add-UnifiedGroupLinks -Identity Marketing -LinkType members -Links ($users.UserPrincipalName)
52+
```
53+
54+
This example shows how to add bulk members to a Microsoft 365 Group. Mailboxes where the Department attribute is "Marketing" are added to Microsoft 365 Group named Marketing.
55+
4856
## PARAMETERS
4957

5058
### -Identity

exchange/exchange-ps/exchange/Complete-MigrationBatch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Accept wildcard characters: False
7777
### -CompletePublicFolderMigrationWithDataLoss
7878
This parameter is available only in the cloud-based service.
7979
80-
{{ Fill CompletePublicFolderMigrationWithDataLoss Description }}
80+
This parameter is reserved for internal Microsoft use.
8181
8282
```yaml
8383
Type: SwitchParameter

exchange/exchange-ps/exchange/Export-RecipientDataProperty.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414
## SYNOPSIS
1515
This cmdlet is available only in on-premises Exchange.
1616

17-
Use the Export-RecipientDataProperty cmdlet to download a user's picture or spoken name sound file. The picture and audio files display in the Global Address List property dialog box, contact card, reading pane, and meeting requests in Outlook.
17+
Use the Export-RecipientDataProperty cmdlet to download the picture or spoken name audio file of a mailbox or mail contact. The user's picture and spoken name are available in the global address (recipient properties), contact card, reading pane, and meeting requests in Outlook.
1818

1919
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
2020

@@ -122,9 +122,11 @@ Accept wildcard characters: False
122122
```
123123

124124
### -Picture
125-
The Picture switch specifies that the file you're exporting is the user's picture file. You don't need to specify a value with this switch.
125+
The Picture switch specifies that you're exporting the user's picture. You don't need to specify a value with this switch.
126126

127-
You can't use this switch with the SpokenName switch. You can only export one file type at a time.
127+
The user's picture is exported as a JPEG file.
128+
129+
You can't use this switch with the SpokenName switch.
128130

129131
```yaml
130132
Type: SwitchParameter
@@ -140,9 +142,11 @@ Accept wildcard characters: False
140142
```
141143

142144
### -SpokenName
143-
The SpokenName switch specifies that the file you're exporting is the user's audio file. You don't need to specify a value with this switch.
145+
The SpokenName switch specifies that you're exporting the user's spoken name. You don't need to specify a value with this switch.
146+
147+
The user's spoken name is exported as a WMA 9 file.
144148

145-
This cmdlet exports the WMA 9-voice format. You can't use this switch with the Picture switch. You can only export one file type at a time.
149+
You can't use this switch with the Picture switch.
146150

147151
```yaml
148152
Type: SwitchParameter

exchange/exchange-ps/exchange/Import-RecipientDataProperty.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.reviewer:
1212
# Import-RecipientDataProperty
1313

1414
## SYNOPSIS
15-
Use the Import-RecipientDataProperty cmdlet to add a picture or an audio file of a spoken name to a mailbox or contact. The picture and audio files display on the global address list property dialog box, contact card, reading pane, and meeting requests in Outlook.
15+
Use the Import-RecipientDataProperty cmdlet to add a picture or a spoken name audio file to a mailbox or mail contact. The user's picture and spoken name are available in the global address (recipient properties), contact card, reading pane, and meeting requests in Outlook.
1616

1717
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
1818

@@ -83,10 +83,14 @@ Accept wildcard characters: False
8383
```
8484
8585
### -FileData
86-
The FileData parameter specifies the location and file name of the picture or audio file.
86+
The FileData parameter specifies the picture or spoken name file that you want to import.
8787
8888
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
8989

90+
To import a picture, use the Picture switch. A valid picture file is JPEG and less than 10 kilobytes (KB).
91+
92+
To import a spoken name, use the SpokenName switch. A valid spoken name file is WMA 9 and less than 32 KB.
93+
9094
```yaml
9195
Type: Byte[]
9296
Parameter Sets: (All)
@@ -138,9 +142,9 @@ Accept wildcard characters: False
138142
```
139143

140144
### -Picture
141-
The Picture switch specifies that the file you're importing is a picture file. You don't need to specify a value with this switch.
145+
The Picture switch specifies that you're importing the user's picture file. You don't need to specify a value with this switch.
142146

143-
The picture must be a JPEG file and shouldn't be larger than 10 kilobytes (KB). You can't use this switch with the SpokenName switch. You can only import one file type at a time.
147+
You can't use this switch with the SpokenName switch.
144148

145149
```yaml
146150
Type: SwitchParameter
@@ -156,14 +160,9 @@ Accept wildcard characters: False
156160
```
157161

158162
### -SpokenName
159-
The SpokenName switch specifies that the file you're importing is an audio file. You don't need to specify a value with this switch.
160-
161-
The maximum file size should be less than 32 KB. You can use one of the following formats:
162-
163-
- WMA 9-voice
164-
- PCM 8-KHz, 16-bits, mono format
163+
The SpokenName switch specifies that you're importing the user's spoken name file. You don't need to specify a value with this switch.
165164

166-
You can't use this switch with the Picture switch. You can only import one file type at a time.
165+
You can't use this switch with the Picture switch.
167166

168167
```yaml
169168
Type: SwitchParameter

exchange/exchange-ps/exchange/New-DlpComplianceRule.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ Accept wildcard characters: False
198198
### -AccessScope
199199
The AccessScope parameter specifies a condition for the DLP rule that's based on the access scope of the content. The rule is applied to content that matches the specified access scope. Valid values are:
200200
201-
- InOrganization: The rule is applied to content that's accessible inside the organization.
202-
- NotInOrganization: The rule is applied to content that's accessible outside the organization.
201+
- InOrganization: The rule is applied to content that's accessible or delivered to a recipient inside the organization.
202+
- NotInOrganization: The rule is applied to content that's accessible or delivered to a recipient outside the organization.
203203
- None: The condition isn't used.
204204
205205
```yaml
@@ -700,8 +700,8 @@ Accept wildcard characters: False
700700
### -ExceptIfAccessScope
701701
The ExceptIfAccessScopeAccessScope parameter specifies an exception for the DLP rule that's based on the access scope of the content. The rule isn't applied to content that matches the specified access scope. Valid values are:
702702

703-
- InOrganization: The rule isn't applied to content that's accessible inside the organization.
704-
- NotInOrganization: The rule isn't applied to content that's accessible outside the organization.
703+
- InOrganization: The rule isn't applied to content that's accessible or delivered to a recipient inside the organization.
704+
- NotInOrganization: The rule isn't applied to content that's accessible or delivered to a recipient outside the organization.
705705
- None: The exception isn't used.
706706

707707
```yaml

exchange/exchange-ps/exchange/Set-DlpComplianceRule.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ Accept wildcard characters: False
182182
### -AccessScope
183183
The AccessScope parameter specifies a condition for the DLP rule that's based on the access scope of the content. The rule is applied to content that matches the specified access scope. Valid values are:
184184
185-
- InOrganization: The rule is applied to content that's accessible inside the organization.
186-
- NotInOrganization: The rule is applied to content that's accessible outside the organization.
185+
- InOrganization: The rule is applied to content that's accessible or delivered to a recipient inside the organization.
186+
- NotInOrganization: The rule is applied to content that's accessible or delivered to a recipient outside the organization.
187187
- None: The condition isn't used.
188188
189189
```yaml
@@ -684,8 +684,8 @@ Accept wildcard characters: False
684684
### -ExceptIfAccessScope
685685
The ExceptIfAccessScopeAccessScope parameter specifies an exception for the DLP rule that's based on the access scope of the content. The rule isn't applied to content that matches the specified access scope. Valid values are:
686686

687-
- InOrganization: The rule isn't applied to content that's accessible inside the organization.
688-
- NotInOrganization: The rule isn't applied to content that's accessible outside the organization.
687+
- InOrganization: The rule isn't applied to content that's accessible or delivered to a recipient inside the organization.
688+
- NotInOrganization: The rule isn't applied to content that's accessible or delivered to a recipient outside the organization.
689689
- None: The exception isn't used.
690690

691691
```yaml

skype/skype-ps/skype/New-CsTeamsNetworkRoamingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
Module Name: Skype for Business Online
44
online version: https://docs.microsoft.com/powershell/module/skype/new-csteamsnetworkroamingpolicy
5-
applicable: Skype for Business Online
5+
applicable: Microsoft Teams
66
title: New-CsTeamsNetworkRoamingPolicy
77
author: TristanChen-msft
88
ms.author: jiaych

teams/teams-ps/teams/Connect-MicrosoftTeams.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,31 @@ [email protected] TeamsGCCH xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx xxxxxx
8181
```
8282

8383
### Example 4: Connect to MicrosoftTeams using Accesstokens
84-
This example demonstrates how to sign in using AccessTokens. Admin can reterive Access Tokens. It requires two tokens, MS Graph Access Token and Teams Resource token.
84+
This example demonstrates how to sign in using AccessTokens. Admin can retrieve Access Tokens. It requires two tokens, MS Graph Access Token and Teams Resource token.
85+
86+
A delegated flow, such as Resource Owner Password Credentials (ROPC), must be used, with the following delegated app permissions required.
87+
88+
| API | Grant type | Permission |
89+
|-|-|-|
90+
| Microsoft Graph | Delegated | User.Read.All |
91+
| Microsoft Graph | Delegated | Group.ReadWrite.All |
92+
| Microsoft Graph | Delegated | AppCatalog.ReadWrite.All |
93+
| Skype and Teams Tenant Admin API | Delegated | user_impersonation |
8594

8695
```powershell
87-
$graphtoken = #Get MSGraph Token for following for resource "https://graph.microsoft.com" and scopes "AppCatalog.ReadWrite.All", "Group.ReadWrite.All", "User.Read.All";
88-
$teamstoken = #Get Teams resource token for resource id "48ac35b8-9aa8-4d74-927d-1f4a14a0b239" and scope "user_impersonation";
96+
$tenantid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
97+
$clientid = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
98+
$clientsecret = "..."
99+
$username = "[email protected]"
100+
$password = "..."
101+
102+
$uri = "https://login.microsoftonline.com/{0}/oauth2/v2.0/token" -f $tenantid
103+
$body = "client_id={0}&scope=https://graph.microsoft.com/.default&username={1}&password={2}&grant_type=password&client_secret={3}" -f $clientid, $username, [System.Net.WebUtility]::UrlEncode($password), [System.Net.WebUtility]::UrlEncode($clientsecret)
104+
$graphtoken = Invoke-RestMethod $uri -Body $body -Method Post -ContentType "application/x-www-form-urlencoded" -ErrorAction SilentlyContinue | Select-object -ExpandProperty access_token
105+
106+
$uri = "https://login.microsoftonline.com/{0}/oauth2/v2.0/token" -f $tenantid
107+
$body = "client_id={0}&scope=48ac35b8-9aa8-4d74-927d-1f4a14a0b239/.default&username={1}&password={2}&grant_type=password&client_secret={3}" -f $clientid, $username, [System.Net.WebUtility]::UrlEncode($password), [System.Net.WebUtility]::UrlEncode($clientsecret)
108+
$teamstoken = Invoke-RestMethod $uri -Body $body -Method Post -ContentType "application/x-www-form-urlencoded" -ErrorAction SilentlyContinue | Select-object -ExpandProperty access_token
89109
90110
Connect-MicrosoftTeams -AccessTokens @($graphtoken, $teamstoken)
91111
@@ -159,6 +179,9 @@ Accept wildcard characters: False
159179
### -ApplicationId
160180
Specifies the application ID of the service principal.
161181
182+
> [!WARNING]
183+
>This parameter has been removed from the latest versions and replaced by the AccessTokens parameter.
184+
162185
```yaml
163186
Type: String
164187
Parameter Sets: ServicePrincipalCertificate

0 commit comments

Comments
 (0)