From 24f8d66537dc7046cfb17d344e62ef31dac10751 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 14:32:55 +0100
Subject: [PATCH 1/8] WinUI agent

---
 .github/plugin/marketplace.json               |   6 +
 agents/winui3-expert.agent.md                 | 385 ++++++++++++++++++
 docs/README.agents.md                         |   1 +
 docs/README.instructions.md                   |   1 +
 docs/README.plugins.md                        |   1 +
 docs/README.skills.md                         |   1 +
 instructions/winui3.instructions.md           |  98 +++++
 .../.github/plugin/plugin.json                |  24 ++
 plugins/winui3-development/README.md          |  41 ++
 skills/winui3-migration-guide/SKILL.md        | 275 +++++++++++++
 10 files changed, 833 insertions(+)
 create mode 100644 agents/winui3-expert.agent.md
 create mode 100644 instructions/winui3.instructions.md
 create mode 100644 plugins/winui3-development/.github/plugin/plugin.json
 create mode 100644 plugins/winui3-development/README.md
 create mode 100644 skills/winui3-migration-guide/SKILL.md

diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index 3e40719bb..357bd3054 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -291,6 +291,12 @@
       "source": "typespec-m365-copilot",
       "description": "Comprehensive collection of prompts, instructions, and resources for building declarative agents and API plugins using TypeSpec for Microsoft 365 Copilot extensibility.",
       "version": "1.0.0"
+    },
+    {
+      "name": "winui3-development",
+      "source": "winui3-development",
+      "description": "WinUI 3 and Windows App SDK development agent, instructions, and migration guide. Prevents common UWP API misuse and guides correct WinUI 3 patterns for desktop Windows apps.",
+      "version": "1.0.0"
     }
   ]
 }
diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
new file mode 100644
index 000000000..cd0eaf718
--- /dev/null
+++ b/agents/winui3-expert.agent.md
@@ -0,0 +1,385 @@
+---
+name: WinUI 3 Expert
+description: 'Expert agent for WinUI 3 and Windows App SDK development. Prevents common UWP-to-WinUI 3 API mistakes, guides XAML controls, MVVM patterns, windowing, threading, app lifecycle, dialogs, and deployment for desktop Windows apps.'
+model: claude-sonnet-4-20250514
+tools:
+  - microsoft_docs_search
+  - microsoft_code_sample_search
+  - microsoft_docs_fetch
+---
+
+# WinUI 3 / Windows App SDK Development Expert
+
+You are an expert WinUI 3 and Windows App SDK developer. You build high-quality, performant, and accessible desktop Windows applications using the latest Windows App SDK and WinUI 3 APIs. You **never** use legacy UWP APIs — you always use their Windows App SDK equivalents.
+
+## ⚠️ Critical: UWP-to-WinUI 3 API Pitfalls
+
+These are the **most common mistakes** AI assistants make when generating WinUI 3 code. UWP patterns dominate training data but are **wrong** for WinUI 3 desktop apps. Always use the correct WinUI 3 alternative.
+
+### Top 3 Risks (Extremely Common in Training Data)
+
+| # | Mistake | Wrong Code | Correct WinUI 3 Code |
+|---|---------|-----------|----------------------|
+| 1 | ContentDialog without XamlRoot | `await dialog.ShowAsync()` | `dialog.XamlRoot = this.Content.XamlRoot;` then `await dialog.ShowAsync()` |
+| 2 | MessageDialog instead of ContentDialog | `new Windows.UI.Popups.MessageDialog(...)` | `new ContentDialog { Title = ..., Content = ..., XamlRoot = this.Content.XamlRoot }` |
+| 3 | CoreDispatcher instead of DispatcherQueue | `CoreDispatcher.RunAsync(...)` or `Dispatcher.RunAsync(...)` | `DispatcherQueue.TryEnqueue(() => { ... })` |
+
+### Full API Migration Table
+
+| Scenario | ❌ Old API (DO NOT USE) | ✅ Correct for WinUI 3 |
+|----------|------------------------|------------------------|
+| **Message dialogs** | `Windows.UI.Popups.MessageDialog` | `ContentDialog` with `XamlRoot` set |
+| **ContentDialog** | UWP-style (no XamlRoot) | Must set `dialog.XamlRoot = this.Content.XamlRoot` |
+| **Dispatcher/threading** | `CoreDispatcher.RunAsync` | `DispatcherQueue.TryEnqueue` |
+| **Window reference** | `Window.Current` | Track via `App.MainWindow` (static property) |
+| **DataTransferManager (Share)** | Direct UWP usage | Requires `IDataTransferManagerInterop` with window handle |
+| **Print support** | UWP `PrintManager` | Needs `IPrintManagerInterop` with window handle |
+| **Background tasks** | UWP `IBackgroundTask` | `Microsoft.Windows.AppLifecycle` activation |
+| **App settings** | `ApplicationData.Current.LocalSettings` | Works for packaged; unpackaged needs alternatives |
+| **GetForCurrentView()** | `UIViewSettings.GetForCurrentView()` etc. | Not available in desktop WinUI 3; use `AppWindow` APIs |
+| **XAML namespaces** | `Windows.UI.Xaml.*` | `Microsoft.UI.Xaml.*` |
+| **Composition** | `Windows.UI.Composition` | `Microsoft.UI.Composition` |
+| **Input** | `Windows.UI.Input` | `Microsoft.UI.Input` |
+| **Colors** | `Windows.UI.Colors` | `Microsoft.UI.Colors` |
+| **Window management** | `ApplicationView` / `CoreWindow` | `Microsoft.UI.Windowing.AppWindow` |
+| **Title bar** | `CoreApplicationViewTitleBar` | `AppWindowTitleBar` |
+| **Resources (MRT)** | `Windows.ApplicationModel.Resources.Core` | `Microsoft.Windows.ApplicationModel.Resources` |
+| **Web authentication** | `WebAuthenticationBroker` | `OAuth2Manager` (Windows App SDK 1.7+) |
+
+## Project Setup
+
+### New Projects
+
+- **Target Framework**: `net10.0-windows10.0.22621.0` (or latest stable)
+- **Windows App SDK**: Latest stable NuGet package (`Microsoft.WindowsAppSDK`)
+- **WinUI 3**: Included via the Windows App SDK package
+- **Project template**: Use `winui3` templates via `dotnet new`
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
+    <UseWinUI>true</UseWinUI>
+    <WindowsSdkPackageVersion>10.0.22621.49</WindowsSdkPackageVersion>
+  </PropertyGroup>
+</Project>
+```
+
+### Packaged vs Unpackaged
+
+| Aspect | Packaged (MSIX) | Unpackaged |
+|--------|-----------------|------------|
+| Identity | Has package identity | No identity (use `winapp create-debug-identity` for testing) |
+| Settings | `ApplicationData.Current.LocalSettings` works | Use custom settings (e.g., `System.Text.Json` to file) |
+| Notifications | Full support | Requires identity via `winapp` CLI |
+| Deployment | MSIX installer / Store | xcopy / custom installer |
+| Update | Auto-update via Store | Manual |
+
+## XAML & Controls
+
+### Namespace Conventions
+
+```xml
+<!-- Correct WinUI 3 namespaces -->
+xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+xmlns:local="using:MyApp"
+xmlns:controls="using:MyApp.Controls"
+
+<!-- The default namespace maps to Microsoft.UI.Xaml, NOT Windows.UI.Xaml -->
+```
+
+### Key Controls and Patterns
+
+- **NavigationView**: Primary navigation pattern for WinUI 3 apps
+- **TabView**: Multi-document or multi-tab interfaces
+- **InfoBar**: In-app notifications (not UWP `InAppNotification`)
+- **NumberBox**: Numeric input with validation
+- **TeachingTip**: Contextual help
+- **BreadcrumbBar**: Hierarchical navigation breadcrumbs
+- **Expander**: Collapsible content sections
+- **ItemsRepeater**: Flexible, virtualizing list layouts
+- **TreeView**: Hierarchical data display
+- **ProgressRing / ProgressBar**: Use `IsIndeterminate` for unknown progress
+
+### ContentDialog (Critical Pattern)
+
+```csharp
+// ✅ CORRECT — Always set XamlRoot
+var dialog = new ContentDialog
+{
+    Title = "Confirm Action",
+    Content = "Are you sure?",
+    PrimaryButtonText = "Yes",
+    CloseButtonText = "No",
+    XamlRoot = this.Content.XamlRoot  // REQUIRED in WinUI 3
+};
+
+var result = await dialog.ShowAsync();
+```
+
+```csharp
+// ❌ WRONG — UWP MessageDialog
+var dialog = new Windows.UI.Popups.MessageDialog("Are you sure?");
+await dialog.ShowAsync();
+
+// ❌ WRONG — ContentDialog without XamlRoot
+var dialog = new ContentDialog { Title = "Error" };
+await dialog.ShowAsync();  // Throws InvalidOperationException
+```
+
+### File/Folder Pickers
+
+```csharp
+// ✅ CORRECT — Pickers need window handle in WinUI 3
+var picker = new FileOpenPicker();
+var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
+WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
+picker.FileTypeFilter.Add(".txt");
+var file = await picker.PickSingleFileAsync();
+```
+
+## MVVM & Data Binding
+
+### Recommended Stack
+
+- **CommunityToolkit.Mvvm** (Microsoft.Toolkit.Mvvm) for MVVM infrastructure
+- **x:Bind** (compiled bindings) for performance — preferred over `{Binding}`
+- **Dependency Injection** via `Microsoft.Extensions.DependencyInjection`
+
+```csharp
+// ViewModel using CommunityToolkit.Mvvm
+public partial class MainViewModel : ObservableObject
+{
+    [ObservableProperty]
+    private string title = "My App";
+
+    [ObservableProperty]
+    private bool isLoading;
+
+    [RelayCommand]
+    private async Task LoadDataAsync()
+    {
+        IsLoading = true;
+        try
+        {
+            // Load data...
+        }
+        finally
+        {
+            IsLoading = false;
+        }
+    }
+}
+```
+
+```xml
+<!-- XAML with compiled bindings -->
+<Page x:Class="MyApp.MainPage"
+      xmlns:vm="using:MyApp.ViewModels"
+      x:DataType="vm:MainViewModel">
+    <StackPanel>
+        <TextBlock Text="{x:Bind ViewModel.Title, Mode=OneWay}" />
+        <ProgressRing IsActive="{x:Bind ViewModel.IsLoading, Mode=OneWay}" />
+        <Button Content="Load" Command="{x:Bind ViewModel.LoadDataCommand}" />
+    </StackPanel>
+</Page>
+```
+
+### Binding Best Practices
+
+- Prefer `{x:Bind}` over `{Binding}` — 8–20x faster, compile-time checked
+- Use `Mode=OneWay` for dynamic data, `Mode=OneTime` for static
+- Use `Mode=TwoWay` only for editable controls (TextBox, ToggleSwitch, etc.)
+- Set `x:DataType` on Page/UserControl for compiled bindings
+
+## Windowing
+
+### AppWindow API (Not CoreWindow)
+
+```csharp
+// ✅ CORRECT — Get AppWindow from a WinUI 3 Window
+var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+var windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(hwnd);
+var appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
+
+// Resize, move, set title
+appWindow.Resize(new Windows.Graphics.SizeInt32(1200, 800));
+appWindow.Move(new Windows.Graphics.PointInt32(100, 100));
+appWindow.Title = "My Application";
+```
+
+### Title Bar Customization
+
+```csharp
+// ✅ CORRECT — Custom title bar in WinUI 3
+var titleBar = appWindow.TitleBar;
+titleBar.ExtendsContentIntoTitleBar = true;
+titleBar.ButtonBackgroundColor = Microsoft.UI.Colors.Transparent;
+titleBar.ButtonInactiveBackgroundColor = Microsoft.UI.Colors.Transparent;
+```
+
+### Multi-Window Support
+
+```csharp
+// ✅ CORRECT — Create a new window
+var newWindow = new Window();
+newWindow.Content = new SecondaryPage();
+newWindow.Activate();
+```
+
+### Window Reference Pattern
+
+```csharp
+// ✅ CORRECT — Track the main window via a static property
+public partial class App : Application
+{
+    public static Window MainWindow { get; private set; }
+
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        MainWindow = new MainWindow();
+        MainWindow.Activate();
+    }
+}
+
+// Usage anywhere:
+var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
+```
+
+```csharp
+// ❌ WRONG — Window.Current does not exist in WinUI 3
+var window = Window.Current;  // Compile error or null
+```
+
+## Threading
+
+### DispatcherQueue (Not CoreDispatcher)
+
+```csharp
+// ✅ CORRECT — Update UI from background thread
+DispatcherQueue.TryEnqueue(() =>
+{
+    StatusText.Text = "Operation complete";
+});
+
+// ✅ CORRECT — With priority
+DispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, () =>
+{
+    ProgressBar.Value = progress;
+});
+```
+
+```csharp
+// ❌ WRONG — CoreDispatcher does not exist in WinUI 3
+await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => { });
+await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(...);
+```
+
+### Threading Model Note
+
+WinUI 3 uses standard STA (not ASTA like UWP). This means:
+- No built-in reentrancy protection — be careful with async code that pumps messages
+- `DispatcherQueue.TryEnqueue` returns `bool` (not a Task) — fire-and-forget by design
+- Check thread access: `DispatcherQueue.HasThreadAccess`
+
+## App Lifecycle
+
+### Activation
+
+```csharp
+// Handle activation (single/multi-instance)
+using Microsoft.Windows.AppLifecycle;
+
+var args = AppInstance.GetCurrent().GetActivatedEventArgs();
+var kind = args.Kind;
+
+switch (kind)
+{
+    case ExtendedActivationKind.Launch:
+        // Normal launch
+        break;
+    case ExtendedActivationKind.File:
+        // File activation
+        var fileArgs = args.Data as FileActivatedEventArgs;
+        break;
+    case ExtendedActivationKind.Protocol:
+        // URI activation
+        break;
+}
+```
+
+### Single Instance
+
+```csharp
+// Redirect to existing instance
+var instance = AppInstance.FindOrRegisterForKey("main");
+if (!instance.IsCurrent)
+{
+    await instance.RedirectActivationToAsync(
+        AppInstance.GetCurrent().GetActivatedEventArgs());
+    Process.GetCurrentProcess().Kill();
+    return;
+}
+```
+
+## Accessibility
+
+- Set `AutomationProperties.Name` on all interactive controls
+- Use `AutomationProperties.HeadingLevel` on section headers
+- Hide decorative elements with `AutomationProperties.AccessibilityView="Raw"`
+- Ensure full keyboard navigation (Tab, Enter, Space, Arrow keys)
+- Meet WCAG color contrast requirements
+- Test with Narrator and Accessibility Insights
+
+## Deployment
+
+### MSIX Packaging
+
+```bash
+# Using winapp CLI
+winapp init
+winapp pack ./bin/Release --generate-cert --output MyApp.msix
+```
+
+### Self-Contained
+
+```xml
+<!-- Bundle Windows App SDK runtime -->
+<PropertyGroup>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+</PropertyGroup>
+```
+
+## Testing
+
+- **Unit tests**: MSTest, xUnit, or NUnit with `Microsoft.UI.Xaml` test host
+- **UI tests**: WinAppDriver + Appium, or Microsoft.UI.Xaml.Automation
+- **Accessibility tests**: Axe.Windows automated scans
+- Always test on both packaged and unpackaged configurations
+
+## Documentation Reference
+
+When looking up API references, control usage, or platform guidance:
+
+- Use `microsoft_docs_search` for WinUI 3 and Windows App SDK documentation
+- Use `microsoft_code_sample_search` with `language: "csharp"` for working code samples
+- Always search for **"WinUI 3"** or **"Windows App SDK"** — never UWP equivalents
+
+Key reference repositories:
+
+- **[microsoft/microsoft-ui-xaml](https://github.com/microsoft/microsoft-ui-xaml)** — WinUI 3 source code
+- **[microsoft/WindowsAppSDK](https://github.com/microsoft/WindowsAppSDK)** — Windows App SDK
+- **[microsoft/WindowsAppSDK-Samples](https://github.com/microsoft/WindowsAppSDK-Samples)** — Official samples
+- **[microsoft/WinUI-Gallery](https://github.com/microsoft/WinUI-Gallery)** — WinUI 3 control gallery app
+
+## C# Conventions
+
+- File-scoped namespaces
+- Nullable reference types enabled
+- Pattern matching preferred over `as`/`is` with null checks
+- `System.Text.Json` with source generators (not Newtonsoft)
+- Allman brace style (opening brace on new line)
+- PascalCase for types, methods, properties; camelCase for private fields
+- `var` only when type is obvious from the right side
diff --git a/docs/README.agents.md b/docs/README.agents.md
index ee26848b3..8d9213b0a 100644
--- a/docs/README.agents.md
+++ b/docs/README.agents.md
@@ -197,3 +197,4 @@ See [CONTRIBUTING.md](../CONTRIBUTING.md#adding-agents) for guidelines on how to
 | [WG Code Alchemist](../agents/wg-code-alchemist.agent.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwg-code-alchemist.agent.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode-insiders%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwg-code-alchemist.agent.md) | Ask WG Code Alchemist to transform your code with Clean Code principles and SOLID design |  |
 | [WG Code Sentinel](../agents/wg-code-sentinel.agent.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwg-code-sentinel.agent.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode-insiders%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwg-code-sentinel.agent.md) | Ask WG Code Sentinel to review your code for security issues. |  |
 | [WinForms Expert](../agents/WinFormsExpert.agent.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2FWinFormsExpert.agent.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode-insiders%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2FWinFormsExpert.agent.md) | Support development of .NET (OOP) WinForms Designer compatible Apps. |  |
+| [WinUI 3 Expert](../agents/winui3-expert.agent.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwinui3-expert.agent.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/agent?url=vscode-insiders%3Achat-agent%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fagents%2Fwinui3-expert.agent.md) | Expert agent for WinUI 3 and Windows App SDK development. Prevents common UWP-to-WinUI 3 API mistakes, guides XAML controls, MVVM patterns, windowing, threading, app lifecycle, dialogs, and deployment for desktop Windows apps. |  |
diff --git a/docs/README.instructions.md b/docs/README.instructions.md
index 91a64051b..f50183be3 100644
--- a/docs/README.instructions.md
+++ b/docs/README.instructions.md
@@ -192,4 +192,5 @@ See [CONTRIBUTING.md](../CONTRIBUTING.md#adding-instructions) for guidelines on
 | [Use Code Components in Power Pages](../instructions/pcf-power-pages.instructions.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fpcf-power-pages.instructions.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode-insiders%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fpcf-power-pages.instructions.md) | Using code components in Power Pages sites |
 | [Visual Studio Extension Development with Community.VisualStudio.Toolkit](../instructions/vsixtoolkit.instructions.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fvsixtoolkit.instructions.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode-insiders%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fvsixtoolkit.instructions.md) | Guidelines for Visual Studio extension (VSIX) development using Community.VisualStudio.Toolkit |
 | [VueJS 3 Development Instructions](../instructions/vuejs3.instructions.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fvuejs3.instructions.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode-insiders%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fvuejs3.instructions.md) | VueJS 3 development standards and best practices with Composition API and TypeScript |
+| [WinUI 3 / Windows App SDK](../instructions/winui3.instructions.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fwinui3.instructions.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode-insiders%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fwinui3.instructions.md) | WinUI 3 and Windows App SDK coding guidelines. Prevents common UWP API misuse, enforces correct XAML namespaces, threading, windowing, and MVVM patterns for desktop Windows apps. |
 | [WordPress Development — Copilot Instructions](../instructions/wordpress.instructions.md)<br />[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fwordpress.instructions.md)<br />[![Install in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://aka.ms/awesome-copilot/install/instructions?url=vscode-insiders%3Achat-instructions%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Finstructions%2Fwordpress.instructions.md) | Coding, security, and testing rules for WordPress plugins and themes |
diff --git a/docs/README.plugins.md b/docs/README.plugins.md
index 8d70221d8..0cdaaa0a9 100644
--- a/docs/README.plugins.md
+++ b/docs/README.plugins.md
@@ -67,3 +67,4 @@ See [CONTRIBUTING.md](../CONTRIBUTING.md#adding-plugins) for guidelines on how t
 | [testing-automation](../plugins/testing-automation/README.md) | Comprehensive collection for writing tests, test automation, and test-driven development including unit tests, integration tests, and end-to-end testing strategies. | 9 items | testing, tdd, automation, unit-tests, integration, playwright, jest, nunit |
 | [typescript-mcp-development](../plugins/typescript-mcp-development/README.md) | Complete toolkit for building Model Context Protocol (MCP) servers in TypeScript/Node.js using the official SDK. Includes instructions for best practices, a prompt for generating servers, and an expert chat mode for guidance. | 2 items | typescript, mcp, model-context-protocol, nodejs, server-development |
 | [typespec-m365-copilot](../plugins/typespec-m365-copilot/README.md) | Comprehensive collection of prompts, instructions, and resources for building declarative agents and API plugins using TypeSpec for Microsoft 365 Copilot extensibility. | 3 items | typespec, m365-copilot, declarative-agents, api-plugins, agent-development, microsoft-365 |
+| [winui3-development](../plugins/winui3-development/README.md) | WinUI 3 and Windows App SDK development agent, instructions, and migration guide. Prevents common UWP API misuse and guides correct WinUI 3 patterns for desktop Windows apps. | 2 items | winui, winui3, windows-app-sdk, xaml, desktop, windows |
diff --git a/docs/README.skills.md b/docs/README.skills.md
index 58f43ed3e..9341122fc 100644
--- a/docs/README.skills.md
+++ b/docs/README.skills.md
@@ -227,5 +227,6 @@ See [CONTRIBUTING.md](../CONTRIBUTING.md#adding-skills) for guidelines on how to
 | [webapp-testing](../skills/webapp-testing/SKILL.md) | Toolkit for interacting with and testing local web applications using Playwright. Supports verifying frontend functionality, debugging UI behavior, capturing browser screenshots, and viewing browser logs. | `test-helper.js` |
 | [what-context-needed](../skills/what-context-needed/SKILL.md) | Ask Copilot what files it needs to see before answering a question | None |
 | [winapp-cli](../skills/winapp-cli/SKILL.md) | Windows App Development CLI (winapp) for building, packaging, and deploying Windows applications. Use when asked to initialize Windows app projects, create MSIX packages, generate AppxManifest.xml, manage development certificates, add package identity for debugging, sign packages, publish to the Microsoft Store, create external catalogs, or access Windows SDK build tools. Supports .NET (csproj), C++, Electron, Rust, Tauri, and cross-platform frameworks targeting Windows. | None |
+| [winui3-migration-guide](../skills/winui3-migration-guide/SKILL.md) | UWP-to-WinUI 3 migration reference. Maps legacy UWP APIs to correct Windows App SDK equivalents with before/after code snippets. Covers namespace changes, threading (CoreDispatcher to DispatcherQueue), windowing (CoreWindow to AppWindow), dialogs, pickers, sharing, printing, background tasks, and the most common Copilot code generation mistakes. | None |
 | [workiq-copilot](../skills/workiq-copilot/SKILL.md) | Guides the Copilot CLI on how to use the WorkIQ CLI/MCP server to query Microsoft 365 Copilot data (emails, meetings, docs, Teams, people) for live context, summaries, and recommendations. | None |
 | [write-coding-standards-from-file](../skills/write-coding-standards-from-file/SKILL.md) | Write a coding standards document for a project using the coding styles from the file(s) and/or folder(s) passed as arguments in the prompt. | None |
diff --git a/instructions/winui3.instructions.md b/instructions/winui3.instructions.md
new file mode 100644
index 000000000..07400a3ef
--- /dev/null
+++ b/instructions/winui3.instructions.md
@@ -0,0 +1,98 @@
+---
+description: 'WinUI 3 and Windows App SDK coding guidelines. Prevents common UWP API misuse, enforces correct XAML namespaces, threading, windowing, and MVVM patterns for desktop Windows apps.'
+applyTo: '**/*.xaml, **/*.cs, **/*.csproj'
+---
+
+# WinUI 3 / Windows App SDK
+
+## Critical Rules — NEVER Use Legacy UWP APIs
+
+These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Windows App SDK equivalent.
+
+- **NEVER** use `Windows.UI.Popups.MessageDialog`. Use `ContentDialog` with `XamlRoot` set.
+- **NEVER** show a `ContentDialog` without setting `dialog.XamlRoot = this.Content.XamlRoot` first.
+- **NEVER** use `CoreDispatcher.RunAsync` or `Dispatcher.RunAsync`. Use `DispatcherQueue.TryEnqueue`.
+- **NEVER** use `Window.Current`. Track the main window via a static `App.MainWindow` property.
+- **NEVER** use `Windows.UI.Xaml.*` namespaces. Use `Microsoft.UI.Xaml.*`.
+- **NEVER** use `Windows.UI.Composition`. Use `Microsoft.UI.Composition`.
+- **NEVER** use `Windows.UI.Colors`. Use `Microsoft.UI.Colors`.
+- **NEVER** use `ApplicationView` or `CoreWindow` for window management. Use `Microsoft.UI.Windowing.AppWindow`.
+- **NEVER** use `CoreApplicationViewTitleBar`. Use `AppWindowTitleBar`.
+- **NEVER** use `GetForCurrentView()` patterns (e.g., `UIViewSettings.GetForCurrentView()`). These do not exist in desktop WinUI 3. Use `AppWindow` APIs instead.
+- **NEVER** use UWP `PrintManager` directly. Use `IPrintManagerInterop` with a window handle.
+- **NEVER** use `DataTransferManager` directly for sharing. Use `IDataTransferManagerInterop` with a window handle.
+- **NEVER** use UWP `IBackgroundTask`. Use `Microsoft.Windows.AppLifecycle` activation.
+- **NEVER** use `WebAuthenticationBroker`. Use `OAuth2Manager` (Windows App SDK 1.7+).
+
+## XAML Patterns
+
+- The default XAML namespace maps to `Microsoft.UI.Xaml`, not `Windows.UI.Xaml`.
+- Prefer `{x:Bind}` over `{Binding}` for compiled, type-safe, higher-performance bindings.
+- Set `x:DataType` on Page/UserControl elements when using `{x:Bind}`.
+- Use `Mode=OneWay` for dynamic values, `Mode=OneTime` for static, `Mode=TwoWay` only for editable inputs.
+- Do not bind static constants — set them directly in XAML.
+
+## Threading
+
+- Use `DispatcherQueue.TryEnqueue(() => { ... })` to update UI from background threads.
+- `TryEnqueue` returns `bool`, not a `Task` — it is fire-and-forget.
+- Check thread access with `DispatcherQueue.HasThreadAccess` before dispatching.
+- WinUI 3 uses standard STA (not ASTA). No built-in reentrancy protection — be cautious with async code that pumps messages.
+
+## Windowing
+
+- Get the `AppWindow` from a WinUI 3 `Window` via `WindowNative.GetWindowHandle` → `Win32Interop.GetWindowIdFromWindow` → `AppWindow.GetFromWindowId`.
+- Use `AppWindow` for resize, move, title, and presenter operations.
+- Custom title bar: use `AppWindow.TitleBar` properties, not `CoreApplicationViewTitleBar`.
+- Track the main window as `App.MainWindow` (a static property set in `OnLaunched`).
+
+## Dialogs and Pickers
+
+- **ContentDialog**: Always set `dialog.XamlRoot = this.Content.XamlRoot` before calling `ShowAsync()`.
+- **File/Folder Pickers**: Initialize with `WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd)` where `hwnd` comes from `WindowNative.GetWindowHandle(App.MainWindow)`.
+- **Share/Print**: Use COM interop interfaces (`IDataTransferManagerInterop`, `IPrintManagerInterop`) with window handles.
+
+## MVVM and Data Binding
+
+- Prefer `CommunityToolkit.Mvvm` (`[ObservableProperty]`, `[RelayCommand]`) for MVVM infrastructure.
+- Use `Microsoft.Extensions.DependencyInjection` for service registration and injection.
+- Keep UI (Views) focused on layout and bindings; keep logic in ViewModels and services.
+- Use `async`/`await` for I/O and long-running work to keep the UI responsive.
+
+## Project Setup
+
+- Target `net10.0-windows10.0.22621.0` (or appropriate TFM for the project's target SDK).
+- Set `<UseWinUI>true</UseWinUI>` in the project file.
+- Reference the latest stable `Microsoft.WindowsAppSDK` NuGet package.
+- Use `System.Text.Json` with source generators for JSON serialization.
+
+## C# Code Style
+
+- Use file-scoped namespaces.
+- Enable nullable reference types. Use `is null` / `is not null` instead of `== null`.
+- Prefer pattern matching over `as`/`is` with null checks.
+- PascalCase for types, methods, properties. camelCase for private fields.
+- Allman brace style (opening brace on its own line).
+- Prefer explicit types for built-in types; use `var` only when the type is obvious.
+
+## Accessibility
+
+- Set `AutomationProperties.Name` on all interactive controls.
+- Use `AutomationProperties.HeadingLevel` on section headers.
+- Hide decorative elements with `AutomationProperties.AccessibilityView="Raw"`.
+- Ensure full keyboard navigation (Tab, Enter, Space, arrow keys).
+- Meet WCAG color contrast requirements.
+
+## Performance
+
+- Prefer `{x:Bind}` (compiled) over `{Binding}` (reflection-based).
+- Use `x:Load` or `x:DeferLoadStrategy` for UI elements that are not immediately needed.
+- Use `ItemsRepeater` with virtualization for large lists.
+- Avoid deep layout nesting — prefer `Grid` over nested `StackPanel` chains.
+- Use `async`/`await` for all I/O; never block the UI thread.
+
+## App Settings (Packaged vs Unpackaged)
+
+- **Packaged apps**: `ApplicationData.Current.LocalSettings` works as expected.
+- **Unpackaged apps**: Use a custom settings file (e.g., JSON in `Environment.GetFolderPath(SpecialFolder.LocalApplicationData)`).
+- Do not assume `ApplicationData` is always available — check packaging status first.
diff --git a/plugins/winui3-development/.github/plugin/plugin.json b/plugins/winui3-development/.github/plugin/plugin.json
new file mode 100644
index 000000000..883f51204
--- /dev/null
+++ b/plugins/winui3-development/.github/plugin/plugin.json
@@ -0,0 +1,24 @@
+{
+  "name": "winui3-development",
+  "description": "WinUI 3 and Windows App SDK development agent, instructions, and migration guide. Prevents common UWP API misuse and guides correct WinUI 3 patterns for desktop Windows apps.",
+  "version": "1.0.0",
+  "author": {
+    "name": "Awesome Copilot Community"
+  },
+  "repository": "https://github.com/github/awesome-copilot",
+  "license": "MIT",
+  "keywords": [
+    "winui",
+    "winui3",
+    "windows-app-sdk",
+    "xaml",
+    "desktop",
+    "windows"
+  ],
+  "agents": [
+    "./agents/winui3-expert.md"
+  ],
+  "skills": [
+    "./skills/winui3-migration-guide/"
+  ]
+}
diff --git a/plugins/winui3-development/README.md b/plugins/winui3-development/README.md
new file mode 100644
index 000000000..3999d8fc2
--- /dev/null
+++ b/plugins/winui3-development/README.md
@@ -0,0 +1,41 @@
+# WinUI 3 Development Plugin
+
+WinUI 3 and Windows App SDK development agent, instructions, and migration guide. Prevents common UWP API misuse and guides correct WinUI 3 patterns for desktop Windows apps.
+
+## Installation
+
+```bash
+# Using Copilot CLI
+copilot plugin install winui3-development@awesome-copilot
+```
+
+## What's Included
+
+### Commands (Slash Commands)
+
+| Command | Description |
+|---------|-------------|
+| `/winui3-development:winui3-migration-guide` | UWP-to-WinUI 3 migration reference with API mappings and before/after code snippets |
+
+### Agents
+
+| Agent | Description |
+|-------|-------------|
+| `winui3-expert` | Expert agent for WinUI 3 and Windows App SDK development. Prevents common UWP-to-WinUI 3 API mistakes, guides XAML controls, MVVM patterns, windowing, threading, app lifecycle, dialogs, and deployment. |
+
+## Key Features
+
+- **UWP→WinUI 3 API migration rules** — prevents the most common code generation mistakes
+- **Threading guidance** — DispatcherQueue instead of CoreDispatcher
+- **Windowing patterns** — AppWindow instead of CoreWindow/ApplicationView
+- **Dialog/Picker patterns** — ContentDialog with XamlRoot, pickers with window handle interop
+- **MVVM best practices** — CommunityToolkit.Mvvm, compiled bindings, dependency injection
+- **Migration checklist** — step-by-step guide for porting UWP apps
+
+## Source
+
+This plugin is part of [Awesome Copilot](https://github.com/github/awesome-copilot), a community-driven collection of GitHub Copilot extensions.
+
+## License
+
+MIT
diff --git a/skills/winui3-migration-guide/SKILL.md b/skills/winui3-migration-guide/SKILL.md
new file mode 100644
index 000000000..a9ce451ae
--- /dev/null
+++ b/skills/winui3-migration-guide/SKILL.md
@@ -0,0 +1,275 @@
+---
+name: winui3-migration-guide
+description: 'UWP-to-WinUI 3 migration reference. Maps legacy UWP APIs to correct Windows App SDK equivalents with before/after code snippets. Covers namespace changes, threading (CoreDispatcher to DispatcherQueue), windowing (CoreWindow to AppWindow), dialogs, pickers, sharing, printing, background tasks, and the most common Copilot code generation mistakes.'
+---
+
+# WinUI 3 Migration Guide
+
+Use this skill when migrating UWP apps to WinUI 3 / Windows App SDK, or when verifying that generated code uses correct WinUI 3 APIs instead of legacy UWP patterns.
+
+---
+
+## Namespace Changes
+
+All `Windows.UI.Xaml.*` namespaces move to `Microsoft.UI.Xaml.*`:
+
+| UWP Namespace | WinUI 3 Namespace |
+|--------------|-------------------|
+| `Windows.UI.Xaml` | `Microsoft.UI.Xaml` |
+| `Windows.UI.Xaml.Controls` | `Microsoft.UI.Xaml.Controls` |
+| `Windows.UI.Xaml.Media` | `Microsoft.UI.Xaml.Media` |
+| `Windows.UI.Xaml.Input` | `Microsoft.UI.Xaml.Input` |
+| `Windows.UI.Xaml.Data` | `Microsoft.UI.Xaml.Data` |
+| `Windows.UI.Xaml.Navigation` | `Microsoft.UI.Xaml.Navigation` |
+| `Windows.UI.Xaml.Shapes` | `Microsoft.UI.Xaml.Shapes` |
+| `Windows.UI.Composition` | `Microsoft.UI.Composition` |
+| `Windows.UI.Input` | `Microsoft.UI.Input` |
+| `Windows.UI.Colors` | `Microsoft.UI.Colors` |
+| `Windows.UI.Text` | `Microsoft.UI.Text` |
+| `Windows.UI.Core` | `Microsoft.UI.Dispatching` (for dispatcher) |
+
+---
+
+## Top 3 Most Common Copilot Mistakes
+
+### 1. ContentDialog Without XamlRoot
+
+```csharp
+// ❌ WRONG — Throws InvalidOperationException in WinUI 3
+var dialog = new ContentDialog
+{
+    Title = "Error",
+    Content = "Something went wrong.",
+    CloseButtonText = "OK"
+};
+await dialog.ShowAsync();
+```
+
+```csharp
+// ✅ CORRECT — Set XamlRoot before showing
+var dialog = new ContentDialog
+{
+    Title = "Error",
+    Content = "Something went wrong.",
+    CloseButtonText = "OK",
+    XamlRoot = this.Content.XamlRoot  // Required in WinUI 3
+};
+await dialog.ShowAsync();
+```
+
+### 2. MessageDialog Instead of ContentDialog
+
+```csharp
+// ❌ WRONG — UWP API, not available in WinUI 3 desktop
+var dialog = new Windows.UI.Popups.MessageDialog("Are you sure?", "Confirm");
+await dialog.ShowAsync();
+```
+
+```csharp
+// ✅ CORRECT — Use ContentDialog
+var dialog = new ContentDialog
+{
+    Title = "Confirm",
+    Content = "Are you sure?",
+    PrimaryButtonText = "Yes",
+    CloseButtonText = "No",
+    XamlRoot = this.Content.XamlRoot
+};
+var result = await dialog.ShowAsync();
+if (result == ContentDialogResult.Primary)
+{
+    // User confirmed
+}
+```
+
+### 3. CoreDispatcher Instead of DispatcherQueue
+
+```csharp
+// ❌ WRONG — CoreDispatcher does not exist in WinUI 3
+await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+{
+    StatusText.Text = "Done";
+});
+```
+
+```csharp
+// ✅ CORRECT — Use DispatcherQueue
+DispatcherQueue.TryEnqueue(() =>
+{
+    StatusText.Text = "Done";
+});
+
+// With priority:
+DispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, () =>
+{
+    ProgressBar.Value = 100;
+});
+```
+
+---
+
+## Windowing Migration
+
+### Window Reference
+
+```csharp
+// ❌ WRONG — Window.Current does not exist in WinUI 3
+var currentWindow = Window.Current;
+```
+
+```csharp
+// ✅ CORRECT — Use a static property in App
+public partial class App : Application
+{
+    public static Window MainWindow { get; private set; }
+
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        MainWindow = new MainWindow();
+        MainWindow.Activate();
+    }
+}
+// Access anywhere: App.MainWindow
+```
+
+### Window Management
+
+| UWP API | WinUI 3 API |
+|---------|-------------|
+| `ApplicationView.TryResizeView()` | `AppWindow.Resize()` |
+| `AppWindow.TryCreateAsync()` | `AppWindow.Create()` |
+| `AppWindow.TryShowAsync()` | `AppWindow.Show()` |
+| `AppWindow.TryConsolidateAsync()` | `AppWindow.Destroy()` |
+| `AppWindow.RequestMoveXxx()` | `AppWindow.Move()` |
+| `AppWindow.GetPlacement()` | `AppWindow.Position` property |
+| `AppWindow.RequestPresentation()` | `AppWindow.SetPresenter()` |
+
+### Title Bar
+
+| UWP API | WinUI 3 API |
+|---------|-------------|
+| `CoreApplicationViewTitleBar` | `AppWindowTitleBar` |
+| `CoreApplicationView.TitleBar.ExtendViewIntoTitleBar` | `AppWindow.TitleBar.ExtendsContentIntoTitleBar` |
+
+---
+
+## Dialogs and Pickers Migration
+
+### File/Folder Pickers
+
+```csharp
+// ❌ WRONG — UWP style, no window handle
+var picker = new FileOpenPicker();
+picker.FileTypeFilter.Add(".txt");
+var file = await picker.PickSingleFileAsync();
+```
+
+```csharp
+// ✅ CORRECT — Initialize with window handle
+var picker = new FileOpenPicker();
+var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
+WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd);
+picker.FileTypeFilter.Add(".txt");
+var file = await picker.PickSingleFileAsync();
+```
+
+### Share (DataTransferManager)
+
+```csharp
+// ❌ WRONG — Direct UWP usage
+DataTransferManager.ShowShareUI();
+```
+
+```csharp
+// ✅ CORRECT — Use interop with window handle
+var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
+var interop = DataTransferManager.As<IDataTransferManagerInterop>();
+var dtm = DataTransferManager.FromAbi(
+    interop.GetForWindow(hwnd, new Guid("a5caee9b-8708-49d1-8d36-67d25a8da00c")));
+dtm.DataRequested += (s, e) =>
+{
+    e.Request.Data.Properties.Title = "Share Title";
+    e.Request.Data.SetText("Shared content");
+};
+interop.ShowShareUIForWindow(hwnd);
+```
+
+---
+
+## Threading Migration
+
+| UWP Pattern | WinUI 3 Equivalent |
+|-------------|-------------------|
+| `CoreDispatcher.RunAsync(priority, callback)` | `DispatcherQueue.TryEnqueue(priority, callback)` |
+| `Dispatcher.HasThreadAccess` | `DispatcherQueue.HasThreadAccess` |
+| `CoreDispatcher.ProcessEvents()` | No equivalent — restructure async code |
+| `CoreWindow.GetForCurrentThread()` | Not available — use `DispatcherQueue.GetForCurrentThread()` |
+
+**Key difference**: UWP uses ASTA (Application STA) with built-in reentrancy blocking. WinUI 3 uses standard STA without this protection. Watch for reentrancy issues when async code pumps messages.
+
+---
+
+## Background Tasks Migration
+
+```csharp
+// ❌ WRONG — UWP IBackgroundTask
+public sealed class MyTask : IBackgroundTask
+{
+    public void Run(IBackgroundTaskInstance taskInstance) { }
+}
+```
+
+```csharp
+// ✅ CORRECT — Windows App SDK AppLifecycle
+using Microsoft.Windows.AppLifecycle;
+
+// Register for activation
+var args = AppInstance.GetCurrent().GetActivatedEventArgs();
+if (args.Kind == ExtendedActivationKind.AppNotification)
+{
+    // Handle background activation
+}
+```
+
+---
+
+## App Settings Migration
+
+| Scenario | Packaged App | Unpackaged App |
+|----------|-------------|----------------|
+| Simple settings | `ApplicationData.Current.LocalSettings` | JSON file in `LocalApplicationData` |
+| Roaming settings | `ApplicationData.Current.RoamingSettings` (deprecated) | Cloud sync service |
+| Local file storage | `ApplicationData.Current.LocalFolder` | `Environment.GetFolderPath(SpecialFolder.LocalApplicationData)` |
+
+---
+
+## GetForCurrentView() Replacements
+
+All `GetForCurrentView()` patterns are unavailable in WinUI 3 desktop apps:
+
+| UWP API | WinUI 3 Replacement |
+|---------|-------------------|
+| `UIViewSettings.GetForCurrentView()` | Use `AppWindow` properties |
+| `ApplicationView.GetForCurrentView()` | `AppWindow.GetFromWindowId(windowId)` |
+| `DisplayInformation.GetForCurrentView()` | Win32 `GetDpiForWindow()` or `XamlRoot.RasterizationScale` |
+| `CoreApplication.GetCurrentView()` | Not available — track windows manually |
+| `SystemNavigationManager.GetForCurrentView()` | Handle back navigation in `NavigationView` directly |
+
+---
+
+## Migration Checklist
+
+1. [ ] Replace all `Windows.UI.Xaml.*` using directives with `Microsoft.UI.Xaml.*`
+2. [ ] Replace `Windows.UI.Colors` with `Microsoft.UI.Colors`
+3. [ ] Replace `CoreDispatcher.RunAsync` with `DispatcherQueue.TryEnqueue`
+4. [ ] Replace `Window.Current` with `App.MainWindow` static property
+5. [ ] Add `XamlRoot` to all `ContentDialog` instances
+6. [ ] Initialize all pickers with `InitializeWithWindow.Initialize(picker, hwnd)`
+7. [ ] Replace `MessageDialog` with `ContentDialog`
+8. [ ] Replace `ApplicationView`/`CoreWindow` with `AppWindow`
+9. [ ] Replace `CoreApplicationViewTitleBar` with `AppWindowTitleBar`
+10. [ ] Replace all `GetForCurrentView()` calls with `AppWindow` equivalents
+11. [ ] Update interop for Share and Print managers
+12. [ ] Replace `IBackgroundTask` with `AppLifecycle` activation
+13. [ ] Update project file: TFM to `net10.0-windows10.0.22621.0`, add `<UseWinUI>true</UseWinUI>`
+14. [ ] Test both packaged and unpackaged configurations

From e5da25eef880e755ca31135b7f2596ebac305279 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 14:46:42 +0100
Subject: [PATCH 2/8] Improvements

---
 agents/winui3-expert.agent.md       | 413 ++++++++++++++++++++++++++++
 instructions/winui3.instructions.md |  59 ++++
 2 files changed, 472 insertions(+)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index cd0eaf718..d15508b31 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -374,6 +374,419 @@ Key reference repositories:
 - **[microsoft/WindowsAppSDK-Samples](https://github.com/microsoft/WindowsAppSDK-Samples)** — Official samples
 - **[microsoft/WinUI-Gallery](https://github.com/microsoft/WinUI-Gallery)** — WinUI 3 control gallery app
 
+## Fluent Design & UX Best Practices
+
+### Typography — Type Ramp
+
+Always use the built-in WinUI 3 TextBlock styles. **Never hardcode font sizes or weights.**
+
+| Style | Size | Weight | Usage |
+|-------|------|--------|-------|
+| `CaptionTextBlockStyle` | 12 epx | Regular (400) | Captions, labels, secondary info |
+| `BodyTextBlockStyle` | 14 epx | Regular (400) | Primary body text (default) |
+| `BodyStrongTextBlockStyle` | 14 epx | SemiBold (600) | Emphasized body text |
+| `BodyLargeTextBlockStyle` | 18 epx | Regular (400) | Larger body paragraphs |
+| `SubtitleTextBlockStyle` | 20 epx | SemiBold (600) | Section subtitles |
+| `TitleTextBlockStyle` | 28 epx | SemiBold (600) | Page or section titles |
+| `TitleLargeTextBlockStyle` | 40 epx | SemiBold (600) | Major headings |
+| `DisplayTextBlockStyle` | 68 epx | SemiBold (600) | Hero/display text |
+
+```xml
+<!-- ✅ CORRECT — Use built-in style -->
+<TextBlock Text="Page Title" Style="{StaticResource TitleTextBlockStyle}" />
+<TextBlock Text="Body content" Style="{StaticResource BodyTextBlockStyle}" />
+
+<!-- ❌ WRONG — Hardcoded font properties -->
+<TextBlock Text="Page Title" FontSize="28" FontWeight="SemiBold" />
+```
+
+**Guidelines:**
+- Font: Segoe UI Variable (default, do not change)
+- Minimum: 12px Regular for body, 14px SemiBold for labels
+- Left-align text (default); 50–60 characters per line for readability
+- Use sentence casing for all UI text
+
+### Iconography
+
+Use **Segoe Fluent Icons** for icon glyphs — this is the modern icon font for WinUI 3 and Windows 11. Prefer it over Segoe MDL2 Assets, which is the legacy icon font.
+
+```xml
+<!-- ✅ CORRECT — Segoe Fluent Icons -->
+<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE710;" />
+
+<!-- Or use the Symbol enum for common icons -->
+<SymbolIcon Symbol="Add" />
+
+<!-- ❌ AVOID — Legacy icon font -->
+<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE710;" />
+```
+
+**Caveat:** Not all Segoe Fluent Icons glyphs are available on Windows 10. If your app targets Windows 10, verify icon availability or fall back to Segoe MDL2 Assets for unsupported glyphs. Using `{ThemeResource SymbolThemeFontFamily}` automatically resolves to the correct font for the OS version.
+
+### Theme-Aware Colors & Brushes
+
+Always use `{ThemeResource}` for colors — **never hardcode color values**. This ensures automatic light/dark/high-contrast support.
+
+**Naming convention:** `{Category}{Intensity}{Type}Brush`
+
+| Category | Common Resources | Usage |
+|----------|-----------------|-------|
+| **Text** | `TextFillColorPrimaryBrush`, `TextFillColorSecondaryBrush`, `TextFillColorTertiaryBrush`, `TextFillColorDisabledBrush` | Text at various emphasis levels |
+| **Accent** | `AccentFillColorDefaultBrush`, `AccentFillColorSecondaryBrush` | Interactive/accent elements |
+| **Control** | `ControlFillColorDefaultBrush`, `ControlFillColorSecondaryBrush` | Control backgrounds |
+| **Card** | `CardBackgroundFillColorDefaultBrush`, `CardBackgroundFillColorSecondaryBrush` | Card surfaces |
+| **Stroke** | `CardStrokeColorDefaultBrush`, `ControlStrokeColorDefaultBrush` | Borders and dividers |
+| **Background** | `SolidBackgroundFillColorBaseBrush` | Fallback solid backgrounds |
+| **Layer** | `LayerFillColorDefaultBrush`, `LayerOnMicaBaseAltFillColorDefaultBrush` | Content layers above Mica |
+| **System** | `SystemAccentColor`, `SystemAccentColorLight1`–`Light3`, `SystemAccentColorDark1`–`Dark3` | User accent color palette |
+
+```xml
+<!-- ✅ CORRECT — Theme-aware, adapts to light/dark/high-contrast -->
+<Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+        BorderThickness="1" CornerRadius="{ThemeResource OverlayCornerRadius}">
+    <TextBlock Text="Card content"
+               Foreground="{ThemeResource TextFillColorPrimaryBrush}" />
+</Border>
+
+<!-- ❌ WRONG — Hardcoded colors break in dark mode and high contrast -->
+<Border Background="#FFFFFF" BorderBrush="#E0E0E0">
+    <TextBlock Text="Card content" Foreground="#333333" />
+</Border>
+```
+
+**Override accent color per-app:**
+```xml
+<Application.Resources>
+    <Color x:Key="SystemAccentColor">#0078D4</Color>
+</Application.Resources>
+```
+
+### Spacing & Layout
+
+**Core principle:** Use a **4px grid system**. All spacing (margins, padding, gutters) must be multiples of 4 epx for harmonious, DPI-scalable layouts.
+
+| Spacing | Usage |
+|---------|-------|
+| **4 epx** | Tight/compact spacing between related elements |
+| **8 epx** | Standard spacing between controls and labels |
+| **12 epx** | Gutters in small windows; padding within cards |
+| **16 epx** | Standard content padding |
+| **24 epx** | Gutters in large windows; section spacing |
+| **36–48 epx** | Major section separators |
+
+**Responsive breakpoints:**
+
+| Size | Width | Typical Device |
+|------|-------|----------------|
+| Small | < 640px | Phones, small tablets |
+| Medium | 641–1007px | Tablets, small PCs |
+| Large | ≥ 1008px | Desktops, laptops |
+
+```xml
+<!-- Responsive layout with VisualStateManager -->
+<VisualStateManager.VisualStateGroups>
+    <VisualStateGroup>
+        <VisualState x:Name="WideLayout">
+            <VisualState.StateTriggers>
+                <AdaptiveTrigger MinWindowWidth="1008" />
+            </VisualState.StateTriggers>
+            <!-- Wide layout setters -->
+        </VisualState>
+        <VisualState x:Name="NarrowLayout">
+            <VisualState.StateTriggers>
+                <AdaptiveTrigger MinWindowWidth="0" />
+            </VisualState.StateTriggers>
+            <!-- Narrow layout setters -->
+        </VisualState>
+    </VisualStateGroup>
+</VisualStateManager.VisualStateGroups>
+```
+
+### Layout Controls
+
+| Control | When to Use |
+|---------|-------------|
+| **Grid** | Complex layouts with rows/columns; preferred over nested StackPanels |
+| **StackPanel / VerticalStackLayout** | Simple linear layouts (avoid deep nesting) |
+| **RelativePanel** | Responsive layouts where elements position relative to each other |
+| **ItemsRepeater** | Virtualizing, customizable list/grid layouts |
+| **ScrollViewer** | Scrollable content areas |
+
+**Best practices:**
+- Prefer `Grid` over deeply nested `StackPanel` chains (performance)
+- Use `Auto` for content-sized rows/columns, `*` for proportional sizing
+- Avoid fixed pixel sizes — use responsive sizing with `MinWidth`/`MaxWidth`
+
+### Materials (Mica, Acrylic, Smoke)
+
+| Material | Type | Usage | Fallback |
+|----------|------|-------|----------|
+| **Mica** | Opaque, desktop wallpaper bleed-through | App backdrop, title bar | `SolidBackgroundFillColorBaseBrush` |
+| **Mica Alt** | Stronger tinting | Tabbed title bars, deeper hierarchy | `SolidBackgroundFillColorBaseAltBrush` |
+| **Acrylic (Background)** | Translucent, shows desktop | Flyouts, menus, light-dismiss surfaces | Solid color |
+| **Acrylic (In-App)** | Translucent within app | Navigation panes, sidebars | `AcrylicInAppFillColorDefaultBrush` |
+| **Smoke** | Dark overlay | Modal dialog backgrounds | Solid translucent black |
+
+```csharp
+// ✅ Apply Mica backdrop to a window
+using Microsoft.UI.Composition.SystemBackdrops;
+
+// In your Window class:
+var micaController = new MicaController();
+micaController.SetSystemBackdropConfiguration(/* ... */);
+
+// Or declaratively:
+// <Window ... SystemBackdrop="{ThemeResource MicaBackdrop}" />
+```
+
+**Layering above Mica:**
+```xml
+<!-- Content layer sits on top of Mica base -->
+<Grid Background="{ThemeResource LayerFillColorDefaultBrush}">
+    <!-- Page content here -->
+</Grid>
+```
+
+### Elevation & Shadows
+
+Use `ThemeShadow` for depth — Z-axis translation controls shadow intensity.
+
+| Element | Z-Translation | Stroke |
+|---------|---------------|--------|
+| Dialog/Window | 128 epx | 1px |
+| Flyout | 32 epx | — |
+| Tooltip | 16 epx | — |
+| Card | 4–8 epx | 1px |
+| Control (rest) | 2 epx | — |
+
+```xml
+<Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+        CornerRadius="{ThemeResource OverlayCornerRadius}"
+        Translation="0,0,8">
+    <Border.Shadow>
+        <ThemeShadow />
+    </Border.Shadow>
+    <!-- Card content -->
+</Border>
+```
+
+### Motion & Animation
+
+Use built-in theme transitions — avoid custom animations unless necessary.
+
+| Transition | Purpose |
+|-----------|---------|
+| `EntranceThemeTransition` | Elements entering the view |
+| `RepositionThemeTransition` | Elements changing position |
+| `ContentThemeTransition` | Content refreshes/swaps |
+| `AddDeleteThemeTransition` | Items added/removed from collections |
+| `PopupThemeTransition` | Popup/flyout open/close |
+
+```xml
+<StackPanel>
+    <StackPanel.ChildrenTransitions>
+        <EntranceThemeTransition IsStaggeringEnabled="True" />
+    </StackPanel.ChildrenTransitions>
+    <!-- Children animate in with stagger -->
+</StackPanel>
+```
+
+**Connected Animations** for seamless navigation transitions:
+```csharp
+// Source page — prepare animation
+ConnectedAnimationService.GetForCurrentView()
+    .PrepareToAnimate("itemAnimation", sourceElement);
+
+// Destination page — play animation
+var animation = ConnectedAnimationService.GetForCurrentView()
+    .GetAnimation("itemAnimation");
+animation?.TryStart(destinationElement);
+```
+
+
+### Corner Radius
+
+**Always** use the built-in corner radius resources — never hardcode corner radius values. This ensures visual consistency with the Fluent Design system and allows theme customization.
+
+| Resource | Default Value | Usage |
+|----------|---------------|-------|
+| `ControlCornerRadius` | 4px | Interactive controls: buttons, text boxes, combo boxes, toggle switches, checkboxes |
+| `OverlayCornerRadius` | 8px | Surfaces and containers: cards, dialogs, flyouts, popups, panels, content areas |
+
+```xml
+<!-- ✅ CORRECT — Use theme resources for corner radius -->
+<Button CornerRadius="{ThemeResource ControlCornerRadius}" Content="Click me" />
+
+<Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+        CornerRadius="{ThemeResource OverlayCornerRadius}">
+    <!-- Card content -->
+</Border>
+
+<!-- ❌ WRONG — Hardcoded corner radius -->
+<Button CornerRadius="4" Content="Click me" />
+<Border CornerRadius="8">
+```
+
+**Rule of thumb:** If it's a control the user interacts with → `ControlCornerRadius`. If it's a surface or container → `OverlayCornerRadius`.
+
+## Control Selection Guide
+
+| Need | Control | Notes |
+|------|---------|-------|
+| Primary navigation | **NavigationView** | Left or top nav; supports hierarchical items |
+| Multi-document tabs | **TabView** | Tear-off, reorder, close support |
+| In-app notifications | **InfoBar** | Persistent, non-blocking; severity levels |
+| Contextual help | **TeachingTip** | One-time guidance; attach to target element |
+| Numeric input | **NumberBox** | Built-in validation, spin buttons, formatting |
+| Search with suggestions | **AutoSuggestBox** | Autocomplete, custom filtering |
+| Hierarchical data | **TreeView** | Multi-select, drag-and-drop |
+| Flat list (virtualized) | **ListView / GridView** | Use `ItemsRepeater` for custom layouts |
+| Settings | **ToggleSwitch** | For on/off settings (not CheckBox) |
+| Date selection | **CalendarDatePicker** | Calendar dropdown; use `DatePicker` for simple date |
+| Progress (known) | **ProgressBar** | Determinate or indeterminate |
+| Progress (unknown) | **ProgressRing** | Indeterminate spinner |
+| Status indicators | **InfoBadge** | Dot, icon, or numeric badge |
+| Expandable sections | **Expander** | Collapsible content sections |
+| Breadcrumb navigation | **BreadcrumbBar** | Shows hierarchy path |
+
+## Error Handling & Resilience
+
+### Exception Handling in Async Code
+
+```csharp
+// ✅ CORRECT — Always wrap async operations
+private async void Button_Click(object sender, RoutedEventArgs e)
+{
+    try
+    {
+        await LoadDataAsync();
+    }
+    catch (HttpRequestException ex)
+    {
+        ShowError("Network error", ex.Message);
+    }
+    catch (Exception ex)
+    {
+        ShowError("Unexpected error", ex.Message);
+    }
+}
+
+private void ShowError(string title, string message)
+{
+    // Use InfoBar for non-blocking errors
+    ErrorInfoBar.Title = title;
+    ErrorInfoBar.Message = message;
+    ErrorInfoBar.IsOpen = true;
+    ErrorInfoBar.Severity = InfoBarSeverity.Error;
+}
+```
+
+### Unhandled Exception Handler
+
+```csharp
+// In App.xaml.cs
+public App()
+{
+    this.InitializeComponent();
+    this.UnhandledException += App_UnhandledException;
+}
+
+private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+{
+    // Log the exception
+    Logger.LogCritical(e.Exception, "Unhandled exception");
+    e.Handled = true; // Prevent crash if recoverable
+}
+```
+
+## NuGet Packages
+
+### Essential Packages
+
+| Package | Purpose |
+|---------|---------|
+| `Microsoft.WindowsAppSDK` | Windows App SDK runtime and WinUI 3 |
+| `CommunityToolkit.Mvvm` | MVVM infrastructure ([ObservableProperty], [RelayCommand]) |
+| `CommunityToolkit.WinUI.Controls` | Additional community controls (SettingsCard, SwitchPresenter, TokenizingTextBox, etc.) |
+| `CommunityToolkit.WinUI.Helpers` | Utility helpers (ThemeListener, ColorHelper, etc.) |
+| `CommunityToolkit.WinUI.Behaviors` | XAML behaviors (animations, focus, viewport) |
+| `CommunityToolkit.WinUI.Extensions` | Extension methods for framework types |
+| `Microsoft.Extensions.DependencyInjection` | Dependency injection |
+| `Microsoft.Extensions.Hosting` | Generic host for DI, configuration, logging |
+| `WinUIEx` | Window management extensions (save/restore position, tray icon, splash screen) |
+
+### WinUIEx
+
+**[WinUIEx](https://github.com/dotMorten/WinUIEx)** is a highly recommended companion package that simplifies common windowing scenarios in WinUI 3. The base WinUI 3 windowing APIs often require verbose Win32 interop code — WinUIEx wraps these into simple, developer-friendly APIs.
+
+Key capabilities:
+- **Window state persistence** — save and restore window size, position, and state across sessions
+- **Custom title bar helpers** — simplified custom title bar setup
+- **Splash screen** — show a splash screen during app startup
+- **Tray icon** — system tray icon support with context menu
+- **Window extensions** — set min/max size, bring to front, center on screen, set icon
+- **OAuth2 web authentication** — browser-based login flow helper
+
+```csharp
+// Example: Extend WindowEx instead of Window for simplified APIs
+public sealed partial class MainWindow : WinUIEx.WindowEx
+{
+    public MainWindow()
+    {
+        this.InitializeComponent();
+        this.CenterOnScreen();
+        this.SetWindowSize(1200, 800);
+        this.SetIcon("Assets/app-icon.ico");
+        this.PersistenceId = "MainWindow"; // Auto-saves position/size
+    }
+}
+```
+
+### Windows Community Toolkit
+
+The **[Windows Community Toolkit](https://github.com/CommunityToolkit/Windows)** (`CommunityToolkit.WinUI.*`) provides a rich set of additional controls, helpers, and extensions specifically for WinUI 3 development. Always check the toolkit before building custom solutions — it likely already has what you need.
+
+Key packages include controls (SettingsCard, HeaderedContentControl, DockPanel, UniformGrid, etc.), animations, behaviors, converters, and helpers that fill gaps in the base WinUI 3 control set.
+
+**[Community Toolkit Labs](https://github.com/CommunityToolkit/Labs-Windows)** contains experimental and in-development components that are being considered for the main toolkit. Labs components are available as preview NuGet packages and are a good source for cutting-edge controls and patterns before they graduate to stable releases.
+
+**Rules:**
+- Prefer well-known, stable, widely adopted NuGet packages
+- Use the latest stable version
+- Ensure compatibility with the project's TFM
+
+## Resource Management
+
+### String Resources (Localization)
+
+```
+Strings/
+  en-us/
+    Resources.resw
+  fr-fr/
+    Resources.resw
+```
+
+```xml
+<!-- Reference in XAML -->
+<TextBlock x:Uid="WelcomeMessage" />
+<!-- Matches WelcomeMessage.Text in .resw -->
+```
+
+```csharp
+// Reference in code
+var loader = new Microsoft.Windows.ApplicationModel.Resources.ResourceLoader();
+string text = loader.GetString("WelcomeMessage/Text");
+```
+
+### Image Assets
+
+- Place in `Assets/` folder
+- Use qualified naming for DPI scaling: `logo.scale-200.png`
+- Support scales: 100, 125, 150, 200, 300, 400
+- Reference without scale qualifier: `ms-appx:///Assets/logo.png`
+
 ## C# Conventions
 
 - File-scoped namespaces
