From a61b226eaae3a99f09c8791893e79b6d7d151605 Mon Sep 17 00:00:00 2001
From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:41:55 -0600
Subject: [PATCH 1/4] Update portal-ui-baseline.json

---
 workload/portal-ui/portal-ui-baseline.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index b0e1ac6bc..db657ef72 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -605,7 +605,10 @@
                                         "publisher": "MicrosoftWindowsDesktop",
                                         "offer": "Windows-11",
                                         "sku": "21h2-avd"
-                                    }
+                                    },
+                                    "scope": {
+                                        "location": "[steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion]"
+                                    }                              
                                 },
                                 {
                                     "name": "sessionHostSizeInfobox",

From 1e1130c73b842ccb584be8025a5ae03ba41dd685 Mon Sep 17 00:00:00 2001
From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:56:55 -0600
Subject: [PATCH 2/4] Update portal-ui-baseline.json

---
 workload/portal-ui/portal-ui-baseline.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index db657ef72..7467164ac 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -607,7 +607,8 @@
                                         "sku": "21h2-avd"
                                     },
                                     "scope": {
-                                        "location": "[steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion]"
+                                        "location": "[steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion]",
+                                        "subscriptionId": "[steps('basics').resourceScope.subscription.id]"
                                     }                              
                                 },
                                 {

From 8c50669da13a2f064c0ed9535514bbf2f5c9f427 Mon Sep 17 00:00:00 2001
From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com>
Date: Tue, 12 Dec 2023 14:36:23 -0600
Subject: [PATCH 3/4] Update portal-ui-baseline.json

---
 workload/portal-ui/portal-ui-baseline.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index 7467164ac..45d81f0b8 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "<relative path to createFormUI.schema.json>",
+    "$schema": "https://schema.management.azure.com/schemas/2021-09-09/uiFormDefinition.schema.json",
     "view": {
         "kind": "Form",
         "properties": {

From 1ca572fb413085b94ecaef1d6c0be9199bd47b16 Mon Sep 17 00:00:00 2001
From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:29:16 -0600
Subject: [PATCH 4/4] Update portal-ui-baseline.json

---
 workload/portal-ui/portal-ui-baseline.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index 45d81f0b8..6d5909b3b 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2021-09-09/uiFormDefinition.schema.json",
+    "$schema": "<relative path to createFormUI.schema.json>",
     "view": {
         "kind": "Form",
         "properties": {
@@ -608,7 +608,7 @@
                                     },
                                     "scope": {
                                         "location": "[steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion]",
-                                        "subscriptionId": "[steps('basics').resourceScope.subscription.id]"
+                                        "subscriptionId": "[steps('basics').resourceScope.subscription.subscriptionId]"
                                     }                              
                                 },
                                 {