Skip to content

Continue Avalonia port with upstream avalonia-port updates integrated#32

Closed
Copilot wants to merge 4 commits intomainfrom
copilot/prepare-port-wpf-ui-to-avalonia
Closed

Continue Avalonia port with upstream avalonia-port updates integrated#32
Copilot wants to merge 4 commits intomainfrom
copilot/prepare-port-wpf-ui-to-avalonia

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 20, 2026

Summary

This PR continues the Avalonia port and incorporates recent upstream changes from avalonia-port into the migration branch before adding the next Avalonia slice.

What was done

  • Merged latest upstream origin/avalonia-port into this branch.
  • Resolved merge conflicts in:
    • /home/runner/work/App/App/.gitignore
    • /home/runner/work/App/App/ControlPad.sln
  • Preserved both upstream additions and porting work:
    • ControlPad.Tests retained in solution
    • ControlPad.Avalonia retained in solution
    • ignore rules include both test and Avalonia build artifacts
  • Extended Avalonia app skeleton with functional navigation host:
    • Added page stubs:
      • /home/runner/work/App/App/ControlPad.Avalonia/Views/HomeView.axaml
      • /home/runner/work/App/App/ControlPad.Avalonia/Views/SliderCategoriesView.axaml
      • /home/runner/work/App/App/ControlPad.Avalonia/Views/ButtonCategoriesView.axaml
      • /home/runner/work/App/App/ControlPad.Avalonia/Views/SettingsView.axaml
    • Updated /home/runner/work/App/App/ControlPad.Avalonia/MainWindow.axaml and code-behind to switch content by nav button clicks.
  • Updated docs:
    • /home/runner/work/App/App/README.md now includes current test command for ControlPad.Tests.

Validation

  • dotnet build /home/runner/work/App/App/ControlPad/ControlPad.csproj -p:EnableWindowsTargeting=true
  • dotnet build /home/runner/work/App/App/ControlPad.Avalonia/ControlPad.Avalonia.csproj
  • dotnet test /home/runner/work/App/App/ControlPad.Tests/ControlPad.Tests.csproj (28 passed)
  • Automated code review: no comments
  • CodeQL scan: 0 alerts

Target branch

Please merge into avalonia-port (not main), per request.

Copilot AI and others added 4 commits March 19, 2026 19:24
Co-authored-by: PalmarHealer <93807726+PalmarHealer@users.noreply.github.com>
Co-authored-by: PalmarHealer <93807726+PalmarHealer@users.noreply.github.com>
…are-port-wpf-ui-to-avalonia

# Conflicts:
#	.gitignore
#	ControlPad.sln
Co-authored-by: PalmarHealer <93807726+PalmarHealer@users.noreply.github.com>
Agent-Logs-Url: https://github.com/ControlPad/App/sessions/07626b93-a886-4db8-a206-162ac4c426c2
@PalmarHealer
Copy link
Copy Markdown
Collaborator

@copilot please close this PR and re-open one on the avalonia-port

Copy link
Copy Markdown
Contributor Author

Copilot AI commented Mar 20, 2026

@copilot please close this PR and re-open one on the avalonia-port

I confirmed the branch head is still e8d1d39. I can’t close/reopen PRs from this environment right now (GitHub auth for write operations is unavailable), so PR #32 is still open against main. If you close #32, I’ll immediately open the replacement PR to avalonia-port from copilot/prepare-port-wpf-ui-to-avalonia.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • https://api.github.com/graphql
    • Triggering command: /usr/bin/gh gh auth status (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants