Skip to content

Commit 8aa0040

Browse files
authored
Merge branch 'main' into patch-10
2 parents c14564c + b35135f commit 8aa0040

31 files changed

+1948
-117
lines changed

exchange/exchange-ps/exchange/Export-ContentExplorerData.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ The output of this cmdlet contains the following information:
4141
- RecordsReturned: The number of records returned in the query.
4242
- PageCookie: Used to get the next set of records when MorePagesAvailable is True.
4343

44+
The following list describes best practices for scripts using this cmdlet:
45+
46+
- We recommend not using a single script to export multiple SITs/Labels. Instead, create a script for one SIT/Label, and then re-use the same script for each SIT/Label in each workload as required.
47+
- When retrying the script, make sure to reconnect to the session first. The session's token expires after about an hour, which can cause the cmdlet to fail. To fix this issue, reconnect to the session before retrying the script. If the script fails, restart it using the last page cookie returned to continue the export from where it left off.
48+
49+
> [!TIP]
50+
> To support unattended scripts that run for a long time, you can use [certificate-based authentication (CBA)](https://learn.microsoft.com/powershell/exchange/app-only-auth-powershell-v2).
51+
4452
To use this cmdlet in Security & Compliance PowerShell, you need to be assigned permissions. For more information, see [Permissions in the Microsoft Purview compliance portal](https://learn.microsoft.com/purview/microsoft-365-compliance-center-permissions).
4553

4654
## EXAMPLES
@@ -90,7 +98,15 @@ Accept wildcard characters: False
9098
```
9199
92100
### -Aggregate
93-
{{ Fill Aggregate Description }}
101+
The Aggregate parameter switch returns the folder level aggregated numbers instead of returning details at the item level. You don't need to specify a value with this switch.
102+
103+
Using this switch significantly reduces the export time. To download the items in a folder, run this cmdlet for specific folders.
104+
105+
When you use this switch with the TagName, TagType and Workload parameters, the command returns the following information:
106+
107+
- SiteUlrs: OneDrive and SharePoint.
108+
- UPNs: Exchange Online and Teams.
109+
- The count of items stamped with that tag.
94110
95111
```yaml
96112
Type: SwitchParameter
@@ -124,6 +140,8 @@ Accept wildcard characters: False
124140
### -PageSize
125141
The PageSize parameter specifies the maximum number of records to return in a single query. Valid input for this parameter is an integer between 1 and 10000. The default value is 100.
126142
143+
**Note**: In empty folders or folders with few files, this parameter can cause the command to run for a long time as it tries to get the PageSize count of the results. To prevent this issue, the command returns data from 5 folders or the number of records specified by the PageSize parameter, whichever completes first. For example, if there are 10 folders with 1 record each, the command returns 5 records of the top 5 folders. In the next execution using page cookie, it returns 5 records from the remaining 5 folders, even if the PageSize value is 10.
144+
127145
```yaml
128146
Type: Int32
129147
Parameter Sets: (All)
@@ -210,8 +228,6 @@ Accept pipeline input: False
210228
Accept wildcard characters: False
211229
```
212230
213-
214-
215231
### CommonParameters
216232
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
217233

exchange/exchange-ps/exchange/New-DlpCompliancePolicy.md

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,67 @@ New-DlpCompliancePolicy -Name "GlobalPolicy" -Comment "Primary policy" -SharePoi
8888
This example creates a DLP policy named GlobalPolicy for the specified SharePoint Online and OneDrive for Business locations. The new policy has a descriptive comment and will be enabled on creation.
8989

9090
### Example 3
91-
9291
```powershell
9392
New-DlpCompliancePolicy -Name "PowerBIPolicy" -Comment "Primary policy" -PowerBIDlpLocation "All" -PowerBIDlpLocationException "workspaceID1","workspaceID2","workspaceID3" -Mode Enable
9493
```
9594

9695
This example creates a DLP policy named PowerBIPolicy for all qualifying Power BI workspaces (that is, those hosted on Premium Gen2 capacities) except for the specified workspaces. The new policy has a descriptive comment and will be enabled on creation.
9796

97+
### Example 4
98+
```powershell
99+
Get-Label | Format-List Priority,ContentType,Name,DisplayName,Identity,Guid
100+
101+
$guidVar = "e222b65a-b3a8-46ec-ae12-00c2c91b71c0"
102+
103+
$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant", Identity:"All"}]}]"
104+
105+
New-DLPCompliancePolicy -Name "Copilot Policy" -Locations $loc
106+
107+
$advRule = @{
108+
"Version" = "1.0"
109+
"Condition" = @{
110+
"Operator" = "And"
111+
"SubConditions" = @(
112+
@{
113+
"ConditionName" = "ContentContainsSensitiveInformation"
114+
"Value" = @(
115+
@{
116+
"groups" = @(
117+
@{
118+
"Operator" = "Or"
119+
"labels" = @(
120+
@{
121+
"name" = $guidVar
122+
"type" = "Sensitivity"
123+
}
124+
)
125+
"name" = "Default"
126+
}
127+
)
128+
}
129+
)
130+
}
131+
)
132+
}
133+
} | ConvertTo-Json -Depth 100
134+
135+
New-DLPComplianceRule -Name "Copilot Rule" -Policy "Copilot Policy" -AdvancedRule $advrule -RestrictAccess @(@{setting="ExcludeContentProcessing";value="Block"})
136+
```
137+
138+
This example creates a DLP policy for Microsoft 365 Copilot (Preview) in several steps:
139+
140+
- The first command returns information about all sensitivity labels. Select the GUID value of the sensitivity label that you want to use. For example, `e222b65a-b3a8-46ec-ae12-00c2c91b71c0`.
141+
142+
- The second command stores the GUID value of the sensitivity label in the variable named `$guidVar`.
143+
144+
- The third command stores the Microsoft 365 Copilot location (`470f2276-e011-4e9d-a6ec-20768be3a4b0`) in the variable named `$loc`. Update the `$loc` value based on the Inclusions/Exclusions scoping that you want to provide.
145+
146+
- The fourth command creates the DLP policy using the `$loc` variable for the value of the Locations parameter, and "Copilot Policy" as the name of the policy (use any unique name).
147+
148+
- The fifth command creates the variable named `$advRule`. The advanced rule needs to be updated depending on the grouping of labels you want to provide as input.
149+
150+
- The last command creates the DLP rule with the name "Copilot Rule" (use any unique name). Use the name of the DLP policy from step four as the value of the Policy parameter.
151+
98152
## PARAMETERS
99153

100154
### -Name
@@ -427,7 +481,28 @@ Accept wildcard characters: False
427481
```
428482

429483
### -Locations
430-
{{ Fill Locations Description }}
484+
The Locations parameter specifies to whom, what, and where the DLP policy applies. This parameter uses the following properties:
485+
486+
- Workload: What the DLP policy applies to. Use the value `Applications`.
487+
- Location: Where the DLP policy applies. For Microsoft 365 Copilot, (Preview), use the value `470f2276-e011-4e9d-a6ec-20768be3a4b0`.
488+
- Inclusions: Who the DLP policy applies to. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`. For the entire tenant, use this value: `{Type:"Tenant",Identity:"All"}`.
489+
- Exclusions: Exclude security groups, distribution groups, or users from the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group, Identity:<ObjectId>}`.
490+
491+
You create and store the properties in a variable as shown in the following examples:
492+
493+
DLP policy scoped to all users in the tenant:
494+
495+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant",Identity:"All"}]}]"`
496+
497+
DLP policy scoped to the specified user and groups:
498+
499+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"},{"Type":"IndividualResource","Identity":"[email protected]"}]}]"`
500+
501+
DLP policy scoped to all users in the tenant except for members of the specified group:
502+
503+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant",Identity:"All"}]}],"Exclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"}]}]"`
504+
505+
After you create the `$loc` variable as shown in the previous examples, use the value `$loc` for this parameter.
431506

432507
```yaml
433508
Type: String

exchange/exchange-ps/exchange/Release-QuarantineMessage.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,8 @@ Accept wildcard characters: False
222222
### -ActionType
223223
The ActionType parameter specifies the release action type. Valid values are:
224224

225-
- Approve
226225
- Deny
227-
- Release
226+
- Release: Use this value to release messages or approve requests to release messages.
228227
- Request
229228

230229
```yaml

exchange/exchange-ps/exchange/Set-DlpCompliancePolicy.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,28 @@ Accept wildcard characters: False
743743
```
744744

745745
### -Locations
746-
{{ Fill Locations Description }}
746+
The Locations parameter specifies to whom, what, and where the DLP policy applies. This parameter uses the following properties:
747+
748+
- Workload: What the DLP policy applies to. Use the value `Applications`.
749+
- Location: Where the DLP policy applies. For Microsoft 365 Copilot, (Preview), use the value `470f2276-e011-4e9d-a6ec-20768be3a4b0`.
750+
- AddInclusions or RemoveInclusions: Add or remove security groups, distribution groups, or users to or from the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`.
751+
- AddExclusions or RemoveExclusions: Add or remove security groups, distribution groups, or users to or from exclusions to the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`.
752+
753+
You create and store the properties in a variable as shown in the following examples:
754+
755+
DLP policy scoped to all users in the tenant:
756+
757+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{Type:"Tenant",Identity:"All"}]}]"`
758+
759+
DLP policy scoped to the specified user and groups:
760+
761+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"},{"Type":"IndividualResource","Identity":"[email protected]"}]}]"`
762+
763+
DLP policy scoped to all users in the tenant except for members of the specified group:
764+
765+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{Type:"Tenant",Identity:"All"}],"AddExclusions": [{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"}]}]`
766+
767+
After you create the `$loc` variable as shown in the previous examples, use the value `$loc` for this parameter.
747768

748769
```yaml
749770
Type: String

teams/teams-ps/teams/Get-CsBatchTeamsDeploymentStatus.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ This cmdlet is used to get the status of the batch deployment orchestration.
1313

1414
## SYNTAX
1515

16-
```
16+
```powershell
1717
Get-CsBatchTeamsDeploymentStatus -OrchestrationId <String>
18-
[-Confirm]
19-
[-WhatIf]
18+
-InputObject <IConfigApiBasedCmdletsIdentity>
2019
[<CommonParameters>]
2120
```
2221

@@ -51,6 +50,21 @@ Accept pipeline input: False
5150
Accept wildcard characters: False
5251
```
5352
53+
### -InputObject
54+
The Identity parameter.
55+
56+
```yaml
57+
Type: IConfigApiBasedCmdletsIdentity
58+
Parameter Sets: GetViaIdentity
59+
Aliases:
60+
61+
Required: True
62+
Position: Named
63+
Default value: None
64+
Accept pipeline input: True (ByValue)
65+
Accept wildcard characters: False
66+
```
67+
5468
### CommonParameters
5569
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
5670

teams/teams-ps/teams/Get-CsTeamsEducationConfiguration.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,14 @@ This cmdlet is used to retrieve the organization-wide education configuration fo
1616

1717
## SYNTAX
1818

19+
### Identity (Default)
1920
```powershell
20-
Get-CsTeamsEducationConfiguration [<CommonParameters>]
21+
Get-CsTeamsEducationConfiguration [-Identity <String>] [<CommonParameters>]
22+
```
23+
24+
### Filter
25+
```powershell
26+
Get-CsTeamsEducationConfiguration [-Filter <String>] [<CommonParameters>]
2127
```
2228

2329
## DESCRIPTION
@@ -44,6 +50,36 @@ In this example, the organization has set the defaults as follows:
4450

4551
## PARAMETERS
4652

53+
### -Filter
54+
Enables you to use wildcard characters in order to return a collection of team education configuration settings.
55+
56+
```yaml
57+
Type: String
58+
Parameter Sets: Filter
59+
Aliases:
60+
61+
Required: False
62+
Position: Named
63+
Default value: None
64+
Accept pipeline input: False
65+
Accept wildcard characters: False
66+
```
67+
68+
### -Identity
69+
The unique identifier of the configuration.
70+
71+
```yaml
72+
Type: String
73+
Parameter Sets: Identity
74+
Aliases:
75+
76+
Required: False
77+
Position: Named
78+
Default value: None
79+
Accept pipeline input: False
80+
Accept wildcard characters: False
81+
```
82+
4783
### CommonParameters
4884
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
4985

teams/teams-ps/teams/Get-CsTeamsMediaConnectivityPolicy.md

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,25 @@ ms.author: runli
1313

1414
## SYNOPSIS
1515

16-
This cmdlet retrieves all Teams media connectivity policies for current tenant.
16+
This cmdlet retrieves all Teams media connectivity policies for the current tenant.
1717

1818
## SYNTAX
1919

20+
### Identity (Default)
21+
22+
```powershell
23+
Get-CsTeamsMediaConnectivityPolicy [-Identity <String>] [<CommonParameters>]
2024
```
21-
Get-CsTeamsMediaConnectivityPolicy [<CommonParameters>]
25+
26+
### Filter
27+
28+
```powershell
29+
Get-CsTeamsMediaConnectivityPolicy [-Filter <String>] [<CommonParameters>]
2230
```
2331

2432
## DESCRIPTION
2533

26-
This cmdlet retrieves all Teams media connectivity policies for current tenant.
34+
This cmdlet retrieves all Teams media connectivity policies for the current tenant.
2735

2836
## EXAMPLES
2937

@@ -36,10 +44,42 @@ Identity DirectConnection
3644
Tag:Test Enabled
3745
```
3846

39-
retrieves Teams media connectivity policies, show the result as identity tag and "DirectConnection" value.
47+
This example retrieves the Teams media connectivity policies and shows the result as identity tag and "DirectConnection" value.
4048

4149
## PARAMETERS
4250

51+
### -Filter
52+
53+
Enables you to use wildcard characters when indicating the policy (or policies) to be returned.
54+
55+
```yaml
56+
Type: String
57+
Parameter Sets: Filter
58+
Aliases:
59+
60+
Required: False
61+
Position: Named
62+
Default value: None
63+
Accept pipeline input: False
64+
Accept wildcard characters: False
65+
```
66+
67+
### -Identity
68+
69+
The identity of the Teams Media Connectivity Policy.
70+
71+
```yaml
72+
Type: String
73+
Parameter Sets: Identity
74+
Aliases:
75+
76+
Required: False
77+
Position: Named
78+
Default value: None
79+
Accept pipeline input: False
80+
Accept wildcard characters: False
81+
```
82+
4383
### CommonParameters
4484
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
4585

teams/teams-ps/teams/Get-CsTeamsShiftsConnectionTeamMap.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This cmdlet supports retrieving the list of team mappings.
1818
## SYNTAX
1919

2020
```
21-
Get-CsTeamsShiftsConnectionTeamMap -ConnectorInstanceId <String> [<CommonParameters>]
21+
Get-CsTeamsShiftsConnectionTeamMap -ConnectorInstanceId <String> -InputObject <IConfigApiBasedCmdletsIdentity> [<CommonParameters>]
2222
```
2323

2424
## DESCRIPTION
@@ -64,6 +64,20 @@ Default value: None
6464
Accept pipeline input: False
6565
Accept wildcard characters: False
6666
```
67+
### -InputObject
68+
The Identity parameter
69+
70+
```yaml
71+
Type: IConfigApiBasedCmdletsIdentity
72+
Parameter Sets: GetViaIdentity
73+
Aliases:
74+
75+
Required: True
76+
Position: Named
77+
Default value: None
78+
Accept pipeline input: True (ByValue)
79+
Accept wildcard characters: False
80+
```
6781
6882
### CommonParameters
6983
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).

0 commit comments

Comments
 (0)