Skip to content

Commit 1904f41

Browse files
authored
Merge branch 'main' into main
2 parents a36ec7e + 92eddb8 commit 1904f41

File tree

4 files changed

+108
-8
lines changed

4 files changed

+108
-8
lines changed

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,34 @@ Set-AppRetentionCompliancePolicy -Identity "Regulation 563 Marketing" -Applicati
119119

120120
This example adds a new user to the existing static scope retention policy named Regulation 563 Marketing that's set up for Teams private channels messages.
121121

122+
### Example 2
123+
```powershell
124+
$stringJson = @"
125+
[{
126+
'EmailAddress': '[email protected]'
127+
}]
128+
"@
129+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "[email protected]" -DeletedResources $stringJson
130+
```
131+
This example excludes the specified soft-deleted mailbox or mail user from the retention policy configured for Teams private channel messages. You can identify the deleted resources using the mailbox or mail user's email address.
132+
133+
Policy exclusions must remain within the supported limits for retention policies. For more information, see [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy).
134+
135+
### Example 3
136+
```powershell
137+
$stringJson = @"
138+
[{
139+
'EmailAddress': '[email protected]'
140+
},
141+
{
142+
'EmailAddress': '[email protected]'
143+
}]
144+
"@
145+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
146+
```
147+
148+
This example is similar to Example 2, except multiple deleted resources are specified.
149+
122150
## PARAMETERS
123151

124152
### -Identity
@@ -347,7 +375,11 @@ Accept wildcard characters: False
347375
```
348376

349377
### -DeletedResources
350-
{{ Fill DeletedResources Description }}
378+
The DeletedResources parameter specifies the deleted mailbox or mail user to add as an exclusion to the respective ___location list. Use this parameter with the AddTeamsChatLocationException parameter for deleted mailboxes or mail users that needs to be excluded from a Teams only retention policy.
379+
380+
A valid value is a JSON string. Refer to the Examples section for syntax and usage examples of this parameter.
381+
382+
For information on the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
351383

352384
```yaml
353385
Type: String

exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,36 @@ Set-RetentionCompliancePolicy -Identity "Sales Policy" -RemoveModernGroupLocatio
180180

181181
This example is similar to Example 2, except multiple deleted resources are specified.
182182

183+
### Example 5
184+
```powershell
185+
$stringJson = @"
186+
[{
187+
'EmailAddress': '[email protected]'
188+
}]
189+
"@
190+
191+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "[email protected]" -DeletedResources $stringJson
192+
```
193+
194+
This example excludes the specified soft-deleted mailbox or mail user from the mentioned Teams Retention Policy. You can identify the deleted resources using the mailbox or mail user's email address.
195+
Policy exclusions must remain within the supported limits for retention policies: [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy)
196+
197+
### Example 6
198+
```powershell
199+
$stringJson = @"
200+
[{
201+
'EmailAddress': '[email protected]'
202+
},
203+
{
204+
'EmailAddress': '[email protected]'
205+
}]
206+
"@
207+
208+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
209+
```
210+
211+
This example is similar to Example 5, except multiple deleted resources are specified.
212+
183213
## PARAMETERS
184214

185215
### -Identity
@@ -629,11 +659,13 @@ Accept wildcard characters: False
629659
```
630660

631661
### -DeletedResources
632-
The DeletedResources parameter specifies the Sharepoint sites to be removed from the list of included sites or excluded from a tenant level policy when the associated group has been deleted. You use this parameter with the AddModernGroupLocationException and RemoveModernGroupLocation parameters.
662+
The DeletedResources parameter specifies the deleted Microsoft 365 Group, mailbox, or mail user to be removed or added as an exclusion to the respective ___location list. Use this parameter with the AddModernGroupLocationException and RemoveModernGroupLocation parameters for deleted Microsoft 365 Groups, or with the AddTeamsChatLocationException parameter for deleted mailboxes or mail users.
663+
664+
A valid value is a JSON string. Refer to the Examples section for syntax and usage examples of this parameter.
633665

634-
A valid value is a JSON String. See the Examples section for syntax and examples using this parameter.
666+
For more information on the deleted Microsoft 365 Group scenario, see [Learn more about modern group deletion under retention hold](https://learn.microsoft.com/purview/retention-settings#what-happens-if-a-microsoft-365-group-is-deleted-after-a-policy-is-applied).
635667

636-
For more information about this scenario, see [Learn more about modern group deletion under retention hold](https://learn.microsoft.com/purview/retention-settings#what-happens-if-a-microsoft-365-group-is-deleted-after-a-policy-is-applied).
668+
For more information on the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
637669

638670
```yaml
639671
Type: String

teams/teams-ps/teams/New-CsTeamsEventsPolicy.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/new-csteamseventspolicy
55
title: New-CsTeamsEventsPolicy
66
schema: 2.0.0
7-
ms.date: 11/12/2024
7+
ms.date: 02/26/2025
88
---
99

1010
# New-CsTeamsEventsPolicy
@@ -16,7 +16,7 @@ This cmdlet allows you to create a new TeamsEventsPolicy instance and set its pr
1616

1717
```powershell
1818
New-CsTeamsEventsPolicy [-Identity] <String> [-AllowWebinars <String>] [-AllowTownhalls <String>] [-AllowEmailEditing <String>] [-Description <String>]
19-
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
19+
[-TownhallEventAttendeeAccess <String>] [-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
2020
[-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>] [-AllowEventIntegrations <Boolean>] [-TownhallChatExperience <String>]
2121
[-UseMicrosoftECDN <String>] [-EventAccessType <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
2222
[-ImmersiveEvents <String>]
@@ -94,6 +94,24 @@ Accept pipeline input: False
9494
Accept wildcard characters: False
9595
```
9696
97+
### -TownhallEventAttendeeAccess
98+
This setting governs what identity types may attend a Town hall that is scheduled by a particular person or group that is assigned this policy.
99+
Possible values are:
100+
- **Everyone**: Anyone with the join link may enter the event.
101+
- **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
102+
103+
```yaml
104+
Type: String
105+
Parameter Sets: (All)
106+
Aliases:
107+
108+
Required: False
109+
Position: Named
110+
Default value: Everyone
111+
Accept pipeline input: False
112+
Accept wildcard characters: False
113+
```
114+
97115
### -AllowEmailEditing
98116
This setting governs if a user is allowed to edit the communication emails in Teams Town Hall or Teams Webinar events.
99117
Possible values are:

teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/set-csteamseventspolicy
55
title: Set-CsTeamsEventsPolicy
66
schema: 2.0.0
7-
ms.date: 11/12/2024
7+
ms.date: 02/26/2025
88
---
99

1010
# Set-CsTeamsEventsPolicy
@@ -16,7 +16,7 @@ This cmdlet allows you to configure options for customizing Teams events experie
1616

1717
```
1818
Set-CsTeamsEventsPolicy [-AllowWebinars <String>] [-EventAccessType <String>] [-AllowTownhalls <String>]
19-
[-AllowEmailEditing <String>] [-AllowedQuestionTypesInRegistrationForm <String>]
19+
[-TownhallEventAttendeeAccess <String>] [-AllowEmailEditing <String>] [-AllowedQuestionTypesInRegistrationForm <String>]
2020
[-AllowEventIntegrations <Boolean>] [-AllowedWebinarTypesForRecordingPublish <String>]
2121
[-AllowedTownhallTypesForRecordingPublish <String>] [-TownhallChatExperience <String>] [-Description <String>]
2222
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
@@ -106,6 +106,24 @@ Accept pipeline input: False
106106
Accept wildcard characters: False
107107
```
108108
109+
### -TownhallEventAttendeeAccess
110+
This setting governs what identity types may attend a Town hall that is scheduled by a particular person or group that is assigned this policy.
111+
Possible values are:
112+
- **Everyone**: Anyone with the join link may enter the event.
113+
- **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
114+
115+
```yaml
116+
Type: String
117+
Parameter Sets: (All)
118+
Aliases:
119+
120+
Required: False
121+
Position: Named
122+
Default value: Everyone
123+
Accept pipeline input: False
124+
Accept wildcard characters: False
125+
```
126+
109127
### -Description
110128
Enables administrators to provide explanatory text to accompany a Teams Events policy.
111129

0 commit comments

Comments
 (0)