Skip to content

Commit 3d1927a

Browse files
committed
Merge branch 'main' into AccessToken-chrisda
2 parents 8dbbc86 + 882172c commit 3d1927a

File tree

2 files changed

+609
-37
lines changed

2 files changed

+609
-37
lines changed

exchange/exchange-ps/exchange/New-Label.md

Lines changed: 292 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ New-Label [-Name] <String> -DisplayName <String> -Tooltip <String>
4242
[-ApplyWaterMarkingFontName <String>]
4343
[-ApplyWaterMarkingFontSize <System.Int32>]
4444
[-ApplyWaterMarkingLayout <Microsoft.Office.CompliancePolicy.Tasks.FlattenLabelActionUtils+WaterMarkingLayout>]
45-
[-ColumnAssetCondition <String>]
4645
[-ApplyWaterMarkingText <String>]
46+
[-ColumnAssetCondition <String>]
4747
[-Comment <String>]
4848
[-Conditions <MultiValuedProperty>]
4949
[-Confirm]
5050
[-ContentType <MipLabelContentType>]
51+
[-DefaultContentLabel <String>]
5152
[-EncryptionAipTemplateScopes <String>]
5253
[-EncryptionContentExpiredOnDateInDaysOrNever <String>]
5354
[-EncryptionDoNotForward <System.Boolean>]
@@ -58,7 +59,7 @@ New-Label [-Name] <String> -DisplayName <String> -Tooltip <String>
5859
[-EncryptionOfflineAccessDays <System.Int32>]
5960
[-EncryptionPromptUser <System.Boolean>]
6061
[-EncryptionProtectionType <Microsoft.Office.CompliancePolicy.Tasks.FlattenLabelActionUtils+SupportedProtectionType>]
61-
[-EncryptionRightsDefinitions <String>]
62+
[-EncryptionRightsDefinitions <EncryptionRightsDefinitionsParameter>]
6263
[-EncryptionRightsUrl <String>]
6364
[-EncryptionTemplateId <String>]
6465
[-Identity <MasterIdParameter>]
@@ -76,8 +77,21 @@ New-Label [-Name] <String> -DisplayName <String> -Tooltip <String>
7677
[-SiteAndGroupProtectionBlockAccess <System.Boolean>]
7778
[-SiteAndGroupProtectionEnabled <System.Boolean>]
7879
[-SiteAndGroupProtectionLevel <SiteAndGroupProtectionLevelParameter>]
79-
[-SiteAndGroupProtectionPrivacy <Microsoft.Office.CompliancePolicy.PolicyConfiguration.AccessType>]
80+
[-SiteAndGroupProtectionPrivacy <Microsoft.Office.CompliancePolicy.Tasks.FlattenLabelActionUtils+GroupProtectionPrivacy>]
8081
[-SiteExternalSharingControlType <Microsoft.Office.CompliancePolicy.Tasks.SiteExternalSharingControlType>]
82+
[-TeamsAllowedPresenters <Microsoft.Office.CompliancePolicy.PolicyConfiguration.AllowedPresenters>]
83+
[-TeamsAllowMeetingChat <Microsoft.Office.CompliancePolicy.PolicyConfiguration.MeetingChatMode>]
84+
[-TeamsBypassLobbyForDialInUsers <System.Boolean>]
85+
[-TeamsChannelSharedWithSameLabelOnly <System.Boolean>]
86+
[-TeamsCopyRestrictionEnforced <System.Boolean>]
87+
[-TeamsEndToEndEncryptionEnabled <System.Boolean>]
88+
[-TeamsLobbyBypassScope <Microsoft.Office.CompliancePolicy.PolicyConfiguration.LobbyBypassScope>]
89+
[-TeamsLobbyRestrictionEnforced <System.Boolean>]
90+
[-TeamsPresentersRestrictionEnforced <System.Boolean>]
91+
[-TeamsProtectionEnabled <System.Boolean>]
92+
[-TeamsRecordAutomatically <System.Boolean>]
93+
[-TeamsVideoWatermark <Microsoft.Office.CompliancePolicy.PolicyConfiguration.WaterMarkProtectionValues>]
94+
[-TeamsWhoCanRecord <Microsoft.Office.CompliancePolicy.PolicyConfiguration.WhoCanRecordOptions>]
8195
[-WhatIf]
8296
[<CommonParameters>]
8397
```
@@ -628,11 +642,13 @@ Accept wildcard characters: False
628642
```
629643

