Skip to content

Commit 747e5cf

Browse files
Merge branch 'main' into main
2 parents 9be9c09 + e6bcadd commit 747e5cf

File tree

3 files changed

+210
-3
lines changed

3 files changed

+210
-3
lines changed

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ external help file: MicrosoftTeams-help.xml
33
Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/new-csteamseventspolicy
55
schema: 2.0.0
6+
ms.date: 11/12/2024
67
---
78

89
# New-CsTeamsEventsPolicy
@@ -15,6 +16,8 @@ This cmdlet allows you to create a new TeamsEventsPolicy instance and set its pr
1516

1617
```
1718
New-CsTeamsEventsPolicy [-Identity] <String> [-AllowWebinars <String>] [-AllowTownhalls <String>] [-AllowEmailEditing <String>] [-Description <String>]
19+
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
20+
[-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>]
1821
[-UseMicrosoftECDN <String>] [-EventAccessType <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
1922
```
2023

@@ -186,6 +189,72 @@ Accept pipeline input: False
186189
Accept wildcard characters: False
187190
```
188191
192+
### -RecordingForTownhall
193+
Determines whether recording is allowed in a user's townhall.
194+
Possible values are:
195+
- **Enabled**: Allow recording in user's townhalls.
196+
- **Disabled**: Prohibit recording in user's townhalls.
197+
```yaml
198+
Type: String
199+
Parameter Sets: (All)
200+
Aliases:
201+
202+
Required: False
203+
Position: Named
204+
Default value: Enabled
205+
Accept pipeline input: False
206+
Accept wildcard characters: False
207+
```
208+
### -RecordingForWebinar
209+
Determines whether recording is allowed in a user's webinar.
210+
Possible values are:
211+
- **Enabled**: Allow recording in user's webinars.
212+
- **Disabled**: Prohibit recording in user's webinars.
213+
```yaml
214+
Type: String
215+
Parameter Sets: (All)
216+
Aliases:
217+
218+
Required: False
219+
Position: Named
220+
Default value: Enabled
221+
Accept pipeline input: False
222+
Accept wildcard characters: False
223+
```
224+
### -TranscriptionForTownhall
225+
Determines whether transcriptions are allowed in a user's townhall.
226+
Possible values are:
227+
- **Enabled**: Allow transcriptions in user's townhalls.
228+
- **Disabled**: Prohibit transcriptions in user's townhalls.
229+
```yaml
230+
Type: String
231+
Parameter Sets: (All)
232+
Aliases:
233+
234+
Required: False
235+
Position: Named
236+
Default value: Enabled
237+
Accept pipeline input: False
238+
Accept wildcard characters: False
239+
```
240+
### -TranscriptionForWebinar
241+
Determines whether transcriptions are allowed in a user's webinar.
242+
Possible values are:
243+
- **Enabled**: Allow transcriptions in user's webinars.
244+
- **Disabled**: Prohibit transcriptions in user's webinars.
245+
```yaml
246+
Type: String
247+
Parameter Sets: (All)
248+
Aliases:
249+
250+
Required: False
251+
Position: Named
252+
Default value: Enabled
253+
Accept pipeline input: False
254+
Accept wildcard characters: False
255+
```
256+
257+
189258
### -Confirm
190259
The Confirm switch does not work with this cmdlet.
191260

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ external help file: MicrosoftTeams-help.xml
33
Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/set-csteamseventspolicy
55
schema: 2.0.0
6+
ms.date: 11/12/2024
67
---
78

89
# Set-CsTeamsEventsPolicy
@@ -18,6 +19,8 @@ Set-CsTeamsEventsPolicy [-AllowWebinars <String>] [-EventAccessType <String>] [-
1819
[-AllowEmailEditing <String>] [-AllowedQuestionTypesInRegistrationForm <String>]
1920
[-AllowEventIntegrations <Boolean>] [-AllowedWebinarTypesForRecordingPublish <String>]
2021
[-AllowedTownhallTypesForRecordingPublish <String>] [-TownhallChatExperience <String>] [-Description <String>]
22+
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
23+
[-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>]
2124
[-UseMicrosoftECDN <Boolean>]
2225
[-Identity] <String> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
2326
```
@@ -300,6 +303,82 @@ Accept pipeline input: False
300303
Accept wildcard characters: False
301304
```
302305
306+
### -RecordingForTownhall
307+
Determines whether recording is allowed in a user's townhall.
308+
309+
Possible values are:
310+
- **Enabled**: Allow recording in user's townhalls.
311+
- **Disabled**: Prohibit recording in user's townhalls.
312+
313+
```yaml
314+
Type: String
315+
Parameter Sets: (All)
316+
Aliases:
317+
318+
Required: False
319+
Position: Named
320+
Default value: Enabled
321+
Accept pipeline input: False
322+
Accept wildcard characters: False
323+
```
324+
325+
### -RecordingForWebinar
326+
Determines whether recording is allowed in a user's webinar.
327+
328+
Possible values are:
329+
- **Enabled**: Allow recording in user's webinars.
330+
- **Disabled**: Prohibit recording in user's webinars.
331+
332+
```yaml
333+
Type: String
334+
Parameter Sets: (All)
335+
Aliases:
336+
337+
Required: False
338+
Position: Named
339+
Default value: Enabled
340+
Accept pipeline input: False
341+
Accept wildcard characters: False
342+
```
343+
344+
### -TranscriptionForTownhall
345+
Determines whether transcriptions are allowed in a user's townhall.
346+
347+
Possible values are:
348+
- **Enabled**: Allow transcriptions in user's townhalls.
349+
- **Disabled**: Prohibit transcriptions in user's townhalls.
350+
351+
```yaml
352+
Type: String
353+
Parameter Sets: (All)
354+
Aliases:
355+
356+
Required: False
357+
Position: Named
358+
Default value: Enabled
359+
Accept pipeline input: False
360+
Accept wildcard characters: False
361+
```
362+
363+
### -TranscriptionForWebinar
364+
Determines whether transcriptions are allowed in a user's webinar.
365+
366+
Possible values are:
367+
- **Enabled**: Allow transcriptions in user's webinars.
368+
- **Disabled**: Prohibit transcriptions in user's webinars.
369+
370+
```yaml
371+
Type: String
372+
Parameter Sets: (All)
373+
Aliases:
374+
375+
Required: False
376+
Position: Named
377+
Default value: Enabled
378+
Accept pipeline input: False
379+
Accept wildcard characters: False
380+
```
381+
303382
### -Confirm
304383
The Confirm switch does not work with this cmdlet.
305384

teams/teams-ps/teams/Set-CsTenantFederationConfiguration.md

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ manager: bulenteg
88
author: tomkau
99
ms.author: tomkau
1010
ms.reviewer: williamlooney
11+
ms.date: 12/11/2024
1112
---
1213

1314
# Set-CsTenantFederationConfiguration
@@ -25,6 +26,7 @@ Set-CsTenantFederationConfiguration [-Tenant <Guid>]
2526
[-AllowFederatedUsers <Boolean>] [-AllowPublicUsers <Boolean>] [-AllowTeamsConsumer <Boolean>] [-AllowTeamsConsumerInbound <Boolean>]
2627
[-TreatDiscoveredPartnersAsUnverified <Boolean>] [-SharedSipAddressSpace <Boolean>] [-RestrictTeamsConsumerToExternalUserProfiles <Boolean>]
2728
[-AllowedDomainsAsAList <List>] [-ExternalAccessWithTrialTenants <ExternalAccessWithTrialTenantsType>] [-CustomizeFederation <Boolean>]
29+
[-AllowedTrialTenantDomains <List>]
2830
[[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
2931
```
3032

