Merge branch 'vikramlearning:main' into main

Author: mosBrkr

.github/workflows/azure-staticwebapp.yml

@@ -0,0 +1,70 @@
+# This workflow will build and push a web application to an Azure Static Web App when you change your code.
+#
+# This workflow assumes you have already created the target Azure Static Web App.
+# For instructions see https://docs.microsoft.com/azure/static-web-apps/get-started-portal?tabs=vanilla-javascript
+#
+# To configure this workflow:
+#
+# 1. Set up a secret in your repository named AZURE_STATIC_WEB_APPS_API_TOKEN with the value of your Static Web Apps deployment token.
+#    For instructions on obtaining the deployment token see: https://docs.microsoft.com/azure/static-web-apps/deployment-token-management
+#
+# 3. Change the values for the APP_LOCATION, API_LOCATION and APP_ARTIFACT_LOCATION, AZURE_STATIC_WEB_APPS_API_TOKEN environment variables (below).
+#    For instructions on setting up the appropriate configuration values go to https://docs.microsoft.com/azure/static-web-apps/front-end-frameworks
+name: Deploy web app to Azure Static Web Apps
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches: [ "main" ]
+
+# Environment variables available to all jobs and steps in this workflow
+env:
+  APP_LOCATION: "/" # location of your client code
+  API_LOCATION: "api" # location of your api source code - optional
+  APP_ARTIFACT_LOCATION: "build" # location of client code build output
+  AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing deployment token for your static web app
+
+permissions:
+  contents: read
+
+jobs:
+  build_and_deploy_job:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      pull-requests: write # for Azure/static-web-apps-deploy to comment on PRs
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: ${{ env.APP_LOCATION }}
+          api_location: ${{ env.API_LOCATION }}
+          app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }}
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    permissions:
+      contents: none
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
+          action: "close"

.github/workflows/static-web-app.yml

@@ -18,36 +18,54 @@ on:
 
 jobs:
   build_and_deploy_job:
-    if: ${{ inputs.prod_release }}  || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    # Run when:
+    # - workflow_dispatch AND prod_release == true
+    # - OR pull_request (except when closed)
+    if: >
+      (github.event_name == 'workflow_dispatch' && github.event.inputs.prod_release == 'true') ||
+      (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: true
 
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '10.0.x'
 
-      - name: Build And Deploy
+      - name: Install WASM workload
+        run: dotnet workload install wasm-tools --skip-manifest-update
+
+      - name: Restore
+        run: dotnet restore
+
+      - name: Publish app (produce static assets)
+        run: dotnet publish BlazorBootstrap.Demo.WebAssembly -c Release -o build
+
+      - name: Show published files (debug)
+        run: |
+          echo "repo root tree (top-level):"
+          ls -la .
+          echo "build folder tree:"
+          ls -la build || true
+          echo "build/wwwroot tree:"
+          ls -la build/wwwroot || true
+          echo "index.html exists?"
+          if [ -f build/wwwroot/index.html ]; then echo "FOUND"; else echo "MISSING"; fi
+
+      - name: Build And Deploy (upload artifacts; skip Oryx build)
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         with:
-          dotnet-version: '9.0.x'
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GRAY_WAVE_0E4848710 }}
-          skip_deploy_on_missing_secrets: true
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
           action: "upload"
-          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
-          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "BlazorBootstrap.Demo.WebAssembly" # App source code path
-          #api_location: "Api" # Api source code path - optional
-          #output_location: "build/wwwroot" # Built app content directory - optional
-          output_location: "wwwroot" # Built app content directory - optional
-          app_build_command: 'dotnet publish --configuration Release --output build'
-          ###### End of Repository/Build Configurations ######
+          app_location: "."                      # repository root
+          skip_app_build: true                   # we already produced the build on runner
+          app_artifact_location: "build/wwwroot" # <-- IMPORTANT: point to the published static files
 
   close_pull_request_job:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
@@ -59,5 +77,4 @@ jobs:
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GRAY_WAVE_0E4848710 }}
-          skip_deploy_on_missing_secrets: true
-          action: "close"
+          action: "close"

.github/workflows/web-app.yml

@@ -17,19 +17,18 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up .NET 9.0.x
-        uses: actions/setup-dotnet@v1
+      - name: Set up .NET 10.0.x
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '9.0.x'
-          include-prerelease: false
+          dotnet-version: '10.0.x'
 
       - name: Build
         run: dotnet build ./BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj --configuration Release
 
       - name: Publish
-        run: dotnet publish ./BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj -c Release -o ${{env.DOTNET_ROOT}}/myapp
+        run: dotnet publish ./BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj -c Release -o "${{env.DOTNET_ROOT}}/myapp"
 
       - name: Upload artifact for deployment job
         uses: actions/upload-artifact@v4