630644
### -ContentType
631-
The ContentType parameter specifies where the sensivity label can be applied. Valid values are:
645+
The ContentType parameter specifies where the sensitivity label can be applied. Valid values are:
632646

633647
- File, Email
634648
- Site, UnifiedGroup
635649
- PurviewAssets
650+
- Teamwork
651+
- SchematizedData
636652

637653
Values can be combined, for example: "File, Email, PurviewAssets". Splitting related content types like "File, Email" into just "File" or just "Email" is not supported.
638654

@@ -649,6 +665,22 @@ Accept pipeline input: False
649665
Accept wildcard characters: False
650666
```
651667

668+
### -DefaultContentLabel
669+
{{ Fill DefaultContentLabel Description }}
670+
671+
```yaml
672+
Type: String
673+
Parameter Sets: (All)
674+
Aliases:
675+
Applicable: Security & Compliance
676+
677+
Required: False
678+
Position: Named
679+
Default value: None
680+
Accept pipeline input: False
681+
Accept wildcard characters: False
682+
```
683+
652684
### -EncryptionAipTemplateScopes
653685
The EncryptionAipTemplateScopes parameter specifies that the label is still published and usable in the AIP classic client. An example value is `"['[email protected]','[email protected]']"`.
654686

@@ -854,7 +886,7 @@ The EncryptionRightsDefinitions parameter specifies the rights users have when a
854886
This parameter is meaningful only when the EncryptionEnabled parameter value is either $true or $false and the EncryptionProtectionType parameter value is Template.
855887

856888
```yaml
857-
Type: String
889+
Type: EncryptionRightsDefinitionsParameter
858890
Parameter Sets: (All)
859891
Aliases:
860892
Applicable: Security & Compliance
@@ -1186,7 +1218,7 @@ The SiteAndGroupProtectionPrivacy parameter specifies the privacy level for the
11861218
This parameter is meaningful only when the SiteAndGroupProtectionEnabled parameter value is $true or $false.
11871219

11881220
```yaml
1189-
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.AccessType
1221+
Type: Microsoft.Office.CompliancePolicy.Tasks.FlattenLabelActionUtils+GroupProtectionPrivacy
11901222
Parameter Sets: (All)
11911223
Aliases:
11921224
Applicable: Security & Compliance
@@ -1226,6 +1258,260 @@ Accept pipeline input: False
12261258
Accept wildcard characters: False
12271259
```
12281260

