Resolve merge conflicts, keep branch docs

Author: Mike Swantek

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/python:3.10-bullseye
+
+# Remove Yarn repository to avoid GPG key expiration issue
+RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

@@ -1,11 +1,14 @@
 
   {
     "name": "Azure Developer CLI",
-    "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
     "features": {
         // See https://containers.dev/features for list of features
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/azure/azure-dev/azd:latest": {},
-        "ghcr.io/devcontainers/features/azure-cli:1": {}
+        "ghcr.io/devcontainers/features/azure-cli:1": {},
+        "ghcr.io/devcontainers/features/powershell:2.0.0": {}
     }
 }

.github/workflows/azd-template-validation.yml

@@ -17,18 +17,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # This postprovision cleanup step (Stage 19) has been removed from azure.yaml because
+      # azd down was failing in the pipeline. As a workaround, we are removing this step
+      # to ensure the pipeline runs successfully.
+      - name: Remove postprovision cleanup step from azure.yaml
+        run: |
+          yq -i 'del(.hooks.postprovision[] | select(.run == "./submodules/ai-landing-zone/bicep/scripts/postprovision.ps1"))' azure.yaml
+
       - uses: microsoft/template-validation-action@Latest
         with:
           validateAzd: ${{ vars.TEMPLATE_VALIDATE_AZD }}
           useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }}
         id: validation
         env:
-          AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          fabricCapacityMode: 'none'
       - name: print result
-        run: cat ${{ steps.validation.outputs.resultFile }}
+        run: cat ${{ steps.validation.outputs.resultFile }}

azure.yaml

@@ -1,7 +1,7 @@
 name: deploy-your-ai-application-in-production
 
 requiredVersions:
-  azd: ">=1.15.0"
+  azd: ">=1.15.0 != 1.23.9"
 
 infra:
   provider: "bicep"

infra/main.bicepparam

@@ -227,7 +227,7 @@ param vmSize = 'Standard_D2s_v3'
 // - Full setup: fabricCapacityPreset='create', fabricWorkspacePreset='create'
 // - No Fabric:  fabricCapacityPreset='none',   fabricWorkspacePreset='none'
 // - BYO both:   fabricCapacityPreset='byo',    fabricWorkspacePreset='byo'
-var fabricCapacityPreset = 'create'
+var fabricCapacityPreset = readEnvironmentVariable('fabricCapacityMode', 'create')
 var fabricWorkspacePreset = fabricCapacityPreset
 
 // Legacy toggle retained for back-compat with older docs/scripts
@@ -245,7 +245,8 @@ param fabricWorkspaceName = '' // optional (helpful for naming/UX)
 param fabricCapacitySku = 'F8'
 
 // Fabric capacity admin members (email addresses or object IDs).
-param fabricCapacityAdmins = []
+var fabricAdminValue = readEnvironmentVariable('fabricCapacityAdmins', '')
+param fabricCapacityAdmins = empty(fabricAdminValue) ? [] : split(fabricAdminValue, ',')
 
 // ========================================
 // PURVIEW PARAMETERS (Optional)