Skip to content

Commit 5e8ab9b

Browse files
authored
Merge branch 'main' into patch-2
2 parents 60199c2 + 72a7644 commit 5e8ab9b

10 files changed

+205
-38
lines changed

exchange/exchange-ps/exchange/New-RetentionComplianceRule.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,17 @@ To use this cmdlet in Security & Compliance Center PowerShell, you need to be as
6767

6868
### Example 1
6969
```powershell
70-
New-RetentionComplianceRule -Name SeptOneYear -Policy "Internal Company Policy" -RetentionDuration Unlimited
70+
New-RetentionComplianceRule -Name InternalCompanyRule -Policy "Internal Company Policy" -RetentionDuration Unlimited
7171
```
7272

73-
This example creates a new retention rule named SeptOneYear and adds it to the existing retention policy named "Internal Company Policy". Content will be held indefinitely.
73+
This example creates a new case hold rule named InternalCompanyRule and adds it to the existing case hold policy named "Internal Company Policy". Content will be held indefinitely.
74+
75+
### Example 2
76+
```powershell
77+
New-RetentionComplianceRule -Name SeptOneYear -Policy "Internal Company Policy" -RetentionDuration 365 -RetentionComplianceAction KeepAndDelete -ExpirationDateOption ModificationAgeInDays
78+
```
79+
80+
This example creates a new retention rule named SeptOneYear and adds it to the existing retention policy named "Internal Company Policy". Content will be held for one year from the day content was last modified before it is deleted.
7481

7582
## PARAMETERS
7683

exchange/exchange-ps/exchange/Search-UnifiedAuditLog.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,9 @@ Accept wildcard characters: False
306306
```
307307

308308
### -SiteIds
309-
The SiteIds parameter filters the log entries by the SharePoint site URL.
309+
The SiteIds parameter filters the log entries by the SharePoint SiteId (GUID). You can enter multiple values separated by commas: `Value1, Value2,…ValueN`.
310310

311-
You can enter multiple values separated by commas. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
312-
313-
If the site URL contains a dash (-), escape the dash character with another dash. For example, for the site `https://contoso.sharepoint.com/sites/hr-project`, use the value `"https://contoso.sharepoint.com/sites/hr--project"`.
311+
To obtain the the SiteId for a SharePoint site, append `/_api/site/id` to the URL of the site collection you want to specify. For example, change the URL `https://contoso.sharepoint.com/sites/hr-project` to `https://contoso.sharepoint.com/sites/hr-project/_api/site/id`. An XML payload is returned and the SiteId for the site collection is displayed in the Edm.Guid property; for example: `<d:Id xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.Guid">14ab81b6-f23d-476a-8cac-ad5dbd2910f7</d:Id>`.
314312

315313
```yaml
316314
Type: String[]

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ The DisablePlusAddressInRecipients parameter specifies whether to enable or disa
14791479
- $true: Plus addressing is enabled. You can no longer use the plus sign in regular email addresses. The plus sign is only available for plus addressing.
14801480
- $false: Plus addressing is disabled. You can use the plus sign in regular email addresses.
14811481

1482-
For more information about plus addressing, see [Plus addressing in Exchange Online](https://docs.microsoft.com/eexchange/recipients-in-exchange-online/plus-addressing-in-exchange-online).
1482+
For more information about plus addressing, see [Plus addressing in Exchange Online](https://docs.microsoft.com/exchange/recipients-in-exchange-online/plus-addressing-in-exchange-online).
14831483

14841484
```yaml
14851485
Type: Boolean

skype/skype-ps/skype/Get-CsOnlineUser.md

Lines changed: 181 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ This parameter has been deprecated from the Teams PowerShell Modules version 3.0
154154
```yaml
155155
Type: PSCredential
156156
Parameter Sets: (All)
157-
Aliases:
157+
Aliases:
158158
Applicable: Microsoft Teams, Skype for Business Online
159159

160160
Required: False
@@ -199,6 +199,9 @@ In the Teams PowerShell Module version 3.0.0 or later, filtering functionality i
199199
- givenName
200200
- Identity
201201
- lineUri
202+
- userPrincipalName
203+
- CallingLineIdentity
204+
- ExternalAccessPolicy
202205
- OnlineAudioConferencingRoutingPolicy
203206
- OnlineDialOutPolicy
204207
- OnlineVoicemailPolicy
@@ -287,39 +290,50 @@ In the Teams PowerShell Module version 3.0.0 or later, filtering functionality i
287290
- TeamsVdiPolicy
288291
- TeamsVerticalPackagePolicy
289292
- TeamsVideoInteropServicePolicy
293+
- TeamsEducationAssignmentsAppPolicy
294+
- TeamsComplianceRecordingPolicy
295+
- TeamsWorkLoadPolicy
296+
- VoiceRoutingPolicy
297+
- AssignedPlan
298+
- EnterpriseVoiceEnabled
299+
- Identity
300+
- department
301+
- UserDirSyncEnabled
290302
- TenantDialPlan
291303
- Title
292304
- UsageLocation
293305
- UserDirSyncEnabled
294306
- userPrincipalName
295307

296-
In the Teams PowerShell Module version 3.0.0 or later, the following attributes have been renamed:
308+
*Attributes that have changed in meaning/format*:
297309

298-
- ObjectId is now Identity.
299-
- FirstName is now GivenName.
300-
- DirSyncEnabled is now UserDirSyncEnabled.
301-
- MCOValidationError is now UserValidationErrors.
302-
- Enabled is now IsSipEnabled.
303-
- TeamsBranchSurvivabilityPolicy is now TeamsSurvivableBranchAppliancePolicy.
310+
**OnPremLineURI**: This attribute previously used to refer to both:
311+
312+
1. LineURI set via OnPrem AD.
313+
2. Direct Routing numbers assigned to users via Set-CsUser.
304314

305315
In the Teams PowerShell Module version 3.0.0 or later, the **OnPremLineURI** attribute refers only to the LineURI that's set via OnPrem AD. Previously, **OnPremLineURI** also referred to Direct Routing numbers that were assigned to users via the Set-CsUser cmdlet. Now, Direct Routing numbers are available in the **LineURI** attribute. You can distinguish Direct Routing Numbers from Calling Plan Numbers by looking at the **FeatureTypes** attribute.
306316

307317
In the Teams PowerShell Module version 3.0.0 or later, the format of the AssignedPlan and ProvisionedPlan attributes has changed from XML to JSON array. Previous XML filters (For example, `-Filter "AssignedPlan -eq '<some-xml-string>'"`) will no longer work. Instead, you need to update your filters to use one of the following formats:
308318

309319
- All users with an AssignedPlan that ends with "MCO": `-Filter "AssignedPlan -eq '*MCO'"`
310-
- All users with an AssignedPlan that starts with MCO: `-Filter "AssignedPlan -eq 'MCO*'"`
320+
- All users with an AssignedPlan that starts with MCO: `-Filter "AssignedPlan -eq 'MCO*'"`
311321
- All users with an AssignedPlan that contains MCO: `-Filter "AssignedPlan -eq '*MCO*'"`
312322

313-
In the Teams PowerShell Module version 3.0.0 or later, the output format of Policies has now changed from String to JSON type UserPolicyDefinition.
323+
**Policy Attributes**:
324+
325+
- PolicyProperty comparison works only when "Authority" is provided in the value. For ex: `-Filter "TeamsMessagingPolicy -eq '<Authority>:<Value>'"`
326+
"Authority" can contain any of these two values: Host or Tenant for a policy type (PreCanned/Default configurations provided by feature team are referred to as Host configurations while Admin-created configurations are considered Tenant configurations)
327+
328+
- In the Teams PowerShell Module version 3.0.0 or later, the output format of Policies has now changed from String to JSON type UserPolicyDefinition.
314329

315-
In the Teams PowerShell Module version 3.0.0 or later, the following PowerShell logical operators are no longer supported:
330+
*Dropped Filter operators*:
316331

317-
- Not (`-not`)
318-
- Like (`-like`)
319-
- Less than (`-lt`)
320-
- Less than or equal to (`-le`)
321-
- Greater than (`-gt`)
322-
- Greater than or equal to (`-ge`)
332+
The following filter syntaxes are not supported in Teams PowerShell Module 3.0.0 and above:
333+
334+
- not, -lt, -gt: These operators have been dropped.
335+
- ge, -ne: These operators are not supported with policy properties.
336+
- like: This operator is supported only with wildcard character in the end (e.g., `"like <value>*"`).
323337

324338
```yaml
325339
Type: String
@@ -460,10 +474,158 @@ Accept wildcard characters: False
460474
### CommonParameters
461475
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).
462476

