Merge pull request #249565 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to main

Author: rmca14

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

@@ -176,7 +176,7 @@ This setting has an effect on access attempts made from the following mobile app
 | Outlook mobile app | Exchange Online | Android, iOS |
 | Power BI app | Power BI service | Windows 10, Windows 8.1, Windows 7, Android, and iOS |
 | Skype for Business | Exchange Online| Android, iOS |
-| Visual Studio Team Services app | Visual Studio Team Services | Windows 10, Windows 8.1, Windows 7, iOS, and Android |
+| Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) app | Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) | Windows 10, Windows 8.1, Windows 7, iOS, and Android |
 
 ### Exchange ActiveSync clients
 

articles/active-directory/develop/msal-android-single-sign-on.md

@@ -179,6 +179,9 @@ If the application uses a `WebView` strategy without integrating Microsoft Authe
 
 If the application uses MSAL with a broker like Microsoft Authenticator or Intune Company Portal, then users can have SSO experience across applications if they have an active sign-in with one of the apps.
 
+> [!NOTE]
+> MSAL with broker utilizes WebViews instead of Custom Tabs. As a result, the Single Sign-On (SSO) state is not extended to other apps that use Custom Tabs.
+
 ### WebView
 
 To use the in-app WebView, put the following line in the app configuration JSON that is passed to MSAL:

articles/active-directory/devices/concept-primary-refresh-token.md

@@ -158,6 +158,9 @@ The following diagrams illustrate the underlying details in issuing, renewing, a
 > [!NOTE]
 > In Azure AD joined devices, Azure AD PRT issuance (steps A-F) happens synchronously before the user can logon to Windows. In hybrid Azure AD joined devices, on-premises Active Directory is the primary authority. So, the user is able to login hybrid Azure AD joined Windows after they can acquire a TGT to login, while the PRT issuance happens asynchronously. This scenario does not apply to Azure AD registered devices as logon does not use Azure AD credentials.
 
+> [!NOTE]
+> In a Hybrid Azure AD joined Windows environment, the issuance of the PRT occurs asynchronously. The issuance of the PRT may fail due to issues with the federation provider. This failure can result in sign on issues when users try to access cloud resources. It is important to troubleshoot this scenario with the federation provider.
+
 | Step | Description |
 | :---: | --- |
 | A | User enters their password in the sign in UI. LogonUI passes the credentials in an auth buffer to LSA, which in turns passes it internally to CloudAP. CloudAP forwards this request to the CloudAP plugin. |

articles/active-directory/fundamentals/security-defaults.md

@@ -147,6 +147,7 @@ It's important to verify the identity of users who want to access Azure Resource
 After you enable security defaults in your tenant, any user accessing the following services must complete multifactor authentication: 
 
 - Azure portal
+- Microsoft Entra admin center
 - Azure PowerShell 
 - Azure CLI 
 

articles/active-directory/hybrid/connect/reference-connect-adsynctools.md