@@ -175,13 +177,49 @@ Set-CsTenantFederationConfiguration -ExternalAccessWithTrialTenants "Allowed"
175177

176178
Example 11 shows how you can allow users to communicate with users in tenants that contain only trial licenses (default value is Blocked).
177179

178-
### -------------------------- Example 12 -------------------------
180+
### -------------------------- Example 12 --------------------------
179181
```
180-
Set-CsTenantFederationConfiguration -CustomizeFederation $True
182+
$list = New-Object Collections.Generic.List[String]
183+
$list.add("contoso.com")
184+
$list.add("fabrikam.com")
185+
186+
Set-CsTenantFederationConfiguration -AllowedTrialTenantDomains $list
181187
```
182188

183-
Example 12 shows how you can enable the feature where you can customize your federation in ExternalAccessPolicy.
189+
Using the `AllowedTrialTenantDomains` parameter, you can whitelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. Example 12 shows how you can set or replace domains in the Allowed Trial Tenant Domains using a List collection object.
190+
First, a List collection is created and domains are added to it, then, simply include the `AllowedTrialTenantDomains` parameter and set the parameter value to the List object.
191+
When this command completes, the Allowed Trial Tenant Domains list will be replaced with those domains.
184192

193+
### -------------------------- Example 13 --------------------------
194+
```
195+
$list = New-Object Collections.Generic.List[String]
196+
$list.add("contoso.com")
197+
198+
Set-CsTenantFederationConfiguration -AllowedTrialTenantDomains @{Add=$list}
199+
```
200+
201+
Example 13 shows how you can add domains to the existing Allowed Trial Tenant Domains using a List collection object.
202+
First, a List is created and domains are added to it, then, use the Add method in the `AllowedTrialTenantDomains` parameter to add the domains to the existing allowed domains list.
203+
When this command completes, the domains in the list will be added to any domains already on the Allowed Trial Tenant Domains list.
204+
205+
### -------------------------- Example 14 --------------------------
206+
```
207+
$list = New-Object Collections.Generic.List[String]
208+
$list.add("contoso.com")
209+
210+
Set-CsTenantFederationConfiguration -AllowedTrialTenantDomains @{Remove=$list}
211+
```
212+
213+
Example 14 shows how you can remove domains from the existing Allowed Trial Tenant Domains using a List collection object.
214+
First, a List is created and domains are added to it, then use the Remove method in the `AllowedTrialTenantDomains` parameter to remove the domains from the existing allowed domains list.
215+
When this command completes, the domains in the list will be removed from the Allowed Trial Tenant Domains list.
216+
217+
### -------------------------- Example 15 -------------------------
218+
```
219+
Set-CsTenantFederationConfiguration -CustomizeFederation $True
220+
```
221+
222+
Example 15 shows how you can enable the feature where you can customize your federation in ExternalAccessPolicy.
185223

186224
## PARAMETERS
187225

@@ -475,6 +513,27 @@ Accept pipeline input: False
475513
Accept wildcard characters: False
476514
```
477515

516+
### -AllowedTrialTenantDomains
517+
You can whitelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. This will allow you to protect your organization against majority of tenants that don't have any paid subscriptions, while still being able to collaborate externally with those trusted trial-tenants in the list.
518+
519+
Note:
520+
- The list supports up to maximum 4k domains.
521+
- If `ExternalAccessWithTrialTenants` is set to `Allowed`, then the `AllowedTrialTenantDomains` list will not be checked.
522+
- Any domain in this list that belongs to a tenant with paid subscriptions will be ignored.
523+
524+
```yaml
525+
Type: List
526+
Parameter Sets: (All)
527+
Aliases:
528+
applicable: Microsoft Teams
529+
530+
Required: False
531+
Position: Named
532+
Default value: None
533+
Accept pipeline input: False
534+
Accept wildcard characters: False
535+
```
536+
478537
### -RestrictTeamsConsumerToExternalUserProfiles
479538
Defines if a user is restriced to collaboration with Teams Consumer (TFL) user only in Extended Directory.
480539
Possible values: True, False

0 commit comments

Comments
 (0)