463-
## INPUTS
464-
465477
## OUTPUTS
466478

479+
### Notes
480+
481+
The following updates are applicable for TeamsOnly customers using Microsoft Teams PowerShell version 3.0.0 and above.
482+
483+
*New user attributes*:
484+
485+
FeatureTypes – Array of unique strings specifying what features are enabled for a user. This attribute is an alternatitive to several attributes that have been dropped as outlined in the next section.
486+
Some of the commonly used FeatureTypes include:
487+
488+
- Teams
489+
- AudioConferencing
490+
- PhoneSystem
491+
- CallingPlan
492+
493+
*Dropped attributes*:
494+
495+
The following attributes are no longer relevant to Teams and have been dropped from the output:
496+
497+
- AcpInfo
498+
- AdminDescription
499+
- ArchivingPolicy
500+
- AudioVideoDisabled
501+
- BaseSimpleUrl
502+
- BroadcastMeetingPolicy
503+
- CallViaWorkPolicy
504+
- ClientPolicy
505+
- ClientUpdateOverridePolicy
506+
- ClientVersionPolicy
507+
- CloudMeetingOpsPolicy
508+
- CloudMeetingPolicy
509+
- CloudVideoInteropPolicy
510+
- ContactOptionFlags
511+
- CountryOrRegionDisplayName
512+
- Description
513+
- DistinguishedName
514+
- EnabledForRichPresence
515+
- ExchangeArchivingPolicy
516+
- ExchUserHoldPolicies
517+
- ExperiencePolicy
518+
- ExternalUserCommunicationPolicy
519+
- ExUmEnabled
520+
- Guid
521+
- HomeServer
522+
- HostedVoicemailPolicy
523+
- IPPBXSoftPhoneRoutingEnabled
524+
- IPPhone
525+
- IPPhonePolicy
526+
- IsByPassValidation
527+
- IsValid
528+
- LegalInterceptPolicy
529+
- LicenseRemovalTimestamp
530+
- LineServerURI
531+
- Manager
532+
- MNCReady
533+
- Name
534+
- NonPrimaryResource
535+
- ObjectCategory
536+
- ObjectClass
537+
- ObjectState
538+
- OnPremHideFromAddressLists
539+
- OriginalPreferredDataLocation
540+
- OriginatingServer
541+
- OriginatorSid
542+
- OverridePreferredDataLocation
543+
- PendingDeletion
544+
- PrivateLine
545+
- ProvisioningCounter
546+
- ProvisioningStamp
547+
- PublishingCounter
548+
- PublishingStamp
549+
- Puid
550+
- RemoteCallControlTelephonyEnabled
551+
- RemoteMachine
552+
- SamAccountName
553+
- ServiceInfo
554+
- StsRefreshTokensValidFrom
555+
- SubProvisioningCounter
556+
- SubProvisioningStamp
557+
- SubProvisionLineType
558+
- SyncingCounter
559+
- TargetRegistrarPool
560+
- TargetServerIfMoving
561+
- TeamsInteropPolicy
562+
- ThumbnailPhoto
563+
- UpgradeRetryCounter
564+
- UserAccountControl
565+
- UserProvisionType
566+
- UserRoutingGroupId
567+
- VoicePolicy - Alternative is the CallingPlan and PhoneSystem string in FeatureTypes
568+
- XForestMovePolicy
569+
- AddressBookPolicy
570+
- GraphPolicy
571+
- PinPolicy
572+
- PreferredDataLocationOverwritePolicy
573+
- PresencePolicy
574+
- SmsServicePolicy
575+
- TeamsVoiceRoute
576+
- ThirdPartyVideoSystemPolicy
577+
- UserServicesPolicy
578+
- ConferencingPolicy
579+
- Id
580+
- MobilityPolicy
581+
- OnlineDialinConferencingPolicy - Alternative is the AudioConferencing string in FeatureTypes
582+
- Sid
583+
- TeamsWorkLoadPolicy
584+
- VoiceRoutingPolicy
585+
- ClientUpdatePolicy
586+
- HomePhone
587+
- HostedVoiceMail
588+
- MobilePhone
589+
- OtherTelephone
590+
- StreetAddress
591+
- WebPage
592+
- AssignedLicenses
593+
- OnPremisesUserPrincipalName
594+
- HostedVoiceMail
595+
- LicenseAssignmentStates
596+
- OnPremDomainName
597+
- OnPremSecurityIdentifier
598+
- OnPremSamAccountName
599+
- CallerIdPolicy
600+
- Fax
601+
- LastName
602+
- Office
603+
- Phone
604+
- WindowsEmailAddress
605+
606+
*Attributes renamed*:
607+
608+
- ObjectId renamed to Identity
609+
- FirstName renamed to GivenName
610+
- DirSyncEnabled renamed to UserDirSyncEnabled
611+
- MCOValidationErrors renamed to UserValidationErrors
612+
- Enabled renamed to IsSipEnabled
613+
- TeamsBranchSurvivabilityPolicy renamed to TeamsSurvivableBranchAppliancePolicy
614+
615+
*Attributes that have changed in meaning/format*:
616+
617+
**OnPremLineURI**: This attribute previously used to refer to both:
618+
619+
1. LineURI set via OnPrem AD.
620+
2. Direct Routing numbers assigned to users via Set-CsUser.
621+
622+
In Teams PowerShell Modules 3.0.0 and above OnPremLineURI will only refer to the LineURI set via OnPrem AD. Direct Routing numbers will be available from the LineURI field. Direct Routing Numbers can be distinguished from Calling Plan Numbers by looking at the FeatureTypes attribute.
623+
624+
- **The output format of AssignedPlan and ProvisionedPlan have now changed from XML to JSON array.**
625+
- **The output format of Policies has now changed from String to JSON type UserPolicyDefinition.**
626+
627+
## INPUTS
628+
467629
## NOTES
468630