1261+
### -TeamsAllowedPresenters
1262+
The TeamsAllowedPresenters parameter controls can present in Teams meetings. Valid values are:
1263+
1264+
- Everyone
1265+
- Organization
1266+
- Organizer
1267+
- RoleIsPresenter
1268+
1269+
```yaml
1270+
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.AllowedPresenters
1271+
Parameter Sets: (All)
1272+
Aliases:
1273+
Applicable: Security & Compliance
1274+
1275+
Required: False
1276+
Position: Named
1277+
Default value: None
1278+
Accept pipeline input: False
1279+
Accept wildcard characters: False
1280+
```
1281+
1282+
### -TeamsAllowMeetingChat
1283+
The TeamsAllowMeetingChat parameter controls whether chat is available in Teams meetings. Valid values are:
1284+
1285+
- Enabled
1286+
- Disabled
1287+
- Limited: Chat is available only for the duration of the call.
1288+
1289+
```yaml
1290+
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.MeetingChatMode
1291+
Parameter Sets: (All)
1292+
Aliases:
1293+
Applicable: Security & Compliance
1294+
1295+
Required: False
1296+
Position: Named
1297+
Default value: None
1298+
Accept pipeline input: False
1299+
Accept wildcard characters: False
1300+
```
1301+
1302+
### -TeamsBypassLobbyForDialInUsers
1303+
The TeamsBypassLobbyForDialInUsers parameter controls the lobby experience for dial in users who join Teams meetings. Valid values are:
1304+
1305+
- $true: Dial in users bypass the lobby when joining Teams meetings.
1306+
- $false: Dial in users don't bypass the lobby when joining Teams meetings.
1307+
1308+
```yaml
1309+
Type: System.Boolean
1310+
Parameter Sets: (All)
1311+
Aliases:
1312+
Applicable: Security & Compliance
1313+
1314+
Required: False
1315+
Position: Named
1316+
Default value: None
1317+
Accept pipeline input: False
1318+
Accept wildcard characters: False
1319+
```
1320+
1321+
### -TeamsChannelSharedWithSameLabelOnly
1322+
{{ Fill TeamsChannelSharedWithSameLabelOnly Description }}
1323+
1324+
```yaml
1325+
Type: System.Boolean
1326+
Parameter Sets: (All)
1327+
Aliases:
1328+
Applicable: Security & Compliance
1329+
1330+
Required: False
1331+
Position: Named
1332+
Default value: None
1333+
Accept pipeline input: False
1334+
Accept wildcard characters: False
1335+
```
1336+
1337+
### -TeamsCopyRestrictionEnforced
1338+
The TeamsCopyRestrictionEnforced parameter controls whether chat messages in Teams meetings can be copied to the clipboard. Valid values are:
1339+
1340+
- $true: Chat messages can be copied to the clipboard.
1341+
- $false: Chat messages can't be copied to the clipboard.
1342+
1343+
```yaml
1344+
Type: System.Boolean
1345+
Parameter Sets: (All)
1346+
Aliases:
1347+
Applicable: Security & Compliance
1348+
1349+
Required: False
1350+
Position: Named
1351+
Default value: None
1352+
Accept pipeline input: False
1353+
Accept wildcard characters: False
1354+
```
1355+
1356+
### -TeamsEndToEndEncryptionEnabled
1357+
The TeamsEndToEndEncryptionEnabled parameter controls video stream encryption in Teams meetings. Valid values are:
1358+
1359+
- $true: Video stream encryption is enabled.
1360+
- $false: Video stream encryption is not enabled.
1361+
1362+
```yaml
1363+
Type: System.Boolean
1364+
Parameter Sets: (All)
1365+
Aliases:
1366+
Applicable: Security & Compliance
1367+
1368+
Required: False
1369+
Position: Named
1370+
Default value: None
1371+
Accept pipeline input: False
1372+
Accept wildcard characters: False
1373+
```
1374+
1375+
### -TeamsLobbyBypassScope
1376+
The TeamsLobbyBypassScope parameter controls who bypasses the lobby when joining Teams meetings. Valid values are:
1377+
1378+
- Everyone
1379+
- Invited
1380+
- Organization
1381+
- OrganizationAndFederated
1382+
- OrganizationExcludingGuests
1383+
- Organizer
1384+
1385+
```yaml
1386+
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.LobbyBypassScope
1387+
Parameter Sets: (All)
1388+
Aliases:
1389+
Applicable: Security & Compliance
1390+
1391+
Required: False
1392+
Position: Named
1393+
Default value: None
1394+
Accept pipeline input: False
1395+
Accept wildcard characters: False
1396+
```
1397+
1398+
### -TeamsLobbyRestrictionEnforced
1399+
The TeamsLobbyRestrictionEnforced parameter controls whether participants bypass the lobby when joining Teams meetings. Valid values are:
1400+
1401+
- $true: Users bypass the lobby when joining Teams meetings.
1402+
- $false: Users don't bypass the lobby when joining Teams meetings.
1403+
1404+
```yaml
1405+
Type: System.Boolean
1406+
Parameter Sets: (All)
1407+
Aliases:
1408+
Applicable: Security & Compliance
1409+
1410+
Required: False
1411+
Position: Named
1412+
Default value: None
1413+
Accept pipeline input: False
1414+
Accept wildcard characters: False
1415+
```
1416+
1417+
### -TeamsPresentersRestrictionEnforced
1418+
The TeamsPresentersRestrictionEnforced parameter controls whether presenter restrictions are enabled in Teams meetings. Valid values are:
1419+
1420+
- $true: Presenter restrictions are enabled in Teams meetings.
1421+
- $false: Presenter restrictions aren't enabled in Teams meetings.
1422+
1423+
```yaml
1424+
Type: System.Boolean
1425+
Parameter Sets: (All)
1426+
Aliases:
1427+
Applicable: Security & Compliance
1428+
1429+
Required: False
1430+
Position: Named
1431+
Default value: None
1432+
Accept pipeline input: False
1433+
Accept wildcard characters: False
1434+
```
1435+
1436+
### -TeamsProtectionEnabled
1437+
The TeamsProtectionEnabled parameter controls whether Teams protection is enabled in Teams meetings. Valid values are:
1438+
1439+
- $true: Teams protection is enabled in Teams meetings.
1440+
- $false: Teams protection is not enabled in Teams meetings.
1441+
1442+
```yaml
1443+
Type: System.Boolean
1444+
Parameter Sets: (All)
1445+
Aliases:
1446+
Applicable: Security & Compliance
1447+
1448+
Required: False
1449+
Position: Named
1450+
Default value: None
1451+
Accept pipeline input: False
1452+
Accept wildcard characters: False
1453+
```
1454+
1455+
### -TeamsRecordAutomatically
1456+
The TeamsRecordAutomatically parameter controls whether Teams meetings are automatically recorded after they start. Valid values are:
1457+
1458+
- $true: Teams meetings are automatically recorded after they start.
1459+
- $false: Teams meetings are not automatically recorded.
1460+
1461+
```yaml
1462+
Type: System.Boolean
1463+
Parameter Sets: (All)
1464+
Aliases:
1465+
Applicable: Security & Compliance
1466+
1467+
Required: False
1468+
Position: Named
1469+
Default value: None
1470+
Accept pipeline input: False
1471+
Accept wildcard characters: False
1472+
```
1473+
1474+
### -TeamsVideoWatermark
1475+
The TeamsVideoWatermark parameter controls whether a watermark is shown in Teams meetings. Valid values are:
1476+
1477+
- None
1478+
- EnabledForContentSharing
1479+
- EnabledForVideo
1480+
1481+
```yaml
1482+
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.WaterMarkProtectionValues
1483+
Parameter Sets: (All)
1484+
Aliases:
1485+
Applicable: Security & Compliance
1486+
1487+
Required: False
1488+
Position: Named
1489+
Default value: None
1490+
Accept pipeline input: False
1491+
Accept wildcard characters: False
1492+
```
1493+
1494+
### -TeamsWhoCanRecord
1495+
The TeamsWhoCanRecord parameter controls who can record Teams meetings. Valid values are:
1496+
1497+
- None
1498+
- Organizer
1499+
- Coorganizers
1500+
- Presenters
1501+
1502+
```yaml
1503+
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.WhoCanRecordOptions
1504+
Parameter Sets: (All)
1505+
Aliases:
1506+
Applicable: Security & Compliance
1507+
1508+
Required: False
1509+
Position: Named
1510+
Default value: None
1511+
Accept pipeline input: False
1512+
Accept wildcard characters: False
1513+
```
1514+
12291515
### -WhatIf
12301516
The WhatIf switch doesn't work in Security & Compliance PowerShell.
12311517

0 commit comments

Comments
 (0)