Merge pull request #262776 from dknappettmsft/avd-remote-app-streaming-consolidation

AVD RemoteApp streaming consolidation

Author: PMEds28

.openpublishing.redirection.virtual-desktop.json

@@ -304,6 +304,71 @@
             "source_path_from_root": "/articles/virtual-desktop/whats-new-client-web.md",
             "redirect_url": "/azure/virtual-desktop/users/remote-desktop-clients-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/index.yml",
+            "redirect_url": "/azure/virtual-desktop/index",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/overview.md",
+            "redirect_url": "/azure/virtual-desktop/overview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/architecture-recs.md",
+            "redirect_url": "/azure/virtual-desktop/organization-internal-external-commercial-purposes-recommendations",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/custom-apps.md",
+            "redirect_url": "/azure/virtual-desktop/publish-applications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/identities.md",
+            "redirect_url": "/azure/virtual-desktop/authentication",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/licensing.md",
+            "redirect_url": "/azure/virtual-desktop/licensing",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/msix-app-attach.md",
+            "redirect_url": "/azure/virtual-desktop/app-attach-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/per-user-access-pricing.md",
+            "redirect_url": "/azure/virtual-desktop/enroll-per-user-access-pricing",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/security-guide.md",
+            "redirect_url": "/azure/virtual-desktop/security-recommendations",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/security.md",
+            "redirect_url": "/azure/virtual-desktop/security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/total-costs.md",
+            "redirect_url": "/azure/virtual-desktop/understand-estimate-costs",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/streaming-costs.md",
+            "redirect_url": "/azure/virtual-desktop/understand-estimate-costs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
+            "redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
+            "redirect_document_id": false
         }
     ]
 }

articles/virtual-desktop/TOC.yml

@@ -10,8 +10,14 @@
     displayName: azure virtul desktop, avd, overview, what is
     href: terminology.md
   - name: Service architecture and resilience
-    displayName: architecture
+    displayName: recommendations
     href: service-architecture-resilience.md
+  - name: Understand and estimate costs
+    displayName: per-user access pricing, per user access pricing, CAL, licensing
+    href: understand-estimate-costs.md
+  - name: Licensing
+    displayName: per-user access pricing, per user access pricing, CAL, costs
+    href: licensing.md
   - name: Prerequisites
     displayName: overview, get started
     href: prerequisites.md
@@ -64,7 +70,7 @@
 - name: Tutorials
   expanded: true
   items:
-  - name: Deploy a Windows 11 desktop
+  - name: Deploy a sample Windows 11 desktop
     displayName: tutorial
     href: tutorial-try-deploy-windows-11-desktop.md
 - name: Concepts
@@ -120,6 +126,9 @@
       - name: Delegated access
         displayName: identity
         href: delegated-access-virtual-desktop.md
+      - name: Recommendations for internal and external commercial purposes
+        displayName: identity
+        href: organization-internal-external-commercial-purposes-recommendations.md
     - name: Azure Virtual Desktop Agent
       href: agent-overview.md
     - name: Host pool load balancing methods
@@ -194,8 +203,8 @@
             href: scaling-automation-logic-apps.md
     - name: Security
       items:
-      - name: Security best practices
-        href: security-guide.md
+      - name: Security recommendations
+        href: security-recommendations.md
       - name: Apply Zero Trust principles
         href: /security/zero-trust/azure-infrastructure-avd?context=/azure/virtual-desktop/context/context
       - name: Security baseline
@@ -277,9 +286,9 @@
             href: windows-11-language-packs.md
       - name: Applications
         items:
-        - name: Publish applications
-          displayName: deploy, get started, apps, sandbox, Microsoft Store
-          href: publish-applications.md
+        - name: Publish applications with RemoteApp
+          displayName: deploy, get started, apps, sandbox, Microsoft Store, RemoteApp, streaming
+          href: publish-applications-stream-remoteapp.md
         - name: App attach
           items:
           - name: Create an MSIX image
@@ -368,6 +377,8 @@
       href: cli-powershell.md
     - name: Move resources between regions
       href: move-resources.md
+    - name: Enroll in per-user access pricing
+      href: enroll-per-user-access-pricing.md
     - name: Host pools
       items:
       - name: Customize RDP properties
