Avalonia UI

.github/workflows/dotnet-avalonia-app-publish-to-gh-pages-beta.yml

@@ -0,0 +1,83 @@
+name: Publish Test Avalonia browser app to GitHub Pages (separate url)
+
+on:
+#  push:
+#    branches:
+#      - master
+  workflow_dispatch:
+
+  #Trigger when tag is created
+#  push:
+#    tags:
+#        - 'v*.*.*'
+
+env:
+   CONFIGURATION: "Release"
+
+   PROJECT_FILE: "src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Browser/Highbyte.DotNet6502.App.Avalonia.Browser.csproj"
+   PROJECT_GH_PAGES_DIR: "app2-test"
+   BUILD_OUTPUT_WORKING_DIR: "build"
+   GH_PAGES_WORKING_DIR: "ghpages"
+   GH_PAGES_BRANCH_NAME: "gh-pages"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the code
+      - uses: actions/checkout@v4
+
+      # Generate auto-incrementing version number for test builds
+      - name: Generate version number
+        run: echo "VERSION=0.1.${{ github.run_number }}-test" >> $GITHUB_ENV
+
+      # Get version from tag
+      # - name: Get version from tag with 'v' prefix
+      #   run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+
+      # Install .NET Core SDK
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Install DotNet workload - WASM tools
+        run: |
+          dotnet workload install wasm-tools
+
+      # Create GitHub Pages root folder contents
+      - name: Create GH root folder and add .nojekyll file do disable built-in Jekyll CMS
+        run: |
+          mkdir ${{ env.GH_PAGES_WORKING_DIR }}
+          echo '' > ${{ env.GH_PAGES_WORKING_DIR }}/.nojekyll
+
+      # Publish the static website to a build working folder
+      - name: Publish
+        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work with Blazor. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
+        run: dotnet publish ${{ env.PROJECT_FILE }} -p:Version=${{ env.VERSION }} -c:${{ env.CONFIGURATION }} -p:GHPages=true -p:GHPagesBase="/${{ github.event.repository.name }}/${{ env.PROJECT_GH_PAGES_DIR }}/" -p:GHPagesInjectBrotliLoader=false -o:${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}
+
+      # Replace version placeholders in HTML files
+      - name: Replace version placeholders
+        run: |
+          find ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot -name "*.html" -exec sed -i 's/{{APP_VERSION}}/${{ env.VERSION }}/g' {} \;
+          find ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot -name "*.js" -exec sed -i 's/{{APP_VERSION}}/${{ env.VERSION }}/g' {} \;
+
+      # Copy the published static website from wwwroot folder in publish output dir
+      - name: Copy published wwwroot contents to a subdirectory in GH pages working dir root
+        run: |
+          cp -r ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot/ ${{ env.GH_PAGES_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/
+
+      # Deploy the static website to GitHub Pages
+      - name: Deploy to Github Pages
+        uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23
+        with:
+          # token: ${{ secrets.ACCESS_TOKEN }} # Use if custom token needed to another repo
+          branch: ${{ env.GH_PAGES_BRANCH_NAME }}  # The branch the action should deploy to.
+          folder: ${{ env.GH_PAGES_WORKING_DIR }} # The folder the action should deploy.
+          #target-folder: app #If not specified, the contents for folder above is copied to the root of the GH pages branch.
+          single-commit: true
+          clean: false
+          clean-exclude: |  # If clean: true, keep the live app folder in the gh-pages branch (where non lab/test builds are deployed to)
+            app/**/*
+            app-test/**/*
+            app2/**/*

.github/workflows/dotnet-avalonia-app-publish-to-gh-pages.yml

@@ -0,0 +1,78 @@
+name: Publish Avalonia browser app to GitHub Pages (separate url)
+
+on:
+#  push:
+#    branches:
+#      - master
+  workflow_dispatch:
+
+  #Trigger when tag is created
+  push:
+    tags:
+        - 'v*.*.*'
+
+env:
+   CONFIGURATION: "Release"
+
+   PROJECT_FILE: "src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Browser/Highbyte.DotNet6502.App.Avalonia.Browser.csproj"
+   PROJECT_GH_PAGES_DIR: "app2"
+   BUILD_OUTPUT_WORKING_DIR: "build"
+   GH_PAGES_WORKING_DIR: "ghpages"
+   GH_PAGES_BRANCH_NAME: "gh-pages" 
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the code
+      - uses: actions/checkout@v4
+
+      # Get version from tag or set fallback version for manual dispatch
+      - name: Set version from tag or fallback
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            echo "VERSION=0.1.${{ github.run_number }}-test" >> $GITHUB_ENV
+          fi
+
+      # Install .NET Core SDK
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Install DotNet workload - WASM tools
+        run: |
+          dotnet workload install wasm-tools
+
+      # Create GitHub Pages root folder contents
+      - name: Create GH root folder and add .nojekyll file do disable built-in Jekyll CMS
+        run: |
+          mkdir ${{ env.GH_PAGES_WORKING_DIR }}
+          echo '' > ${{ env.GH_PAGES_WORKING_DIR }}/.nojekyll
+
+      # Publish the static website to a build working folder
+      - name: Publish
+        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work with Blazor. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
+        run: dotnet publish ${{ env.PROJECT_FILE }} -p:Version=${{ env.VERSION }} -c:${{ env.CONFIGURATION }} -p:GHPages=true -p:GHPagesBase="/${{ github.event.repository.name }}/${{ env.PROJECT_GH_PAGES_DIR }}/" -p:GHPagesInjectBrotliLoader=false -o:${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}
+
+      # Copy the published static website from wwwroot folder in publish output dir
+      - name: Copy published wwwroot contents to a subdirectory in GH pages working dir root
+        run: |
+          cp -r ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot/ ${{ env.GH_PAGES_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/
+
+      # Deploy the static website to GitHub Pages
+      - name: Deploy to Github Pages
+        uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23
+        with:
+          # token: ${{ secrets.ACCESS_TOKEN }} # Use if custom token needed to another repo
+          branch: ${{ env.GH_PAGES_BRANCH_NAME }}  # The branch the action should deploy to.
+          folder: ${{ env.GH_PAGES_WORKING_DIR }} # The folder the action should deploy.
+          #target-folder: app #If not specified, the contents for folder above is copied to the root of the GH pages branch.
+          single-commit: true
+          clean: false
+          clean-exclude: |  # If clean: true, keep the live app folder in the gh-pages branch (where non lab/test builds are deployed to)
+            app/**/*
+            app-test/**/*
+            app2-test/**/*

.github/workflows/dotnet-blazor-app-publish-to-gh-pages-beta.yml

@@ -1,4 +1,4 @@
-name: Publish Test .NET Blazor WASM app to GitHub Pages (separate url)
+name: Publish Test Browser app to GitHub Pages (separate url)
 
 on:
 #  push:
@@ -20,15 +20,17 @@ env:
    GH_PAGES_WORKING_DIR: "ghpages"
    GH_PAGES_BRANCH_NAME: "gh-pages"
 
-   VERSION: "0.0.1-test" # Hardcoded version for test/lab builds
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       # Checkout the code
       - uses: actions/checkout@v4
 
+      # Generate auto-incrementing version number for test builds
+      - name: Generate version number
+        run: echo "VERSION=0.1.${{ github.run_number }}-test" >> $GITHUB_ENV
+
       # Get version from tag
       # - name: Get version from tag with 'v' prefix
       #   run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
@@ -49,24 +51,33 @@ jobs:
           mkdir ${{ env.GH_PAGES_WORKING_DIR }}
           echo '' > ${{ env.GH_PAGES_WORKING_DIR }}/.nojekyll
 
-      # Publish the Blazor WASM site to a build working folder
+      # Publish the static website to a build working folder
       - name: Publish
-        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
+        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work with Blazor. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
         run: dotnet publish ${{ env.PROJECT_FILE }} -p:Version=${{ env.VERSION }} -c:${{ env.CONFIGURATION }} -p:GHPages=true -p:GHPagesBase="/${{ github.event.repository.name }}/${{ env.PROJECT_GH_PAGES_DIR }}/" -p:GHPagesInjectBrotliLoader=false -o:${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}
 
-      # Copy the published Blazor WASM site from wwwroot folder in publish output dir
+      # Replace version placeholders in HTML files
+      - name: Replace version placeholders
+        run: |
+          find ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot -name "*.html" -exec sed -i 's/{{APP_VERSION}}/${{ env.VERSION }}/g' {} \;
+          find ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot -name "*.js" -exec sed -i 's/{{APP_VERSION}}/${{ env.VERSION }}/g' {} \;
+
+      # Copy the published static website from wwwroot folder in publish output dir
       - name: Copy published wwwroot contents to a subdirectory in GH pages working dir root
         run: |
           cp -r ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot/ ${{ env.GH_PAGES_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/
 
-      # Deploy the Blazor WASM site
+      # Deploy the static website to GitHub Pages
       - name: Deploy to Github Pages
-        uses: JamesIves/github-pages-deploy-action@v4
+        uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23
         with:
           # token: ${{ secrets.ACCESS_TOKEN }} # Use if custom token needed to another repo
           branch: ${{ env.GH_PAGES_BRANCH_NAME }}  # The branch the action should deploy to.
           folder: ${{ env.GH_PAGES_WORKING_DIR }} # The folder the action should deploy.
           #target-folder: app #If not specified, the contents for folder above is copied to the root of the GH pages branch.
           single-commit: true
           clean: false
-          clean-exclude: app/**/*  # If clean: true, keep the live app folder in the gh-pages branch (where non lab/test builds are deployed to)
+          clean-exclude: |  # If clean: true, keep the live app folder in the gh-pages branch (where non lab/test builds are deployed to)
+            app/**/*
+            app2/**/*
+            app2-test/**/*

.github/workflows/dotnet-blazor-app-publish-to-gh-pages.yml

@@ -1,10 +1,10 @@
-name: Publish .NET Blazor WASM app to GitHub Pages
+name: Publish Browser app to GitHub Pages
 
 on:
 #  push:
 #    branches:
 #      - master
-#  workflow_dispatch:
+  workflow_dispatch:
 
   #Trigger when tag is created
   push:
@@ -27,9 +27,14 @@ jobs:
       # Checkout the code
       - uses: actions/checkout@v4
 
-      # Get version from tag
-      - name: Get version from tag with 'v' prefix
-        run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+      # Get version from tag or set fallback version for manual dispatch
+      - name: Set version from tag or fallback
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            echo "VERSION=0.1.${{ github.run_number }}-test" >> $GITHUB_ENV
+          fi
 
       # Install .NET Core SDK
       - name: Setup .NET Core
@@ -47,25 +52,27 @@ jobs:
           mkdir ${{ env.GH_PAGES_WORKING_DIR }}
           echo '' > ${{ env.GH_PAGES_WORKING_DIR }}/.nojekyll
 
-      # Publish the Blazor WASM site to a build working folder
+      # Publish the static website to a build working folder
       - name: Publish
-        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
+        # Note: Could not get -p:GHPagesInjectBrotliLoader=true to work with Blazor. Gets error "Uncaught ReferenceError: Blazor is not defined" from "brotliloader.min.js"
         run: dotnet publish ${{ env.PROJECT_FILE }} -p:Version=${{ env.VERSION }} -c:${{ env.CONFIGURATION }} -p:GHPages=true -p:GHPagesBase="/${{ github.event.repository.name }}/${{ env.PROJECT_GH_PAGES_DIR }}/" -p:GHPagesInjectBrotliLoader=false -o:${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}
 
-      # Copy the published Blazor WASM site from wwwroot folder in publish output dir
+      # Copy the published static website from wwwroot folder in publish output dir
       - name: Copy published wwwroot contents to a subdirectory in GH pages working dir root
         run: |
           cp -r ${{ env.BUILD_OUTPUT_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/wwwroot/ ${{ env.GH_PAGES_WORKING_DIR }}/${{ env.PROJECT_GH_PAGES_DIR }}/
 
-      # Deploy the Blazor WASM site
+      # Deploy the static website to GitHub Pages
       - name: Deploy to Github Pages
-        uses: JamesIves/github-pages-deploy-action@v4
+        uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23
         with:
           # token: ${{ secrets.ACCESS_TOKEN }} # Use if custom token needed to another repo
           branch: ${{ env.GH_PAGES_BRANCH_NAME }}  # The branch the action should deploy to.
           folder: ${{ env.GH_PAGES_WORKING_DIR }} # The folder the action should deploy.
           #target-folder: app #If not specified, the contents for folder above is copied to the root of the GH pages branch.
           single-commit: true
           clean: false
-          clean-exclude: app-test/**/*  # If clean: true, keep the lab/test app folder in the gh-pages branch
-
+          clean-exclude: |  # If clean: true, keep the live app folder in the gh-pages branch (where non lab/test builds are deployed to)
+            app-test/**/*
+            app2/**/*            
+            app2-test/**/*

.gitignore

@@ -282,5 +282,6 @@ __pycache__/
 
 BenchmarkDotNet.Artifacts/
 
-/src/apps/Highbyte.DotNet6502.App.SadConsole/appsettings.Development.json
-/src/apps/Highbyte.DotNet6502.App.SilkNetNative/appsettings.Development.json
+src/apps/Highbyte.DotNet6502.App.SadConsole/appsettings.Development.json
+src/apps/Highbyte.DotNet6502.App.SilkNetNative/appsettings.Development.json
+src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Desktop/appsettings.Development.json

.vscode/launch.json

@@ -22,8 +22,8 @@
             "type": "blazorwasm",
             "request": "launch",
             "cwd": "${workspaceFolder}/src/apps/Highbyte.DotNet6502.App.WASM",
-            "url": "http://localhost:5000",
-            "browser": "edge"
+            "url": "http://localhost:5000"
+            //"browser": "chrome"
         },
         {
             "name": "SadConsole app - .NET Core Launch",
@@ -50,7 +50,27 @@
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "externalTerminal",
             "stopAtEntry": false
-        },    
+        },
+        {
+            "name": "Avalonia desktop app - .NET Core Launch",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build avalonia desktop app",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Desktop/bin/Debug/net9.0/Highbyte.DotNet6502.App.Avalonia.Desktop.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Desktop/bin/Debug/net9.0",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "integratedTerminal",
+            "stopAtEntry": false
+        },
+        {
+            "name": "C#: Highbyte.DotNet6502.App.Avalonia.Browser",
+            "type": "dotnet",
+            "request": "launch",
+            "projectPath": "${workspaceFolder}/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Browser/Highbyte.DotNet6502.App.Avalonia.Browser.csproj",
+            "launchConfigurationId": "TargetFramework=;Avalonia.Browser"
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

.vscode/tasks.json

@@ -81,6 +81,22 @@
                 "isDefault": true
             }
         },
+        {
+            "label": "build avalonia desktop app",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Desktop/Highbyte.DotNet6502.App.Avalonia.Desktop.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
         {
             "label": "test",
             "command": "dotnet",

NuGet.Config

@@ -4,4 +4,15 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="SkiaSharp nightly" value="https://aka.ms/skiasharp-eap/index.json" />
   </packageSources>
+
+    <!-- Define mappings by adding package patterns beneath the target source. -->
+    <packageSourceMapping>
+        <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+        <!--<packageSource key="SkiaSharp nightly">
+            <package pattern="SkiaSharp*" />
+        </packageSource>-->
+    </packageSourceMapping>
 </configuration>