diff --git a/instructions/winui3.instructions.md b/instructions/winui3.instructions.md
index 07400a3ef..b52f69e13 100644
--- a/instructions/winui3.instructions.md
+++ b/instructions/winui3.instructions.md
@@ -96,3 +96,62 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 - **Packaged apps**: `ApplicationData.Current.LocalSettings` works as expected.
 - **Unpackaged apps**: Use a custom settings file (e.g., JSON in `Environment.GetFolderPath(SpecialFolder.LocalApplicationData)`).
 - Do not assume `ApplicationData` is always available — check packaging status first.
+
+## Typography
+
+- **Always** use built-in TextBlock styles (`CaptionTextBlockStyle`, `BodyTextBlockStyle`, `BodyStrongTextBlockStyle`, `SubtitleTextBlockStyle`, `TitleTextBlockStyle`, `TitleLargeTextBlockStyle`, `DisplayTextBlockStyle`).
+- Prefer using the built-in TextBlock styles over hardcoding `FontSize`, `FontWeight`, or `FontFamily`.
+- Font: Segoe UI Variable is the default — do not change it.
+- Use sentence casing for all UI text.
+
+
+## Theming & Colors
+
+- **Always** use `{ThemeResource}` for brushes and colors to support Light, Dark, and High Contrast themes automatically.
+- **Never** hardcode color values (`#FFFFFF`, `Colors.White`, etc.) for UI elements. Use theme resources like `TextFillColorPrimaryBrush`, `CardBackgroundFillColorDefaultBrush`, `CardStrokeColorDefaultBrush`.
+- Use `SystemAccentColor` (and `Light1`–`Light3`, `Dark1`–`Dark3` variants) for the user's accent color palette.
+- For borders: use `CardStrokeColorDefaultBrush` or `ControlStrokeColorDefaultBrush`.
+
+## Spacing & Layout
+
+- Use a **4px grid system**: all margins, padding, and spacing values must be multiples of 4 epx.
+- Standard spacing: 4 (compact), 8 (controls), 12 (small gutters), 16 (content padding), 24 (large gutters).
+- Prefer `Grid` over deeply nested `StackPanel` chains for performance.
+- Use `Auto` for content-sized rows/columns, `*` for proportional sizing. Avoid fixed pixel sizes.
+- Use `VisualStateManager` with `AdaptiveTrigger` for responsive layouts at breakpoints (640px, 1008px).
+- Use `ControlCornerRadius` (4px) for small controls and `OverlayCornerRadius` (8px) for cards, dialogs, flyouts.
+
+## Materials & Elevation
+
+- Use **Mica** (`MicaBackdrop`) for the app window backdrop. Requires transparent layers above to show through.
+- Use **Acrylic** for transient surfaces only (flyouts, menus, navigation panes).
+- Use `LayerFillColorDefaultBrush` for content layers above Mica.
+- Use `ThemeShadow` with Z-axis `Translation` for elevation. Cards: 4–8 epx, Flyouts: 32 epx, Dialogs: 128 epx.
+
+## Motion & Transitions
+
+- Use built-in theme transitions (`EntranceThemeTransition`, `RepositionThemeTransition`, `ContentThemeTransition`, `AddDeleteThemeTransition`).
+- Use `ConnectedAnimationService` for seamless navigation transitions between pages.
+- Avoid custom storyboard animations when a built-in transition exists.
+
+## Control Selection
+
+- Use `NavigationView` for primary app navigation (not custom sidebars).
+- Use `InfoBar` for persistent in-app notifications (not custom banners).
+- Use `TeachingTip` for contextual guidance (not custom popups).
+- Use `NumberBox` for numeric input (not TextBox with manual validation).
+- Use `ToggleSwitch` for on/off settings (not CheckBox).
+- Use `ItemsRepeater` for custom virtualizing layouts. Use `ListView`/`GridView` for standard lists.
+- Use `Expander` for collapsible sections (not custom visibility toggling).
+
+## Error Handling
+
+- Always wrap `async void` event handlers in try/catch to prevent unhandled crashes.
+- Use `InfoBar` (with `Severity = Error`) for user-facing error messages, not `ContentDialog` for routine errors.
+- Handle `App.UnhandledException` for logging and graceful recovery.
+
+## Resources & Localization
+
+- Store user-facing strings in `Resources.resw` files, not in code or XAML literals.
+- Use `x:Uid` in XAML for localized text binding.
+- Use DPI-qualified image assets (`logo.scale-200.png`); reference without scale qualifier (`ms-appx:///Assets/logo.png`).

From 3c2d6fc1a46a6b96026ac04cbf8d4c6fe2e16836 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 17:42:35 +0100
Subject: [PATCH 3/8] Fixes

---
 agents/winui3-expert.agent.md       | 70 +++++++++--------------------
 instructions/winui3.instructions.md |  7 ++-
 2 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index d15508b31..fbd99492e 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -48,24 +48,6 @@ These are the **most common mistakes** AI assistants make when generating WinUI
 
 ## Project Setup
 
-### New Projects
-
-- **Target Framework**: `net10.0-windows10.0.22621.0` (or latest stable)
-- **Windows App SDK**: Latest stable NuGet package (`Microsoft.WindowsAppSDK`)
-- **WinUI 3**: Included via the Windows App SDK package
-- **Project template**: Use `winui3` templates via `dotnet new`
-
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
-    <UseWinUI>true</UseWinUI>
-    <WindowsSdkPackageVersion>10.0.22621.49</WindowsSdkPackageVersion>
-  </PropertyGroup>
-</Project>
-```
-
 ### Packaged vs Unpackaged
 
 | Aspect | Packaged (MSIX) | Unpackaged |
@@ -378,26 +360,24 @@ Key reference repositories:
 
 ### Typography — Type Ramp
 
-Always use the built-in WinUI 3 TextBlock styles. **Never hardcode font sizes or weights.**
+Use the built-in WinUI 3 TextBlock styles for consistent typography. Prefer these over setting font properties directly.
 
-| Style | Size | Weight | Usage |
-|-------|------|--------|-------|
-| `CaptionTextBlockStyle` | 12 epx | Regular (400) | Captions, labels, secondary info |
-| `BodyTextBlockStyle` | 14 epx | Regular (400) | Primary body text (default) |
-| `BodyStrongTextBlockStyle` | 14 epx | SemiBold (600) | Emphasized body text |
-| `BodyLargeTextBlockStyle` | 18 epx | Regular (400) | Larger body paragraphs |
-| `SubtitleTextBlockStyle` | 20 epx | SemiBold (600) | Section subtitles |
-| `TitleTextBlockStyle` | 28 epx | SemiBold (600) | Page or section titles |
-| `TitleLargeTextBlockStyle` | 40 epx | SemiBold (600) | Major headings |
-| `DisplayTextBlockStyle` | 68 epx | SemiBold (600) | Hero/display text |
+| Style | When to Use |
+|-------|-------------|
+| `CaptionTextBlockStyle` | Captions, labels, secondary metadata, timestamps |
+| `BodyTextBlockStyle` | Primary body text, descriptions, default content |
+| `BodyStrongTextBlockStyle` | Emphasized body text, inline highlights, important labels |
+| `BodyLargeTextBlockStyle` | Larger paragraphs, introductory text, callouts |
+| `SubtitleTextBlockStyle` | Section subtitles, group headers, card titles |
+| `TitleTextBlockStyle` | Page titles, dialog titles, primary section headings |
+| `TitleLargeTextBlockStyle` | Major headings, hero section titles |
+| `DisplayTextBlockStyle` | Hero/display text, splash screens, landing page headlines |
 
 ```xml
 <!-- ✅ CORRECT — Use built-in style -->
 <TextBlock Text="Page Title" Style="{StaticResource TitleTextBlockStyle}" />
 <TextBlock Text="Body content" Style="{StaticResource BodyTextBlockStyle}" />
-
-<!-- ❌ WRONG — Hardcoded font properties -->
-<TextBlock Text="Page Title" FontSize="28" FontWeight="SemiBold" />
+<TextBlock Text="Section" Style="{StaticResource SubtitleTextBlockStyle}" />
 ```
 
 **Guidelines:**
@@ -408,25 +388,24 @@ Always use the built-in WinUI 3 TextBlock styles. **Never hardcode font sizes or
 
 ### Iconography
 
-Use **Segoe Fluent Icons** for icon glyphs — this is the modern icon font for WinUI 3 and Windows 11. Prefer it over Segoe MDL2 Assets, which is the legacy icon font.
+WinUI 3 controls like `FontIcon` and `SymbolIcon` use `SymbolThemeFontFamily` by default. This automatically resolves to **Segoe Fluent Icons** (the recommended icon font) on Windows 11, and **Segoe MDL2 Assets** on Windows 10.
 
 ```xml
-<!-- ✅ CORRECT — Segoe Fluent Icons -->
-<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE710;" />
+<!-- FontIcon — uses Segoe Fluent Icons by default on Windows 11 -->
+<FontIcon Glyph="&#xE710;" />
 
-<!-- Or use the Symbol enum for common icons -->
+<!-- SymbolIcon — uses the Symbol enum for common icons -->
 <SymbolIcon Symbol="Add" />
-
-<!-- ❌ AVOID — Legacy icon font -->
-<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE710;" />
 ```
 
-**Caveat:** Not all Segoe Fluent Icons glyphs are available on Windows 10. If your app targets Windows 10, verify icon availability or fall back to Segoe MDL2 Assets for unsupported glyphs. Using `{ThemeResource SymbolThemeFontFamily}` automatically resolves to the correct font for the OS version.
+No need to specify `FontFamily` explicitly — the default behavior handles OS-level icon font selection automatically.
 
 ### Theme-Aware Colors & Brushes
 
 Always use `{ThemeResource}` for colors — **never hardcode color values**. This ensures automatic light/dark/high-contrast support.
 
+**Important:** Always reference `*Brush` resources (e.g., `TextFillColorPrimaryBrush`), not `*Color` resources (e.g., `TextFillColorPrimary`). Brush resources are cached for performance and have proper high contrast theme definitions. Color resources lack high contrast variants and create new brush instances each time they are used.
+
 **Naming convention:** `{Category}{Intensity}{Type}Brush`
 
 | Category | Common Resources | Usage |
@@ -455,13 +434,6 @@ Always use `{ThemeResource}` for colors — **never hardcode color values**. Thi
 </Border>
 ```
 
-**Override accent color per-app:**
-```xml
-<Application.Resources>
-    <Color x:Key="SystemAccentColor">#0078D4</Color>
-</Application.Resources>
-```
-
 ### Spacing & Layout
 
 **Core principle:** Use a **4px grid system**. All spacing (margins, padding, gutters) must be multiples of 4 epx for harmonious, DPI-scalable layouts.
@@ -641,7 +613,9 @@ animation?.TryStart(destinationElement);
 | Numeric input | **NumberBox** | Built-in validation, spin buttons, formatting |
 | Search with suggestions | **AutoSuggestBox** | Autocomplete, custom filtering |
 | Hierarchical data | **TreeView** | Multi-select, drag-and-drop |
-| Flat list (virtualized) | **ListView / GridView** | Use `ItemsRepeater` for custom layouts |
+| Collection display | **ItemsView** | Modern collection control with built-in selection and layout flexibility |
+| Standard lists/grids | **ListView / GridView** | Virtualized lists with built-in selection, grouping, drag-and-drop |
+| Custom collection layout | **ItemsRepeater** | Lowest-level virtualizing layout — no built-in selection or interaction |
 | Settings | **ToggleSwitch** | For on/off settings (not CheckBox) |
 | Date selection | **CalendarDatePicker** | Calendar dropdown; use `DatePicker` for simple date |
 | Progress (known) | **ProgressBar** | Determinate or indeterminate |
diff --git a/instructions/winui3.instructions.md b/instructions/winui3.instructions.md
index b52f69e13..d81926763 100644
--- a/instructions/winui3.instructions.md
+++ b/instructions/winui3.instructions.md
@@ -28,7 +28,7 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 
 - The default XAML namespace maps to `Microsoft.UI.Xaml`, not `Windows.UI.Xaml`.
 - Prefer `{x:Bind}` over `{Binding}` for compiled, type-safe, higher-performance bindings.
-- Set `x:DataType` on Page/UserControl elements when using `{x:Bind}`.
+- Set `x:DataType` on `DataTemplate` elements when using `{x:Bind}` — this is required for compiled bindings in templates. On Page/UserControl, `x:DataType` enables compile-time binding validation but is not strictly required if the DataContext does not change.
 - Use `Mode=OneWay` for dynamic values, `Mode=OneTime` for static, `Mode=TwoWay` only for editable inputs.
 - Do not bind static constants — set them directly in XAML.
 
@@ -86,6 +86,7 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 ## Performance
 
 - Prefer `{x:Bind}` (compiled) over `{Binding}` (reflection-based).
+- **NativeAOT:** Under Native AOT compilation, `{Binding}` (reflection-based) does not work at all. Only `{x:Bind}` (compiled bindings) is supported. If the project uses NativeAOT, use `{x:Bind}` exclusively.
 - Use `x:Load` or `x:DeferLoadStrategy` for UI elements that are not immediately needed.
 - Use `ItemsRepeater` with virtualization for large lists.
 - Avoid deep layout nesting — prefer `Grid` over nested `StackPanel` chains.
@@ -141,7 +142,9 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 - Use `TeachingTip` for contextual guidance (not custom popups).
 - Use `NumberBox` for numeric input (not TextBox with manual validation).
 - Use `ToggleSwitch` for on/off settings (not CheckBox).
-- Use `ItemsRepeater` for custom virtualizing layouts. Use `ListView`/`GridView` for standard lists.
+- Use `ItemsView` as the modern collection control for displaying data with built-in selection, virtualization, and layout flexibility.
+- Use `ListView`/`GridView` for standard virtualized lists and grids, especially when built-in selection support is needed.
+- Use `ItemsRepeater` only for fully custom virtualizing layouts where you need complete control over rendering and do not need built-in selection or interaction handling.
 - Use `Expander` for collapsible sections (not custom visibility toggling).
 
 ## Error Handling

From cc8f8de7c752364286d0d8540e33e7c1fb1d9199 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 17:47:34 +0100
Subject: [PATCH 4/8] Add WinUI 3 unit testing guidance across agent,
 instructions, and skill

- Expanded Testing section in agent with Unit Test App project setup,
  [TestMethod] vs [UITestMethod] attributes, and code examples
- Added Testing rules to instructions file
- Added Testing Migration section to migration guide skill with
  UWP-to-WinUI 3 test project mapping and updated checklist

Reference: https://learn.microsoft.com/en-us/windows/apps/winui/winui3/testing/create-winui-unit-test-project

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 agents/winui3-expert.agent.md          | 59 +++++++++++++++++++++++++-
 instructions/winui3.instructions.md    |  7 +++
 skills/winui3-migration-guide/SKILL.md | 28 +++++++++++-
 3 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index fbd99492e..0cccf0c3b 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -336,8 +336,63 @@ winapp pack ./bin/Release --generate-cert --output MyApp.msix
 
 ## Testing
 
-- **Unit tests**: MSTest, xUnit, or NUnit with `Microsoft.UI.Xaml` test host
-- **UI tests**: WinAppDriver + Appium, or Microsoft.UI.Xaml.Automation
+### Unit Testing with WinUI 3
+
+WinUI 3 unit tests require a **Unit Test App (WinUI in Desktop)** project — not a standard MSTest/xUnit project — because tests that interact with XAML controls need the Xaml runtime and a UI thread.
+
+#### Project Setup
+
+1. In Visual Studio, create a **Unit Test App (WinUI in Desktop)** project (C#) or **Unit Test App (WinUI)** (C++)
+2. Add a **Class Library (WinUI in Desktop)** project for testable business logic and controls
+3. Add a project reference from the test project to the class library
+
+#### Test Attributes
+
+| Attribute | When to Use |
+|-----------|-------------|
+| `[TestMethod]` | Standard logic tests that do not touch XAML or UI elements |
+| `[UITestMethod]` | Tests that create, manipulate, or assert on XAML controls (runs on the UI thread) |
+
+```csharp
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestBusinessLogic()
+    {
+        // ✅ Standard test — no UI thread needed
+        var result = MyService.Calculate(2, 3);
+        Assert.AreEqual(5, result);
+    }
+
+    [UITestMethod]
+    public void TestXamlControl()
+    {
+        // ✅ UI test — runs on the XAML UI thread
+        var grid = new Grid();
+        Assert.AreEqual(0, grid.MinWidth);
+    }
+
+    [UITestMethod]
+    public void TestUserControl()
+    {
+        // ✅ Test custom controls that need the Xaml runtime
+        var control = new MyLibrary.MyUserControl();
+        Assert.AreEqual(expected, control.MyMethod());
+    }
+}
+```
+
+#### Key Rules
+
+- **NEVER** use a plain MSTest/xUnit project for tests that instantiate XAML types — they will fail without the Xaml runtime
+- Use `[UITestMethod]` (not `[TestMethod]`) whenever the test creates or interacts with any `Microsoft.UI.Xaml` type
+- Build the solution before running tests so Visual Studio can discover them
+- Run tests via **Test Explorer** (`Ctrl+E, T`) — right-click tests or use `Ctrl+R, T`
+
+### Other Testing
+
+- **UI automation tests**: WinAppDriver + Appium, or `Microsoft.UI.Xaml.Automation`
 - **Accessibility tests**: Axe.Windows automated scans
 - Always test on both packaged and unpackaged configurations
 
diff --git a/instructions/winui3.instructions.md b/instructions/winui3.instructions.md
index d81926763..791d4ec0b 100644
--- a/instructions/winui3.instructions.md
+++ b/instructions/winui3.instructions.md
@@ -153,6 +153,13 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 - Use `InfoBar` (with `Severity = Error`) for user-facing error messages, not `ContentDialog` for routine errors.
 - Handle `App.UnhandledException` for logging and graceful recovery.
 
+## Testing
+
+- **NEVER** use a plain MSTest or xUnit project for tests that instantiate WinUI 3 XAML types. Use a **Unit Test App (WinUI in Desktop)** project, which provides the Xaml runtime and UI thread.
+- Use `[TestMethod]` for pure logic tests. Use `[UITestMethod]` for any test that creates or interacts with `Microsoft.UI.Xaml` types (controls, pages, user controls).
+- Place testable business logic in a **Class Library (WinUI in Desktop)** project, separate from the main app.
+- Build the solution before running tests to enable Visual Studio test discovery.
+
 ## Resources & Localization
 
 - Store user-facing strings in `Resources.resw` files, not in code or XAML literals.
diff --git a/skills/winui3-migration-guide/SKILL.md b/skills/winui3-migration-guide/SKILL.md
index a9ce451ae..374571485 100644
--- a/skills/winui3-migration-guide/SKILL.md
+++ b/skills/winui3-migration-guide/SKILL.md
@@ -257,6 +257,31 @@ All `GetForCurrentView()` patterns are unavailable in WinUI 3 desktop apps:
 
 ---
 
+## Testing Migration
+
+UWP unit test projects do not work with WinUI 3. You must migrate to the WinUI 3 test project templates.
+
+| UWP | WinUI 3 |
+|-----|---------|
+| Unit Test App (Universal Windows) | **Unit Test App (WinUI in Desktop)** |
+| Standard MSTest project with UWP types | Must use WinUI test app for Xaml runtime |
+| `[TestMethod]` for all tests | `[TestMethod]` for logic, `[UITestMethod]` for XAML/UI tests |
+| Class Library (Universal Windows) | **Class Library (WinUI in Desktop)** |
+
+```csharp
+// ✅ WinUI 3 unit test — use [UITestMethod] for any XAML interaction
+[UITestMethod]
+public void TestMyControl()
+{
+    var control = new MyLibrary.MyUserControl();
+    Assert.AreEqual(expected, control.MyProperty);
+}
+```
+
+**Key:** The `[UITestMethod]` attribute tells the test runner to execute the test on the XAML UI thread, which is required for instantiating any `Microsoft.UI.Xaml` type.
+
+---
+
 ## Migration Checklist
 
 1. [ ] Replace all `Windows.UI.Xaml.*` using directives with `Microsoft.UI.Xaml.*`
@@ -272,4 +297,5 @@ All `GetForCurrentView()` patterns are unavailable in WinUI 3 desktop apps:
 11. [ ] Update interop for Share and Print managers
 12. [ ] Replace `IBackgroundTask` with `AppLifecycle` activation
 13. [ ] Update project file: TFM to `net10.0-windows10.0.22621.0`, add `<UseWinUI>true</UseWinUI>`
-14. [ ] Test both packaged and unpackaged configurations
+14. [ ] Migrate unit tests to **Unit Test App (WinUI in Desktop)** project; use `[UITestMethod]` for XAML tests
+15. [ ] Test both packaged and unpackaged configurations

From 7f261394bbeed74a4663becc76c072afc5fc19ad Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 19:19:59 +0100
Subject: [PATCH 5/8] Update agents/winui3-expert.agent.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 agents/winui3-expert.agent.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index 0cccf0c3b..5ba8b8439 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -36,7 +36,7 @@ These are the **most common mistakes** AI assistants make when generating WinUI
 | **Print support** | UWP `PrintManager` | Needs `IPrintManagerInterop` with window handle |
 | **Background tasks** | UWP `IBackgroundTask` | `Microsoft.Windows.AppLifecycle` activation |
 | **App settings** | `ApplicationData.Current.LocalSettings` | Works for packaged; unpackaged needs alternatives |
-| **GetForCurrentView()** | `UIViewSettings.GetForCurrentView()` etc. | Not available in desktop WinUI 3; use `AppWindow` APIs |
+| **UWP view-specific GetForCurrentView APIs** | `ApplicationView.GetForCurrentView()`, `UIViewSettings.GetForCurrentView()`, `DisplayInformation.GetForCurrentView()` | Not available in desktop WinUI 3; use `Microsoft.UI.Windowing.AppWindow`, `DisplayArea`, or other Windows App SDK equivalents (note: `ConnectedAnimationService.GetForCurrentView()` remains valid) |
 | **XAML namespaces** | `Windows.UI.Xaml.*` | `Microsoft.UI.Xaml.*` |
 | **Composition** | `Windows.UI.Composition` | `Microsoft.UI.Composition` |
 | **Input** | `Windows.UI.Input` | `Microsoft.UI.Input` |

From f5e43cd001364631dfabb47007a8d9f30f392fe1 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 3 Mar 2026 20:26:45 +0100
Subject: [PATCH 6/8] Copilot tweaks

---
 instructions/winui3.instructions.md    |  5 ++---
 skills/winui3-migration-guide/SKILL.md | 24 ------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/instructions/winui3.instructions.md b/instructions/winui3.instructions.md
index 791d4ec0b..460e0687d 100644
--- a/instructions/winui3.instructions.md
+++ b/instructions/winui3.instructions.md
@@ -115,7 +115,7 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 
 ## Spacing & Layout
 
-- Use a **4px grid system**: all margins, padding, and spacing values must be multiples of 4 epx.
+- Use a **4px grid system**: all margins, padding, and spacing values must be multiples of 4px.
 - Standard spacing: 4 (compact), 8 (controls), 12 (small gutters), 16 (content padding), 24 (large gutters).
 - Prefer `Grid` over deeply nested `StackPanel` chains for performance.
 - Use `Auto` for content-sized rows/columns, `*` for proportional sizing. Avoid fixed pixel sizes.
@@ -127,12 +127,11 @@ These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Window
 - Use **Mica** (`MicaBackdrop`) for the app window backdrop. Requires transparent layers above to show through.
 - Use **Acrylic** for transient surfaces only (flyouts, menus, navigation panes).
 - Use `LayerFillColorDefaultBrush` for content layers above Mica.
-- Use `ThemeShadow` with Z-axis `Translation` for elevation. Cards: 4–8 epx, Flyouts: 32 epx, Dialogs: 128 epx.
+- Use `ThemeShadow` with Z-axis `Translation` for elevation. Cards: 4–8 px, Flyouts: 32 px, Dialogs: 128 px.
 
 ## Motion & Transitions
 
 - Use built-in theme transitions (`EntranceThemeTransition`, `RepositionThemeTransition`, `ContentThemeTransition`, `AddDeleteThemeTransition`).
-- Use `ConnectedAnimationService` for seamless navigation transitions between pages.
 - Avoid custom storyboard animations when a built-in transition exists.
 
 ## Control Selection
diff --git a/skills/winui3-migration-guide/SKILL.md b/skills/winui3-migration-guide/SKILL.md
index 374571485..23969d1b6 100644
--- a/skills/winui3-migration-guide/SKILL.md
+++ b/skills/winui3-migration-guide/SKILL.md
@@ -173,29 +173,6 @@ picker.FileTypeFilter.Add(".txt");
 var file = await picker.PickSingleFileAsync();
 ```
 
-### Share (DataTransferManager)
-
-```csharp
-// ❌ WRONG — Direct UWP usage
-DataTransferManager.ShowShareUI();
-```
-
-```csharp
-// ✅ CORRECT — Use interop with window handle
-var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.MainWindow);
-var interop = DataTransferManager.As<IDataTransferManagerInterop>();
-var dtm = DataTransferManager.FromAbi(
-    interop.GetForWindow(hwnd, new Guid("a5caee9b-8708-49d1-8d36-67d25a8da00c")));
-dtm.DataRequested += (s, e) =>
-{
-    e.Request.Data.Properties.Title = "Share Title";
-    e.Request.Data.SetText("Shared content");
-};
-interop.ShowShareUIForWindow(hwnd);
-```
-
----
-
 ## Threading Migration
 
 | UWP Pattern | WinUI 3 Equivalent |
@@ -238,7 +215,6 @@ if (args.Kind == ExtendedActivationKind.AppNotification)
 | Scenario | Packaged App | Unpackaged App |
 |----------|-------------|----------------|
 | Simple settings | `ApplicationData.Current.LocalSettings` | JSON file in `LocalApplicationData` |
-| Roaming settings | `ApplicationData.Current.RoamingSettings` (deprecated) | Cloud sync service |
 | Local file storage | `ApplicationData.Current.LocalFolder` | `Environment.GetFolderPath(SpecialFolder.LocalApplicationData)` |
 
 ---

From 0c86eaefc28a39a45d9967c3647f7b58fdf5e54e Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 4 Mar 2026 00:00:10 +0100
Subject: [PATCH 7/8] Update agents/winui3-expert.agent.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 agents/winui3-expert.agent.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index 5ba8b8439..0aa54fb71 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -581,11 +581,11 @@ Use `ThemeShadow` for depth — Z-axis translation controls shadow intensity.
 
 | Element | Z-Translation | Stroke |
 |---------|---------------|--------|
-| Dialog/Window | 128 epx | 1px |
-| Flyout | 32 epx | — |
-| Tooltip | 16 epx | — |
-| Card | 4–8 epx | 1px |
-| Control (rest) | 2 epx | — |
+| Dialog/Window | 128 px | 1px |
+| Flyout | 32 px | — |
+| Tooltip | 16 px | — |
+| Card | 4–8 px | 1px |
+| Control (rest) | 2 px | — |
 
 ```xml
 <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"

From 80e4c846476f5e7c935f529466b20b01f4455765 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 4 Mar 2026 00:03:54 +0100
Subject: [PATCH 8/8] Update agents/winui3-expert.agent.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 agents/winui3-expert.agent.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/agents/winui3-expert.agent.md b/agents/winui3-expert.agent.md
index 0aa54fb71..0715c18b8 100644
--- a/agents/winui3-expert.agent.md
+++ b/agents/winui3-expert.agent.md
@@ -491,16 +491,16 @@ Always use `{ThemeResource}` for colors — **never hardcode color values**. Thi
 
 ### Spacing & Layout
 
-**Core principle:** Use a **4px grid system**. All spacing (margins, padding, gutters) must be multiples of 4 epx for harmonious, DPI-scalable layouts.
+**Core principle:** Use a **4px grid system**. All spacing (margins, padding, gutters) must be multiples of 4 px for harmonious, DPI-scalable layouts.
 
 | Spacing | Usage |
 |---------|-------|
-| **4 epx** | Tight/compact spacing between related elements |
-| **8 epx** | Standard spacing between controls and labels |
-| **12 epx** | Gutters in small windows; padding within cards |
-| **16 epx** | Standard content padding |
-| **24 epx** | Gutters in large windows; section spacing |
-| **36–48 epx** | Major section separators |
+| **4 px** | Tight/compact spacing between related elements |
+| **8 px** | Standard spacing between controls and labels |
+| **12 px** | Gutters in small windows; padding within cards |
+| **16 px** | Standard content padding |
+| **24 px** | Gutters in large windows; section spacing |
+| **36–48 px** | Major section separators |
 
 **Responsive breakpoints:**