Merge branch 'main' into vdamabe-policheck1

Author: damabe

.github/workflows/AutoPublish.yml

@@ -0,0 +1,25 @@
+name: (Scheduled) Publish to live
+
+permissions:
+  contents: write
+  pull-requests: write
+
+on:
+  schedule:
+    - cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
+
+  workflow_dispatch:
+
+jobs:
+
+  auto-publish:
+    if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
+    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
+    with:
+        PayloadJson: ${{ toJSON(github) }}
+        EnableAutoPublish: true
+
+    secrets:
+        AccessToken: ${{ secrets.GITHUB_TOKEN }}
+        PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
+        ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/StaleBranch.yml

@@ -2,12 +2,18 @@ name: (Scheduled) Stale branch removal
 
 permissions:
   contents: write
-      
+  pull-requests: read
+
+# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
+# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.
+# The workflow should not be configured to run after "deletion day" so that users can review the branches were deleted.
+# Recommendation: configure cron to run on days 1,15-31 where 1 is what's configured in 'DeleteOnDayOfMonth'. If 'DeleteOnDayOfMonth' is set to something else, update cron to run the two weeks leading up to it.
+
 on:
   schedule:
-    - cron: "0 9 1 * *"
+    - cron: "0 9 1,15-31 * *"
 
-  # workflow_dispatch:
+  workflow_dispatch:
 
 
 jobs:

.openpublishing.redirection.json

@@ -7143,6 +7143,11 @@
       "redirect_url": "/powershell/module/exchange/get-exosecopsoverriderule",
       "redirect_document_id": false
     },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-VivaFeatureCategory.md",
