Merge branch 'main' into joe/nexus-npb

Author: joemarshallmsft

.openpublishing.redirection.app-service.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/app-service/security-recommendations.md",
+            "redirect_url": "/security/benchmark/azure/baselines/app-service-security-baseline",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/app-service/scenario-secure-app-authentication-app-service-as-user.md",
             "redirect_url": "/azure/app-service/scenario-secure-app-authentication-app-service",

.openpublishing.redirection.azure-monitor.json

@@ -1807,7 +1807,7 @@
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/resource-group-insights.md",
-            "redirect_url": "/azure/azure-monitor/insights/resource-group-insights",
+            "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
             "redirect_document_id": true
         },
         {
@@ -6608,6 +6608,11 @@
             "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
             "redirect_url": "/azure/azure-monitor/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
+            "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -2290,6 +2290,31 @@
             "redirect_url": "/azure/automation/automation-solution-vm-management",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/automation/automation-solution-vm-management.md",
+            "redirect_url":"/azure/azure-functions/start-stop-vms/overview",
+            "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-config.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-logs.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/automation-solution-vm-management-remove.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/remove",
+             "redirect_document_id": false
+        },
+        {
+             "source_path_from_root": "/articles/automation/troubleshoot/start-stop-vm.md",
+             "redirect_url": "/azure/azure-functions/start-stop-vms/troubleshoot",
+             "redirect_document_id": false
+        },       
         {
             "source_path_from_root": "/articles/update-center/enable-machines.md",
             "redirect_url": "/azure/update-center/updates-maintenance-schedules",

.openpublishing.redirection.sentinel.json

@@ -1054,6 +1054,21 @@
             "source_path_from_root": "/articles/sentinel/process-events-normalization-schema.md",
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse-export-data.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/notebooks-with-synapse-hunt.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.virtual-desktop.json

@@ -63,7 +63,7 @@
         {
             "source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-windows-7-10.md",
             "redirect_url": "/azure/virtual-desktop/users/connect-windows",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/virtual-desktop/user-documentation/index.yml",
@@ -374,6 +374,36 @@
             "source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
             "redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/connect-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/users/connect-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/connect-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/users/connect-windows",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/client-features-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/users/client-features-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/users/client-features-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/users/client-features-windows",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/whats-new-client-windows-azure-virtual-desktop-app.md",
+            "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/whats-new-client-microsoft-store.md",
+            "redirect_url": "/azure/virtual-desktop/whats-new-client-windows",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/find-help-open-support-ticket.md

@@ -41,7 +41,7 @@ If you're unable to find answers by using self-help resources, you can open an o
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 
-1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
+1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra tenant from the **Directories + subscriptions** menu. Currently, you can't submit support cases directly from your Azure AD B2C tenant.
 
 1. In the Azure portal, search for and select **Microsoft Entra ID**.
 

articles/active-directory-b2c/manage-custom-policies-powershell.md

@@ -1,26 +1,26 @@
 ---
-title: Manage custom policies with PowerShell
+title: Manage custom policies with Microsoft Graph PowerShell
 titleSuffix: Azure AD B2C
-description: Use the Azure Active Directory (Azure AD) PowerShell cmdlet for programmatic management of your Azure AD B2C custom policies. Create, read, update, and delete custom policies with PowerShell.
+description: Use the Microsoft Graph PowerShell cmdlets for programmatic management of your Azure AD B2C custom policies. Create, read, update, and delete custom policies with PowerShell.
 author: kengaderdus
 manager: CelesteDG
 
 ms.service: active-directory
 
-ms.custom: devx-track-azurepowershell, has-azure-ad-ps-ref
+ms.custom: devx-track-azurepowershell, has-azure-ad-ps-ref, azure-ad-ref-level-one-done
 ms.topic: how-to
 ms.date: 01/11/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 
 
-#Customer intent: As an Azure AD B2C administrator, I want to manage custom policies using Azure PowerShell, so that I can review, update, and delete policies in my Azure AD B2C tenant.
+#Customer intent: As an Azure AD B2C administrator, I want to manage custom policies using Microsoft Graph PowerShell, so that I can review, update, and delete policies in my Azure AD B2C tenant.
 
 ---
 
-# Manage Azure AD B2C custom policies with Azure PowerShell
+# Manage Azure AD B2C custom policies with Microsoft Graph PowerShell
 
-Azure PowerShell provides several cmdlets for command line- and script-based custom policy management in your Azure AD B2C tenant. Learn how to use the Azure AD PowerShell module to:
+Microsoft Graph PowerShell provides several cmdlets for command line- and script-based custom policy management in your Azure AD B2C tenant. Learn how to use the Azure AD PowerShell module to:
 
 * List the custom policies in an Azure AD B2C tenant
 * Download a policy from a tenant
@@ -32,41 +32,42 @@ Azure PowerShell provides several cmdlets for command line- and script-based cus
 
 * [Azure AD B2C tenant](tutorial-create-tenant.md), and credentials for a user in the directory with the [B2C IEF Policy Administrator](../active-directory/roles/permissions-reference.md#b2c-ief-policy-administrator) role
 * [Custom policies](tutorial-create-user-flows.md?pivots=b2c-custom-policy) uploaded to your tenant
-* [Azure AD PowerShell for Graph **preview module**](/powershell/azure/active-directory/install-adv2)
+* [Microsoft Graph PowerShell SDK beta module](/powershell/microsoftgraph/installation#installation)
 
 ## Connect PowerShell session to B2C tenant
 
-To work with custom policies in your Azure AD B2C tenant, you first need to connect your PowerShell session to the tenant by using the [Connect-AzureAD][Connect-AzureAD] command.
+To work with custom policies in your Azure AD B2C tenant, you first need to connect your PowerShell session to the tenant by using the [Connect-MgGraph][Connect-MgGraph] command.
 
-Execute the following command, substituting `{b2c-tenant-name}` with the name of your Azure AD B2C tenant. Sign in with an account that's assigned the [B2C IEF Policy Administrator](../active-directory/roles/permissions-reference.md#b2c-ief-policy-administrator) role in the directory.
+Execute the following command. Sign in with an account that's assigned the [B2C IEF Policy Administrator](/entra/identity/role-based-access-control/permissions-reference#b2c-ief-policy-administrator) role in the directory.
 
 ```PowerShell
-Connect-AzureAD -Tenant "{b2c-tenant-name}.onmicrosoft.com"
+Connect-MgGraph -TenantId "{b2c-tenant-name}.onmicrosoft.com" -Scopes "Policy.ReadWrite.TrustFramework"
 ```
 
 Example command output showing a successful sign-in:
 
-```Console
-PS C:\> Connect-AzureAD -Tenant "contosob2c.onmicrosoft.com"
+```output
+Welcome to Microsoft Graph!
 
-Account               Environment TenantId                             TenantDomain                 AccountType
--------               ----------- --------                             ------------                 -----------
-[email protected] AzureCloud  00000000-0000-0000-0000-000000000000 contosob2c.onmicrosoft.com   User
+Connected via delegated access using 64636d5d-8eb5-42c9-b9eb-f53754c5571f
+Readme: https://aka.ms/graph/sdk/powershell
+SDK Docs: https://aka.ms/graph/sdk/powershell/docs
+API Docs: https://aka.ms/graph/docs
+
+NOTE: You can use the -NoWelcome parameter to suppress this message.
 ```
 
 ## List all custom policies in the tenant
 
-Discovering custom policies allows an Azure AD B2C administrator to review, manage, and add business logic to their operations. Use the [Get-AzureADMSTrustFrameworkPolicy][Get-AzureADMSTrustFrameworkPolicy] command to return a list of the IDs of the custom policies in an Azure AD B2C tenant.
+Discovering custom policies allows an Azure AD B2C administrator to review, manage, and add business logic to their operations. Use the [Get-MgBetaTrustFrameworkPolicy][Get-MgBetaTrustFrameworkPolicy] command to return a list of the IDs of the custom policies in an Azure AD B2C tenant.
 
 ```PowerShell
-Get-AzureADMSTrustFrameworkPolicy
+Get-MgBetaTrustFrameworkPolicy
 ```
 
 Example command output:
 
-```Console
-PS C:\> Get-AzureADMSTrustFrameworkPolicy
-
+```output
 Id
 --
 B2C_1A_TrustFrameworkBase
@@ -78,16 +79,15 @@ B2C_1A_PasswordReset
 
 ## Download a policy
 
-After reviewing the list of policy IDs, you can target a specific policy with [Get-AzureADMSTrustFrameworkPolicy][Get-AzureADMSTrustFrameworkPolicy] to download its content.
+After reviewing the list of policy IDs, you can target a specific policy with [Get-MgBetaTrustFrameworkPolicy][Get-MgBetaTrustFrameworkPolicy] to download its content.
 
 ```PowerShell
-Get-AzureADMSTrustFrameworkPolicy [-Id <policyId>]
+Get-MgBetaTrustFrameworkPolicy [-TrustFrameworkPolicyId <policyId>]
 ```
 
 In this example, the policy with ID *B2C_1A_signup_signin* is downloaded:
 
-```Console
-PS C:\> Get-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin
+```output
 <TrustFrameworkPolicy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06" PolicySchemaVersion="0.3.0.0" TenantId="contosob2c.onmicrosoft.com" PolicyId="B2C_1A_signup_signin" PublicPolicyUri="http://contosob2c.onmicrosoft.com/B2C_1A_signup_signin" TenantObjectId="00000000-0000-0000-0000-000000000000">
   <BasePolicy>
     <TenantId>contosob2c.onmicrosoft.com</TenantId>
@@ -113,94 +113,72 @@ PS C:\> Get-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin
 </TrustFrameworkPolicy>
 ```
 
-To edit the policy content locally, pipe the command output to a file with the `-OutputFilePath` argument, and then open the file in your favorite editor.
-
-Example command sending output to a file:
-
-```PowerShell
-# Download and send policy output to a file
-Get-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin -OutputFilePath C:\RPPolicy.xml
-```
+To edit the policy content locally, pipe the command output to a file, and then open the file in your favorite editor.
 
 ## Update an existing policy
 
-After editing a policy file you've created or downloaded, you can publish the updated policy to Azure AD B2C by using the [Set-AzureADMSTrustFrameworkPolicy][Set-AzureADMSTrustFrameworkPolicy] command.
+After editing a policy file you've created or downloaded, you can publish the updated policy to Azure AD B2C by using the [Update-MgBetaTrustFrameworkPolicy][Update-MgBetaTrustFrameworkPolicy] command.
 
-If you issue the `Set-AzureADMSTrustFrameworkPolicy` command with the ID of a policy that already exists in your Azure AD B2C tenant, the content of that policy is overwritten.
+If you issue the `Update-MgBetaTrustFrameworkPolicy` command with the ID of a policy that already exists in your Azure AD B2C tenant, the content of that policy is overwritten.
 
 ```PowerShell
-Set-AzureADMSTrustFrameworkPolicy [-Id <policyId>] -InputFilePath <inputpolicyfilePath> [-OutputFilePath <outputFilePath>]
+Update-MgBetaTrustFrameworkPolicy -TrustFrameworkPolicyId <policyId> -BodyParameter @{trustFrameworkPolicy = "<policy file path>"}
 ```
 
 Example command:
 
 ```PowerShell
 # Update an existing policy from file
-Set-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin -InputFilePath C:\B2C_1A_signup_signin.xml
+Update-MgBetaTrustFrameworkPolicy -TrustFrameworkPolicyId B2C_1A_signup_signin -BodyParameter @{trustFrameworkPolicy = C:\B2C_1A_signup_signin.xml}
 ```
 
-For additional examples, see the [Set-AzureADMSTrustFrameworkPolicy][Set-AzureADMSTrustFrameworkPolicy] command reference.
-
 ## Upload a new policy
 
 When you make a change to a custom policy that's running in production, you might want to publish multiple versions of the policy for fallback or A/B testing scenarios. Or, you might want to make a copy of an existing policy, modify it with a few small changes, then upload it as a new policy for use by a different application.
 
-Use the [New-AzureADMSTrustFrameworkPolicy][New-AzureADMSTrustFrameworkPolicy] command to upload a new policy:
+Use the [New-MgBetaTrustFrameworkPolicy][New-MgBetaTrustFrameworkPolicy] command to upload a new policy:
 
 ```PowerShell
-New-AzureADMSTrustFrameworkPolicy -InputFilePath <inputpolicyfilePath> [-OutputFilePath <outputFilePath>]
+New-MgBetaTrustFrameworkPolicy -BodyParameter @{trustFrameworkPolicy = "<policy file path>"}
 ```
 
 Example command:
 
 ```PowerShell
 # Add new policy from file
-New-AzureADMSTrustFrameworkPolicy -InputFilePath C:\SignUpOrSignInv2.xml
+New-MgBetaTrustFrameworkPolicy -BodyParameter @{trustFrameworkPolicy = C:\B2C_1A_signup_signin.xml }
 ```
 
 ## Delete a custom policy
 
 To maintain a clean operations life cycle, we recommend that you periodically remove unused custom policies. For example, you might want to remove old policy versions after performing a migration to a new set of policies and verifying the new policies' functionality. Additionally, if you attempt to publish a set of custom policies and receive an error, it might make sense to remove the policies that were created as part of the failed release.
 
-Use the [Remove-AzureADMSTrustFrameworkPolicy][Remove-AzureADMSTrustFrameworkPolicy] command to delete a policy from your tenant.
+Use the [Remove-MgBetaTrustFrameworkPolicy][Remove-MgBetaTrustFrameworkPolicy] command to delete a policy from your tenant.
 
 ```PowerShell
-Remove-AzureADMSTrustFrameworkPolicy -Id <policyId>
+Remove-MgBetaTrustFrameworkPolicy -TrustFrameworkPolicyId <policyId>
 ```
 
 Example command:
 
 ```PowerShell
 # Delete an existing policy
-Remove-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin
+Remove-MgBetaTrustFrameworkPolicy -TrustFrameworkPolicyId B2C_1A_signup_signin
 ```
 
 ## Troubleshoot policy upload
 
 When you try to publish a new custom policy or update an existing policy, improper XML formatting and errors in the policy file inheritance chain can cause validation failures.
 
-For example, here's an attempt at updating a policy with content that contains malformed XML (output is truncated for brevity):
-
-```Console
-PS C:\> Set-AzureADMSTrustFrameworkPolicy -Id B2C_1A_signup_signin -InputFilePath C:\B2C_1A_signup_signin.xml
-Set-AzureADMSTrustFrameworkPolicy : Error occurred while executing PutTrustFrameworkPolicy
-Code: AADB2C
-Message: Validation failed: 1 validation error(s) found in policy "B2C_1A_SIGNUP_SIGNIN" of tenant "contosob2c.onmicrosoft.com".Schema validation error found at line
-14 col 55 in policy "B2C_1A_SIGNUP_SIGNIN" of tenant "contosob2c.onmicrosoft.com": The element 'OutputClaims' in namespace
-'http://schemas.microsoft.com/online/cpim/schemas/2013/06' cannot contain text. List of possible elements expected: 'OutputClaim' in namespace
-'http://schemas.microsoft.com/online/cpim/schemas/2013/06'.
-...
-```
-
 For information about troubleshooting custom policies, see [Troubleshoot Azure AD B2C custom policies and Identity Experience Framework](./troubleshoot.md).
 
 ## Next steps
 
 For information about using PowerShell to deploy custom policies as part of a continuous integration/continuous delivery (CI/CD) pipeline, see [Deploy custom policies from an Azure DevOps pipeline](deploy-custom-policies-devops.md).
 
 <!-- LINKS - External -->
-[Connect-AzureAD]: /powershell/module/azuread/get-azureadmstrustframeworkpolicy
-[Get-AzureADMSTrustFrameworkPolicy]: /powershell/module/azuread/get-azureadmstrustframeworkpolicy
-[New-AzureADMSTrustFrameworkPolicy]: /powershell/module/azuread/new-azureadmstrustframeworkpolicy
-[Remove-AzureADMSTrustFrameworkPolicy]: /powershell/module/azuread/remove-azureadmstrustframeworkpolicy
-[Set-AzureADMSTrustFrameworkPolicy]: /powershell/module/azuread/set-azureadmstrustframeworkpolicy
+[Connect-MgGraph]: /powershell/microsoftgraph/authentication-commands#using-connect-mggraph
+[Get-MgBetaTrustFrameworkPolicy]: /powershell/module/microsoft.graph.beta.identity.signins/get-mgbetatrustframeworkpolicy?view
+[New-MgBetaTrustFrameworkPolicy]: /powershell/module/microsoft.graph.beta.identity.signins/new-mgbetatrustframeworkpolicy
+[Remove-MgBetaTrustFrameworkPolicy]: /powershell/module/microsoft.graph.beta.identity.signins/remove-mgbetatrustframeworkpolicy
+[Update-MgBetaTrustFrameworkPolicy]: /powershell/module/microsoft.graph.beta.identity.signins/update-mgbetatrustframeworkpolicy