@@ -644,8 +655,13 @@
   items:
   - name: User experience estimator
     href: https://azure.microsoft.com/services/virtual-desktop/assessment/
-  - name: Pricing calculator
-    href: https://azure.microsoft.com/pricing/calculator/
+  - name: Pricing
+    items:
+    - name: Azure Virtual Desktop pricing
+      displayName: pricing, costs, per-user access pricing, per user access pricing, CAL
+      href: https://azure.microsoft.com/pricing/details/virtual-desktop/
+    - name: Pricing calculator
+      href: https://azure.microsoft.com/pricing/calculator/
   - name: Learning paths
     href: /training/browse/?expanded=azure&products=azure-virtual-desktop&resource_type=learning%20path
   - name: Framework and architectures

articles/virtual-desktop/deploy-azure-virtual-desktop.md

@@ -23,10 +23,11 @@ This article shows you how to deploy Azure Virtual Desktop on Azure or Azure Sta
 
 You can do all these tasks in a single process when using the Azure portal, but you can also do them separately.
 
-The process covered in this article is an in-depth and adaptable approach to deploying Azure Virtual Desktop. If you want a more simple approach to deploy a sample Windows 11 desktop in Azure Virtual Desktop, see [Tutorial: Deploy a sample Azure Virtual Desktop infrastructure with a Windows 11 desktop](tutorial-try-deploy-windows-11-desktop.md) or use the [getting started feature](getting-started-feature.md).
-
 For more information on the terminology used in this article, see [Azure Virtual Desktop terminology](environment-setup.md), and to learn about the service architecture and resilience of the Azure Virtual Desktop service, see [Azure Virtual Desktop service architecture and resilience](service-architecture-resilience.md).
 
+> [!TIP]
+> The process covered in this article is an in-depth and adaptable approach to deploying Azure Virtual Desktop. If you want to try Azure Virtual Desktop with a more simple approach to deploy a sample Windows 11 desktop in Azure Virtual Desktop, see [Tutorial: Deploy a sample Azure Virtual Desktop infrastructure with a Windows 11 desktop](tutorial-try-deploy-windows-11-desktop.md) or use the [getting started feature](getting-started-feature.md).
+
 ## Prerequisites
 
 Review the [Prerequisites for Azure Virtual Desktop](prerequisites.md) for a general idea of what's required and supported, such as operating systems (OS), virtual networks, and identity providers. It also includes a list of the [supported Azure regions](prerequisites.md#azure-regions) in which you can deploy host pools, workspaces, and application groups. This list of regions is where the *metadata* for the host pool can be stored. However, session hosts can be located in any Azure region, and on-premises with [Azure Stack HCI (preview)](azure-stack-hci-overview.md). For more information about the types of data and locations, see [Data locations for Azure Virtual Desktop](data-locations.md).

articles/virtual-desktop/enroll-per-user-access-pricing.md

@@ -0,0 +1,58 @@
+---
+title: Enroll in per-user access pricing for Azure Virtual Desktop
+description: Learn how to enroll your Azure subscription for per-user access pricing for Azure Virtual Desktop.
+ms.topic: how-to
+author: dknappettmsft
+ms.author: daknappe
+ms.date: 01/08/2024
+---
+
+# Enroll in per-user access pricing for Azure Virtual Desktop
+
+Per-user access pricing lets you pay for Azure Virtual Desktop access rights on behalf of external users. External users aren't members of your organization, such as customers of a business. To learn more about licensing options, see [Licensing Azure Virtual Desktop](licensing.md).
+
+Before external users can connect to your deployment, you need to enroll your Azure subscriptions that you use for Azure Virtual Desktop in per-user access pricing. Your enrolled subscription is charged each month based on the number of distinct users that connect to Azure Virtual Desktop resources.
+
+> [!IMPORTANT]
+> Per-user access pricing with Azure Virtual Desktop doesn't currently support Citrix DaaS and VMware Horizon Cloud.
+
+## How to enroll an Azure subscription
+
+To enroll your Azure subscription into per-user access pricing:
+
+1. Sign in to the [Azure portal](https://portal.azure.com/).
+
+1. In the search bar, type **Azure Virtual Desktop** and select the matching service entry.
+
+1. In the **Azure Virtual Desktop** overview page, select **Per-user access pricing**.
+
+1. In the list of subscriptions, check the box for the subscription where you deploy Azure Virtual Desktop resources for external users.
+
+1. Select **Enroll**.
+
+1. Review the Product Terms, then select **Enroll** to begin enrollment. It might take up to an hour for the enrollment process to finish. The **Per-user access pricing** column of the subscriptions list shows **Enrolling** while the enrollment process is running.
+
+1. After enrollment completes, check the value in the **Per-user access pricing** column of the subscriptions list changes to **Enrolled**.
+
+## How to unenroll an Azure subscription 
+
+To enroll your Azure subscription from per-user access pricing:
+
+1. Sign in to the [Azure portal](https://portal.azure.com/).
+
+1. In the search bar, type **Azure Virtual Desktop** and select the matching service entry.
+
+1. In the **Azure Virtual Desktop** overview page, select **Per-user access pricing**.
+
+1. In the list of subscriptions, check the box for the subscription you want to unenroll from per-user access pricing.
+
+1. Select **Unenroll**.
+
+1. Review the unenrollment message, then select **Unenroll** to begin unenrollment. It might take up to an hour for the unenrollment process to finish. The **Per-user access pricing** column of the subscriptions list shows **Unenrolling** while the unenrollment process is running.
+
+1. After unenrollment completes, check the value in the **Per-user access pricing** column of the subscriptions list changes to **Not enrolled**.
+
+## Next steps
+
+- To learn more about per-user access pricing, see [Licensing Azure Virtual Desktop](licensing.md).
+- For estimating total deployment costs, see [Understand and estimate costs for Azure Virtual Desktop](understand-estimate-costs.md).

articles/virtual-desktop/includes/include-operating-systems-user-access-rights.md

@@ -0,0 +1,11 @@
+---
+author: dknappettmsft
+ms.author: daknappe
+ms.topic: include
+ms.date: 01/08/2024
+---
+
+| Operating system | User access rights |
+|--|--|
+| <ul><li>[Windows 11 Enterprise multi-session](/lifecycle/products/windows-11-enterprise-and-education)</li><li>[Windows 11 Enterprise](/lifecycle/products/windows-11-enterprise-and-education)</li><li>[Windows 10 Enterprise multi-session](/lifecycle/products/windows-10-enterprise-and-education)</li><li>[Windows 10 Enterprise](/lifecycle/products/windows-10-enterprise-and-education)</li><ul> | License entitlement:<ul><li>Microsoft 365 E3, E5, A3, A5, F3, Business Premium, Student Use Benefit</li><li>Windows Enterprise E3, E5</li><li>Windows Education A3, A5</li><li>Windows VDA per user</li></ul>External users can use per-user access pricing by enrolling an Azure subscription instead of license entitlement.</li></ul> |
+| <ul><li>[Windows Server 2022](/lifecycle/products/windows-server-2022)</li><li>[Windows Server 2019](/lifecycle/products/windows-server-2019)</li><li>[Windows Server 2016](/lifecycle/products/windows-server-2016)</li></ul> | License entitlement:<ul><li>Remote Desktop Services (RDS) Client Access License (CAL) with Software Assurance (per-user or per-device), or RDS User Subscription Licenses.</li></ul>Per-user access pricing isn't available for Windows Server operating systems. |

articles/virtual-desktop/index.yml

@@ -5,7 +5,7 @@ summary: Securely deliver virtual desktops and applications remotely with maximu
 
 metadata:
   title: Azure Virtual Desktop documentation
-  description: Azure Virtual Desktop securely delivers virtual desktops and applications remotely and provide users with the only multi-session Windows 11 and Windows 10 experience.
+  description: Azure Virtual Desktop securely delivers virtual desktops and applications remotely and provides users with the only multi-session Windows 11 and Windows 10 experience.
   ms.service: virtual-desktop
   services: virtual-desktop
   ms.topic: landing-page
@@ -107,14 +107,6 @@ landingContent:
           - text: REST API
             url: /rest/api/desktopvirtualization/
 
-  # Card
-  - title: RemoteApp streaming with Azure Virtual Desktop
-    linkLists:
-      - linkListType: overview
-        links:
-          - text: Stream apps to your customers
-            url: ./remote-app-streaming/overview.md
-
   # Card
   - title: Azure Virtual Desktop (classic) documentation
     linkLists: