Fix: Add UTF-8 BOM and fix Blazor WASM deployment

davidnmbond · davidnmbond · commit 8b8936b4dcce · 2025-10-14T23:45:44.000+01:00
- Add UTF-8 BOM to markdown files with emojis

- Fix GitHub Pages deployment for _framework directory

- Fix base href for custom domain

- Remove unused monitor-certificate.ps1
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -1,4 +1,4 @@
-# SchemaMagic - Interactive Entity Framework Core Schema Visualizer
+﻿# SchemaMagic - Interactive Entity Framework Core Schema Visualizer
 
 ## Project Overview
 
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -161,7 +161,9 @@ jobs:
       id: nbgv
       run: |
         VERSION=$(nbgv get-version -v SimpleVersion)
+        FULL_VERSION=$(nbgv get-version -v SemVer2)
         echo "version=$VERSION" >> $GITHUB_OUTPUT
+        echo "fullVersion=$FULL_VERSION" >> $GITHUB_OUTPUT
         echo "[INFO] Web App Version: $VERSION"
         
     - name: Setup Pages
@@ -171,64 +173,36 @@ jobs:
       run: dotnet restore SchemaMagic.Web/SchemaMagic.Web.csproj
       
     - name: Publish
-      run: dotnet publish SchemaMagic.Web/SchemaMagic.Web.csproj --configuration Release --output dist/
+      run: dotnet publish SchemaMagic.Web/SchemaMagic.Web.csproj --configuration Release --output publish/
       
     - name: List published files
       run: |
         echo "[INFO] Listing published files..."
-        ls -la dist/
+        ls -la publish/
         echo "[INFO] Checking for wwwroot..."
-        if [ -d "dist/wwwroot" ]; then
+        if [ -d "publish/wwwroot" ]; then
           echo "[INFO] wwwroot exists, listing contents..."
-          ls -la dist/wwwroot/
-          echo "[INFO] Looking for index.html in wwwroot..."
-          find dist/wwwroot -name "index.html" -type f || echo "[INFO] No index.html found in wwwroot"
+          ls -la publish/wwwroot/ | head -20
+          echo "[INFO] Checking for _framework..."
+          ls -la publish/wwwroot/_framework/ | head -10 || echo "[INFO] No _framework in wwwroot"
         else
           echo "[INFO] No wwwroot directory found"
+          echo "[INFO] Checking for _framework in publish root..."
+          ls -la publish/_framework/ | head -10 || echo "[INFO] No _framework in publish root"
         fi
-        echo "[INFO] Searching for ALL index.html files in dist/..."
-        find dist/ -name "index.html" -type f || echo "[INFO] No index.html found anywhere in dist/"
-        echo "[INFO] Listing ALL files in dist/ recursively (first 50)..."
-        find dist/ -type f | head -50
+        echo "[INFO] Searching for index.html..."
+        find publish/ -name "index.html" -type f
       
-    - name: Fix base path for GitHub Pages
+    - name: Configure for GitHub Pages
       run: |
-        echo "[INFO] Configuring for GitHub Pages..."
+        echo "[INFO] Configuring for GitHub Pages with custom domain (schema.magicsuite.net)..."
         
-        # Check if index.html is in wwwroot subdirectory
-        if [ -f "dist/wwwroot/index.html" ]; then
-          echo "[INFO] Found index.html in dist/wwwroot/"
-          sed -i 's|<base href="/" />|<base href="/SchemaMagic/" />|g' dist/wwwroot/index.html
-          touch dist/wwwroot/.nojekyll
-          cp dist/wwwroot/index.html dist/wwwroot/404.html
-          echo "${{ steps.nbgv.outputs.version }}" > dist/wwwroot/version.txt
-        elif [ -f "dist/index.html" ]; then
-          echo "[INFO] Found index.html in dist/"
-          sed -i 's|<base href="/" />|<base href="/SchemaMagic/" />|g' dist/index.html
-          touch dist/.nojekyll
-          cp dist/index.html dist/404.html
-          echo "${{ steps.nbgv.outputs.version }}" > dist/version.txt
+        # Determine the correct directory structure
+        if [ -d "publish/wwwroot" ]; then
+          echo "[INFO] Found publish/wwwroot/ - using it as deployment root"
+          DEPLOY_DIR="publish/wwwroot"
         else
-          echo "[ERROR] Could not find index.html in dist/ or dist/wwwroot/"
-          exit 1
+          echo "[INFO] No wwwroot subdirectory - using publish/ as deployment root"
+          DEPLOY_DIR="publish"
         fi
-        
-        echo "[SUCCESS] GitHub Pages configuration complete"
-        echo "[INFO] Version: ${{ steps.nbgv.outputs.version }}"
-        
-    - name: Upload artifact
-      uses: actions/upload-pages-artifact@v3
-      with:
-        path: dist/wwwroot/
-
-    - name: Deploy to GitHub Pages
-      id: deployment
-      uses: actions/deploy-pages@v4
-      
-    - name: Deployment Summary
-      run: |
-        echo "### Deployment Successful!" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "**Version:** ${{ steps.nbgv.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-        echo "**URL:** ${{ steps.deployment.outputs.page_url }}" >> $GITHUB_STEP_SUMMARY
-        echo "**Deployed:** $(date -u +'%Y-%m-%d %H:%M:%S UTC')" >> $GITHUB_STEP_SUMMARY
+        
diff --git a/.github/workflows/deploy-web.yml b/.github/workflows/deploy-web.yml
@@ -60,54 +60,67 @@ jobs:
       run: dotnet restore SchemaMagic.Web/SchemaMagic.Web.csproj
       
     - name: Publish
-      run: dotnet publish SchemaMagic.Web/SchemaMagic.Web.csproj --configuration Release --output dist/
+      run: dotnet publish SchemaMagic.Web/SchemaMagic.Web.csproj --configuration Release --output publish/
       
     - name: List published files
       run: |
         echo "Listing published files for debugging..."
-        echo "Contents of dist/:"
-        ls -la dist/
+        echo "Contents of publish/:"
+        ls -la publish/
+        echo ""
+        echo "Contents of publish/wwwroot/:"
+        ls -la publish/wwwroot/ || echo "No wwwroot directory"
         echo ""
         echo "Searching for ALL index.html files:"
-        find dist/ -name "index.html" -type f || echo "No index.html found"
+        find publish/ -name "index.html" -type f || echo "No index.html found"
         echo ""
-        echo "First 50 files in dist/:"
-        find dist/ -type f | head -50
+        echo "Searching for _framework directory:"
+        find publish/ -type d -name "_framework" || echo "No _framework directory found"
       
     - name: Configure for GitHub Pages
       run: |
         echo "Configuring for GitHub Pages..."
         
-        # Base href is already "/" in index.html for custom domain (schema.magicsuite.net)
-        # No need to change it anymore since we're using a custom domain
+        # Determine the correct directory structure
+        if [ -d "publish/wwwroot" ]; then
+          echo "Found publish/wwwroot/ - using it as deployment root"
+          DEPLOY_DIR="publish/wwwroot"
+        else
+          echo "No wwwroot subdirectory - using publish/ as deployment root"
+          DEPLOY_DIR="publish"
+        fi
         
         # Add .nojekyll file to prevent GitHub Pages from processing as Jekyll site
-        touch dist/wwwroot/.nojekyll
+        touch ${DEPLOY_DIR}/.nojekyll
         
         # Copy 404.html for SPA routing
-        cp dist/wwwroot/index.html dist/wwwroot/404.html
+        cp ${DEPLOY_DIR}/index.html ${DEPLOY_DIR}/404.html
         
         # Ensure CNAME file is present for custom domain
         if [ -f "SchemaMagic.Web/wwwroot/CNAME" ]; then
-          cp SchemaMagic.Web/wwwroot/CNAME dist/wwwroot/CNAME
-          echo "CNAME file copied: $(cat dist/wwwroot/CNAME)"
+          cp SchemaMagic.Web/wwwroot/CNAME ${DEPLOY_DIR}/CNAME
+          echo "CNAME file copied: $(cat ${DEPLOY_DIR}/CNAME)"
         else
           echo "Warning: CNAME file not found"
         fi
         
         # Add version info file
-        echo "${{ steps.nbgv.outputs.fullVersion }}" > dist/wwwroot/version.txt
-        date -u +'%Y-%m-%d %H:%M:%S UTC' > dist/wwwroot/deployed.txt
+        echo "${{ steps.nbgv.outputs.fullVersion }}" > ${DEPLOY_DIR}/version.txt
+        date -u +'%Y-%m-%d %H:%M:%S UTC' > ${DEPLOY_DIR}/deployed.txt
         
         echo "Configuration complete"
         echo "Version: ${{ steps.nbgv.outputs.version }}"
-        echo "Build size: $(du -sh dist/wwwroot | cut -f1)"
+        echo "Build size: $(du -sh ${DEPLOY_DIR} | cut -f1)"
         echo "Custom domain: schema.magicsuite.net"
+        echo "Deployment directory: ${DEPLOY_DIR}"
+        
+        # Save deployment directory for next step
+        echo "DEPLOY_DIR=${DEPLOY_DIR}" >> $GITHUB_ENV
         
     - name: Upload artifact
       uses: actions/upload-pages-artifact@v3
       with:
-        path: dist/wwwroot/
+        path: ${{ env.DEPLOY_DIR }}
 
     - name: Deploy to GitHub Pages
       id: deployment
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog
+﻿# Changelog
 
 All notable changes to this project will be documented in this file.
 
diff --git a/PUBLISHING.md b/PUBLISHING.md
@@ -1,4 +1,4 @@
-# Publishing SchemaMagic to NuGet
+﻿# Publishing SchemaMagic to NuGet
 
 This guide explains how to publish SchemaMagic as a .NET Global Tool to NuGet.org and deploy the web application to GitHub Pages.
 
diff --git a/monitor-certificate.ps1 b/monitor-certificate.ps1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# SchemaMagic - Interactive Entity Framework Core Schema Visualizer`
	`1`	`+# SchemaMagic - Interactive Entity Framework Core Schema Visualizer`
`2`	`2`
`3`	`3`	`## Project Overview`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Changelog`
	`1`	`+# Changelog`
`2`	`2`
`3`	`3`	`All notable changes to this project will be documented in this file.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Publishing SchemaMagic to NuGet`
	`1`	`+# Publishing SchemaMagic to NuGet`
`2`	`2`
`3`	`3`	`This guide explains how to publish SchemaMagic as a .NET Global Tool to NuGet.org and deploy the web application to GitHub Pages.`
`4`	`4`