@@ -333,6 +333,7 @@ Accept wildcard characters: False
 ```
 #### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
+
 ## Export-ADSyncToolsAadDisconnectors
 ### SYNOPSIS
 Export Azure AD Disconnector objects
@@ -373,9 +374,57 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 Use ObjectType argument in case you want to export Disconnectors for a given object type only
 ### OUTPUTS
 Exports a CSV file with Disconnector objects containing: 
-
 UserPrincipalName, Mail, SourceAnchor, DistinguishedName, CsObjectId, ObjectType, ConnectorId and CloudAnchor
 
+## Export-ADSyncToolsAadPublicFolders
+### SYNOPSIS
+Exports all synchronized Mail-Enabled Public Folder objects from AzureAD to a CSV file
+### SYNTAX
+```
+Export-ADSyncToolsAadPublicFolders [-Credential] <PSCredential> [-Path] <Object> [<CommonParameters>]
+```
+### DESCRIPTION
+This function exports to a CSV file all the synchronized Mail-Enabled Public Folders (MEPF) present in Azure AD.
+It can be used in conjunction with Remove-ADSyncToolsAadPublicFolders to identify and remove orphaned Mail-Enabled Public Folders in Azure AD.
+This function requires the credentials of a Global Administrator in Azure AD and authentication with MFA is not supported.
+NOTE: If DirSync has been disabled on the tenant, you will need to temporarily re-enabled DirSync in order to remove orphaned Mail Enabled Public Folders from Azure AD.
+### EXAMPLES
+#### EXAMPLE 1
+```
+Export-ADSyncToolsAadPublicFolders -Credential $(Get-Credential) -Path <file_name>
+```
+### PARAMETERS
+#### -Credential
+Azure AD Global Admin Credential
+```yaml
+Type: PSCredential
+Parameter Sets: (All)
+Aliases:
+Required: true
+Position: 1
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+#### -Path
+Path for output file
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+Required: true
+Position: 2
+Default value: None
+Accept pipeline input: false (ByPropertyName)
+Accept wildcard characters: false
+```
+#### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
+### INPUTS
+
+### OUTPUTS
+This cmdlet creates the <filename> containing all synced Mail-Enabled PublicFolder objects in CSV format.
+    
 ## Export-ADSyncToolsHybridAadJoinReport
 ### SYNOPSIS
 Generates a report of certificates stored in Active Directory Computer objects, specifically, 
@@ -1150,6 +1199,76 @@ InputCsvFilename must point to a CSV file with at least 2 columns: SourceAnchor,
 ### OUTPUTS
 Shows results from ExportDeletions operation
 DISCLAIMER: Other than User objects that have a Recycle Bin, any other object types DELETED with this function cannot be RECOVERED!
+
+## Remove-ADSyncToolsAadPublicFolders
+### SYNOPSIS
+Removes synchronized Mail-Enabled Public Folders (MEPF) present from AzureAD.
+You can specify one SourceAnchor/ImmutableID for the target MEPF object to delete, or provide a CSV list with a batch of objects to delete when used in conjunction with Export-ADSyncToolsAadPublicFolders.
+This function requires the credentials of a Global Administrator in Azure AD and authentication with MFA is not supported.
+NOTE: If DirSync has been disabled on the tenant, you'll need to temporary re-enabled DirSync in order to remove orphaned Mail Enabled Public Folders from Azure AD.
+### SYNTAX
+```
+Export-ADSyncToolsAadPublicFolders [-Credential] <PSCredential> [-Path] <Object> [<CommonParameters>]
+```
+### DESCRIPTION
+This function exports to a CSV file all the synchronized Mail-Enabled Public Folders (MEPF) present in Azure AD.
+It can be used in conjunction with Remove-ADSyncToolsAadPublicFolders to identify and remove orphaned Mail-Enabled Public Folders in Azure AD.
+This function requires the credentials of a Global Administrator in Azure AD and authentication with MFA is not supported.
+NOTE: If DirSync has been disabled on the tenant, you will need to temporarily re-enabled DirSync in order to remove orphaned Mail Enabled Public Folders from Azure AD.
+### EXAMPLES
+#### EXAMPLE 1
+```
+Remove-ADSyncToolsAadPublicFolders [-Credential] <PSCredential> [-InputCsvFilename] <Object> [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+#### EXAMPLE 2
+```
+Remove-ADSyncToolsAadPublicFolders [-Credential] <PSCredential> [-SourceAnchor] <Object> [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+### PARAMETERS
+#### -Credential
+Azure AD Global Admin Credential
+```yaml
+Type: PSCredential
+Parameter Sets: (All)
+Aliases:
+Required: true
+Position: 1
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+#### -InputCsvFilename
+Path for input CSV file
+```yaml
+Type: String
+Parameter Sets: InputCsv
+Aliases:
+Required: true
+Position: 2
+Default value: None
+Accept pipeline input: true (ByPropertyName)
+Accept wildcard characters: false
+```
+#### -SourceAnchor
+Target SourceAnchor/ImmutableID
+```yaml
+Type: String
+Parameter Sets: SourceAnchor
+Aliases:
+Required: true
+Position: 2
+Default value: None
+Accept pipeline input: true (ByPropertyName)
+Accept wildcard characters: false
+```
+#### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
+### INPUTS
+The CSV input file can be generated using Export-ADSyncToolsAadPublicFolders.
+Path parameters must point to a CSV file with at least 2 columns: SourceAnchor, SyncObjectType.
+### OUTPUTS
+Shows results from ExportDeletions operation.
+
 ## Remove-ADSyncToolsExpiredCertificates
 ### SYNOPSIS
 Script to Remove Expired Certificates from UserCertificate Attribute

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-sql.md

@@ -90,6 +90,8 @@ SQL DB requires unique Azure AD display names. With this, the Azure AD accounts
 
     > [!NOTE]
     > `VMName` in the following command is the name of the VM that you enabled system assigned identity on in the prerequisites section.
+    > 
+    > If you encounter the error "Principal `VMName` has a duplicate display name", append the CREATE USER statement with WITH OBJECT_ID='xxx'.
 
     ```sql
     ALTER ROLE db_datareader ADD MEMBER [VMName]

articles/app-service/scripts/cli-continuous-deployment-vsts.md

@@ -35,11 +35,11 @@ This sample script creates an app in App Service with its related resources, and
 Create the following variables containing your GitHub information.
 
 ```azurecli
-gitrepo=<Replace with your Visual Studio Team Services repo URL>
-token=<Replace with a Visual Studio Team Services personal access token>
+gitrepo=<Replace with your Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) repo URL>
+token=<Replace with a Azure DevOps Services (formerly Visual Studio Team Services, or VSTS) personal access token>
 ```
 
-Configure continuous deployment from Visual Studio Team Services. The `--git-token` parameter is required only once per Azure account (Azure remembers token).
+Configure continuous deployment from Azure DevOps Services (formerly Visual Studio Team Services, or VSTS). The `--git-token` parameter is required only once per Azure account (Azure remembers token).
 
 ```azurecli
 az webapp deployment source config --name $webapp --resource-group $resourceGroup \