+      "redirect_url": "/viva/feature-access-management",
+      "redirect_document_id": false
+    },
     {
       "source_path": "skype/virtual-folder/skype/Disable-CsOnlineSipDomain.md",
       "redirect_url": "/powershell/module/teams/Disable-CsOnlineSipDomain",

exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md

@@ -15,51 +15,32 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell module v3.2.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
 
-**Note**: Support for categories is available in version 3.5.0-Preview2 or later of the module, but no categories are currently available in Viva. We'll update the documentation when categories are available.
+Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature in Viva. The attributes of the policy are defined using the cmdlet parameters. Policies are used to restrict or grant access to the specified feature for specific users, groups, or the entire tenant.
 
-Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature or a category in Viva. The attributes of the policy are defined using the cmdlet parameters. Policies are used to restrict or grant access to the specified feature or category for specific users, groups, or the entire tenant.
-
-- You can assign up to 10 policies per feature/category. An additional one policy per feature/category can be assigned to the entire tenant.
-- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature/category is enabled. If a user has multiple policies assigned for a feature/category (directly as a user or member of a group), the most restrictive policy applies.
-- If a category is disabled by category policies, all features under the category are disabled regardless of the policies set at the feature level.
-- You can only update user controls at the feature policy level, not the category policy level.
+- You can assign up to 10 policies per feature. An additional one policy per feature can be assigned to the entire tenant.
+- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature is enabled. If a user has multiple policies assigned for a feature (directly as a user or member of a group), the most restrictive policy applies.
 - Some features only support policies that apply to the entire tenant, not specific users or groups. You can refer to supported policy scopes for a feature using the [Get-VivaModuleFeature](https://learn.microsoft.com/powershell/module/exchange/get-vivamodulefeature) cmdlet.
 
 Some features include the option for user controls (user opt out). Refer to the feature documentation to see if user controls are available for the feature that you intend to set a policy for.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
-
-### FeaturePolicy
 ```
 Add-VivaModuleFeaturePolicy -FeatureId <String> -IsFeatureEnabled <Boolean> -ModuleId <String> -Name <String>
  [-Confirm]
  [-Everyone]
  [-GroupIds <String[]>]
  [-IsUserControlEnabled <Boolean>]
- [-ResultSize <Unlimited>]
- [-UserIds <String[]>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### CategoryPolicy
-```
-Add-VivaModuleFeaturePolicy -CategoryId <String> -IsCategoryEnabled <Boolean> -Name <String>
- [-Confirm]
- [-Everyone]
- [-GroupIds <String[]>]
+ [-IsUserOptedInByDefault <Boolean>]
  [-ResultSize <Unlimited>]
  [-UserIds <String[]>]
  [-WhatIf]
  [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature or category in Viva.
-
-Support for categories is available in version 3.5.0-Preview2 or later of the module.
+Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature in Viva.
 
 You need to use the Connect-ExchangeOnline cmdlet to authenticate.
 
@@ -106,92 +87,21 @@ This example adds a policy for the Reflection feature in Viva Insights. The poli
 
 ### Example 5
 ```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name DisableCategoryForAll -IsCategoryEnabled $false -Everyone
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the organization.
-
-### Example 6
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleGroups -IsCategoryEnabled $false -GroupIds group1@contoso.com,group2@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the specified groups.
-
-### Example 7
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleUsers -IsCategoryEnabled $false -UserIds user1@contoso.com,user2@contoso.com
+Add-VivaModuleFeaturePolicy -ModuleId PeopleSkills -FeatureId ShowAISkills -Name SoftDisableShowAISkillsPolicy -IsFeatureEnabled $true -IsUserControlEnabled $true -IsUserOptedInByDefault $false -UserIds user1@contoso.com,user2@contoso.com
 ```
 
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users.
-
-### Example 8
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name UsersAndGroups -IsCategoryEnabled $false -GroupIds group1@contoso.com,group2@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3 -UserIds user1@contoso.com,user2@contoso.com
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users and group members.
-
-### Example 9
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name "Disable Category For All" -IsCategoryEnabled $false -Everyone
-```
-
-This example adds a policy for the `<category_id>` category in Viva where the policy name is with spaces. The policy disables the category (effectively all features under the category) for all users in the organization.
+This example adds a policy for the ShowAISkills feature in Viva Skills. The policy enables the feature for the specified users, allows user controls, and opted out users by default (Soft Disable policy).
 
 ## PARAMETERS
 
-### -CategoryId
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The CategoryId parameter specifies the Viva category that you want to add the policy for.
-
-```yaml
-Type: String
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -FeatureId
 The FeatureId parameter specifies the feature in the Viva module that you want to add the policy for.
 
 To view details about the features in a Viva module that support feature access controls, use the Get-VivaModuleFeature cmdlet. The FeatureId value is returned in the output of the cmdlet.
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IsCategoryEnabled
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The IsCategoryEnabled parameter specifies whether or not the category is enabled by the policy. Valid values are:
-
-- $true: The category is enabled by the policy.
-- $false: The category is not enabled by the policy.
-
-```yaml
-Type: Boolean
-Parameter Sets: CategoryPolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -210,7 +120,7 @@ The IsFeatureEnabled parameter specifies whether or not the feature is enabled b
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -226,7 +136,7 @@ The ModuleId parameter specifies the Viva module that you want to add the featur
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -328,7 +238,32 @@ Only features that allow admins to enable and disable user controls by policy ca
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IsUserOptedInByDefault
+This parameter is available in version 3.8.0-Preview2 or later of the module.
+
+The IsUserOptedInByDefault parameter specifies whether users are opted in by default by the policy. Valid values are:
+
+- $true: By default, users are opted in by the policy if the user hasn't set a preference.
+- $false: By default, users are opted out by the policy if the user hasn't set a preference.
+
+This parameter is optional and can be used to override the default user opt-in value set in the feature metadata.
+
+This parameter can be set only when the IsUserControlEnabled parameter is set to $true.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 

exchange/exchange-ps/exchange/Export-QuarantineMessage.md

@@ -29,6 +29,7 @@ Export-QuarantineMessage -Identities <QuarantineMessageIdentity[]> [-Identity <Q
  [-EntityType <Microsoft.Exchange.Management.FfoQuarantine.EntityType>]
  [-ForceConversionToMime]
  [-Password <SecureString>]
+ [-PasswordV2 <String>]
  [-ReasonForExport <String>]
  [-RecipientAddress <String>]
  [<CommonParameters>]
@@ -41,6 +42,7 @@ Export-QuarantineMessage -Identity <QuarantineMessageIdentity>
  [-EntityType <Microsoft.Exchange.Management.FfoQuarantine.EntityType>]
  [-ForceConversionToMime]
  [-Password <SecureString>]
+ [-PasswordV2 <String>]
  [-ReasonForExport <String>]
  [-RecipientAddress <String>]
  [<CommonParameters>]
@@ -202,6 +204,8 @@ You can use the following methods as a value for this parameter:
 - Before you run this command, store the password as a variable (for example, `$password = Read-Host "Enter password" -AsSecureString`), and then use the variable (`$password`) for the value.
 - `(Get-Credential).password` to be prompted to enter the password securely when you run this command.
 
+To enter the password in plain text, use the PasswordV2 parameter.
+
 ```yaml
 Type: SecureString
 Parameter Sets: (All)
@@ -215,6 +219,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PasswordV2
+The PasswordV2 parameter specifies the plain text value of the password that's required to open the exported message. Enclose the value in quotation marks (for example, `'<password>'`).
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Security & Compliance, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ReasonForExport
 The ReasonForExport parameter specifies why the message was exported. If the value contains spaces, enclose the value in quotation marks (").
 

exchange/exchange-ps/exchange/Get-FeatureConfiguration.md

@@ -25,10 +25,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
- [-All]
  [-Confirm]
- [-GeneralDiscovery]
- [-IrmDiscovery]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -92,22 +89,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -All
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -Confirm
 This parameter is reserved for internal Microsoft use.
 
@@ -124,38 +105,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -GeneralDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -IrmDiscovery
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -WhatIf
 This parameter is reserved for internal Microsoft use.