469631
## RELATED LINKS

teams/teams-ps/teams/Get-CsPolicyPackage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: Get-CsPolicyPackage
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: amitar
88
online version: https://docs.microsoft.com/powershell/module/teams/get-cspolicypackage
99
schema: 2.0.0

teams/teams-ps/teams/Get-CsUserPolicyPackage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: Get-CsUserPolicyPackage
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: amitar
88
online version: https://docs.microsoft.com/powershell/module/teams/get-csuserpolicypackage
99
schema: 2.0.0

teams/teams-ps/teams/Get-CsUserPolicyPackageRecommendation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: Get-CsUserPolicyPackageRecommendation
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: amitar
88
online version: https://docs.microsoft.com/powershell/module/teams/get-csuserpolicypackagerecommendation
99
schema: 2.0.0

teams/teams-ps/teams/Grant-CsGroupPolicyPackageAssignment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: Grant-CsGroupPolicyPackageAssignment
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: dasosby
88
online version: https://docs.microsoft.com/powershell/module/teams/grant-csgrouppolicypackageassignment
99
schema: 2.0.0

teams/teams-ps/teams/Grant-CsUserPolicyPackage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: Grant-CsUserPolicyPackage
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: amitar
88
online version: https://docs.microsoft.com/powershell/module/teams/grant-csuserpolicypackage
99
schema: 2.0.0

teams/teams-ps/teams/New-CsBatchPolicyPackageAssignmentOperation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftTeams
44
title: New-CsBatchPolicyPackageAssignmentOperation
5-
author: icchan
6-
ms.author: icchan
5+
author: serdarsoysal
6+
ms.author: serdars
77
manager: amitar
88
online version: https://docs.microsoft.com/powershell/module/teams/new-csbatchpolicypackageassignmentoperation
99
schema: 2.0.0

0 commit comments

Comments
 (0)