articles/azure-monitor/logs/daily-cap.md

@@ -86,7 +86,7 @@ Until September 18, 2023, the following is true. If a workspace enabled the [Mic
 To set or change the daily cap for a Log Analytics workspace in the Azure portal:  
 
 1. From the **Log Analytics workspaces** menu, select your workspace, and then **Usage and estimated costs**.
-2. Select **Data Cap** at the top of the page. 
+2. Select **Daily Cap** at the top of the page. 
 3. Select **ON** and then set the data volume limit in GB/day.
 
 :::image type="content" source="media/manage-cost-storage/set-daily-volume-cap-01.png" lightbox="media/manage-cost-storage/set-daily-volume-cap-01.png" alt-text="Log Analytics configure data limit":::

articles/batch/batch-automatic-scaling.md

@@ -59,7 +59,7 @@ $TargetDedicatedNodes=min(maxNumberofVMs, pendingTaskSamples);
 $NodeDeallocationOption = taskcompletion;
 ```
 > [!IMPORTANT]
-> Currently, Batch Service has limitaion with the resolution of the pending tasks. When a task is added to the job, it's also added into a internal queue used by Batch service for scheduling. If the task is deleted before it can be scheduled, the task might persist within the queue, causing it to still be counted in `$PendingTasks`. This deleted task will eventually be cleared from the queue when Batch gets chance to pull tasks from the queue to schedule with idle nodes in the Batch pool.
+> Currently, Batch Service has limitations with the resolution of the pending tasks. When a task is added to the job, it's also added into a internal queue used by Batch service for scheduling. If the task is deleted before it can be scheduled, the task might persist within the queue, causing it to still be counted in `$PendingTasks`. This deleted task will eventually be cleared from the queue when Batch gets chance to pull tasks from the queue to schedule with idle nodes in the Batch pool.
 
 #### Preempted nodes
 

articles/communication-services/concepts/numbers/phone-number-management-for-united-kingdom.md

@@ -21,7 +21,7 @@ Use the below tables to find all the relevant information on number availability
 
 | Number Type | Send SMS             | Receive SMS          | Make Calls           | Receive Calls          |
 | :---------- | :------------------- | :------------------- | :------------------- | :--------------------- |
-| Toll-Free   |General Availability  | General Availability | General Availability | General Availability\* |
+| Toll-Free   | -                    | -                    | General Availability | General Availability\* |
 | Local       | -                    | -                    | General Availability | General Availability\* |
 |Alphanumeric Sender ID\**|Public Preview|-|-|-|