Merge branch 'main' into nm/sample-tests

Author: nmetulev

.github/actions/collect-metrics/action.yml

@@ -18,14 +18,15 @@ runs:
         $artifacts = "${{ inputs.artifacts-path }}"
         $sizes = @{}
 
-        $x64Exe = Get-Item "$artifacts/cli/win-x64/winapp.exe" -ErrorAction SilentlyContinue
-        $arm64Exe = Get-Item "$artifacts/cli/win-arm64/winapp.exe" -ErrorAction SilentlyContinue
+        # Sum all files excluding PDBs to get total CLI distribution size
+        $x64Files = Get-ChildItem "$artifacts/cli/win-x64" -File -ErrorAction SilentlyContinue | Where-Object { $_.Extension -ne '.pdb' }
+        $arm64Files = Get-ChildItem "$artifacts/cli/win-arm64" -File -ErrorAction SilentlyContinue | Where-Object { $_.Extension -ne '.pdb' }
         $npmPkg = Get-ChildItem "$artifacts/*.tgz" -ErrorAction SilentlyContinue | Select-Object -First 1
         $msixX64 = Get-ChildItem "$artifacts/msix-packages/*x64*.msix" -ErrorAction SilentlyContinue | Select-Object -First 1
         $msixArm64 = Get-ChildItem "$artifacts/msix-packages/*arm64*.msix" -ErrorAction SilentlyContinue | Select-Object -First 1
 
-        if ($x64Exe) { $sizes["cli-win-x64"] = $x64Exe.Length }
-        if ($arm64Exe) { $sizes["cli-win-arm64"] = $arm64Exe.Length }
+        if ($x64Files) { $sizes["cli-win-x64"] = ($x64Files | Measure-Object -Property Length -Sum).Sum }
+        if ($arm64Files) { $sizes["cli-win-arm64"] = ($arm64Files | Measure-Object -Property Length -Sum).Sum }
         if ($npmPkg) { $sizes["npm-package"] = $npmPkg.Length }
         if ($msixX64) { $sizes["msix-x64"] = $msixX64.Length }
         if ($msixArm64) { $sizes["msix-arm64"] = $msixArm64.Length }

.github/plugin/agents/winapp.agent.md

@@ -143,9 +143,9 @@ Does the project already have an appxmanifest.xml?
 - `--logo-path` — source image for asset generation
 - `--if-exists error|skip|overwrite`
 
-### `winapp manifest update-assets <image-path>`
-**Purpose:** Regenerate all required icon sizes from a single source image.
-**When to use:** When updating your app icon. Source image should be at least 400×400 pixels.
+### `winapp manifest update-assets <image-path> [--light-image <path>]`
+**Purpose:** Regenerate all required icon sizes, scale variants, and app.ico from a single source image (PNG, SVG, ICO, etc.).
+**When to use:** When updating your app icon. Source image should be at least 400×400 pixels. SVG recommended for best quality. Use `--light-image` for light theme variants.
 
 ### `winapp tool <toolname> [args...]` (alias: `winapp run-buildtool`)
 **Purpose:** Run Windows SDK tools directly (makeappx, signtool, makepri, etc.).

.github/plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "winapp-cli",
   "description": "Windows app development, packaging, and distribution. Helps with creating Windows installers (MSIX), code signing, certificates, Windows SDK and Windows App SDK setup, package identity for Windows APIs (push notifications, background tasks, share target), appxmanifest authoring, and Microsoft Store distribution. Supports Electron, .NET, C++, Rust, Flutter, and Tauri apps.",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": {
     "name": "Microsoft",
     "url": "https://github.com/microsoft/WinAppCli"

.github/plugin/skills/winapp-cli/frameworks/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-frameworks
 description: Framework-specific Windows development guidance for Electron, .NET (WPF, WinForms), C++, Rust, Flutter, and Tauri. Use when packaging or adding Windows features to an Electron app, .NET desktop app, Flutter app, Tauri app, Rust app, or C++ app.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use
 

.github/plugin/skills/winapp-cli/identity/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-identity
 description: Enable Windows package identity for desktop apps to access Windows APIs like push notifications, background tasks, share target, and startup tasks. Use when adding Windows notifications, background tasks, or other identity-requiring Windows features to a desktop app.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use
 

.github/plugin/skills/winapp-cli/manifest/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-manifest
-description: Create and edit Windows app manifest files (appxmanifest.xml) that define app identity, capabilities, and visual assets. Use when creating a Windows app manifest for any app type (GUI, console, CLI tool, service), adding Windows capabilities, updating app icons and assets, or adding execution aliases, file associations, protocol handlers, or other app extensions.
-version: 0.2.1
+description: Create and edit Windows app manifest files (appxmanifest.xml) that define app identity, capabilities, and visual assets, or generate new assets from existing images. Use when creating a Windows app manifest for any app type (GUI, console, CLI tool, service), adding Windows capabilities, generating new app icons and assets, or adding execution aliases, file associations, protocol handlers, or other app extensions.
+version: 0.2.2
 ---
 ## When to use
 
@@ -13,7 +13,7 @@ Use this skill when:
 ## Prerequisites
 
 - winapp CLI installed
-- Optional: a source image (PNG, at least 400x400 pixels) for custom app icons
+- Optional: a source image (PNG or SVG, at least 400x400 pixels) for custom app icons
 
 ## Key concepts
 
@@ -64,11 +64,24 @@ Output:
 # Generate all required icon sizes from one source image
 winapp manifest update-assets ./my-logo.png
 
+# SVG source images produce the best quality at all sizes
+winapp manifest update-assets ./my-logo.svg
+
 # Specify manifest location (if not in current directory)
 winapp manifest update-assets ./my-logo.png --manifest ./path/to/appxmanifest.xml
+
+# Generate light theme variants from a separate image
+winapp manifest update-assets ./my-logo.png --light-image ./my-logo-light.png
+
+# Use the same image for both (generates all MRT light theme qualifiers)
+winapp manifest update-assets ./my-logo.png --light-image ./my-logo.png
 ```
 
-The source image should be at least 400x400 pixels (PNG recommended). The command reads the manifest to determine which asset sizes are needed and generates them all.
+The source image should be at least 400x400 pixels (PNG or SVG recommended). The command reads the manifest to determine which asset sizes are needed and generates:
+- **5 scale variants** per asset (100%, 125%, 150%, 200%, 400%)
+- **14 plated + 14 unplated targetsize variants** for the app icon (44x44)
+- **app.ico** — multi-resolution ICO file for shell integration. If an existing `.ico` file is present in the assets directory, it is replaced in-place (preserving the original filename)
+- With `--light-image`: light theme variants using the correct MRT qualifiers per asset type
 
 ## Manifest structure overview
 
@@ -113,7 +126,7 @@ Key fields to edit:
 - The `sparse` template adds `uap10:AllowExternalContent="true"` for apps that need identity but run outside the MSIX container
 - You can manually edit `appxmanifest.xml` after generation — it's a standard XML file
 - Image assets must match the paths referenced in the manifest — `update-assets` handles this automatically
-- For logos, transparent PNGs work best. Use a square image for best results across all sizes.
+- For logos, transparent PNGs or SVGs work best. SVG source images are rendered as vectors directly at each target size, producing pixel-perfect results. Use a square image for best results across all sizes.
 - **`$targetnametoken$` placeholder:** When `winapp manifest generate` creates `appxmanifest.xml`, it sets `Application.Executable` to `$targetnametoken$.exe` by default. This is a valid placeholder that gets automatically resolved by `winapp package --executable <name>` at packaging time — you rarely need to override it during manifest generation. If `--executable` is provided to `winapp manifest generate`, winapp reads `FileVersionInfo` from the actual exe to auto-fill package name, description, publisher, and extract an icon, so the exe must already exist on disk.
 
 ## Related skills
@@ -125,7 +138,7 @@ Key fields to edit:
 | Error | Cause | Solution |
 |-------|-------|----------|
 | "Manifest already exists" | `appxmanifest.xml` present | Use `--if-exists overwrite` to replace, or edit existing file directly |
-| "Invalid source image" | Image too small or wrong format | Use PNG, at least 400x400 pixels |
+| "Invalid source image" | Image too small or wrong format | Use PNG or SVG, at least 400x400 pixels |
 | "Publisher mismatch" during packaging | Manifest publisher ≠ cert publisher | Edit `Identity.Publisher` in manifest, or regenerate cert with `--manifest` |
 
 
@@ -162,10 +175,11 @@ Generate new assets for images referenced in an appxmanifest.xml from a single s
 <!-- auto-generated from cli-schema.json -->
 | Argument | Required | Description |
 |----------|----------|-------------|
-| `<image-path>` | Yes | Path to source image file |
+| `<image-path>` | Yes | Path to source image file (SVG, PNG, ICO, JPG, BMP, GIF) |
 
 #### Options
 <!-- auto-generated from cli-schema.json -->
 | Option | Description | Default |
 |--------|-------------|---------|
+| `--light-image` | Path to source image for light theme variants (SVG, PNG, ICO, JPG, BMP, GIF) | (none) |
 | `--manifest` | Path to AppxManifest.xml file (default: search current directory) | (none) |

.github/plugin/skills/winapp-cli/package/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-package
 description: Package a Windows app as an MSIX installer for distribution or testing. Use when creating a Windows installer, packaging an Electron/Flutter/.NET/Rust/C++/Tauri app for Windows, building an MSIX, distributing a desktop app, packaging a console app or CLI tool, or adding MSIX packaging to a build script or CI/CD pipeline.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use
 

.github/plugin/skills/winapp-cli/setup/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-setup
 description: Set up a Windows app project for MSIX packaging, Windows SDK access, or Windows API usage. Use when adding Windows support to an Electron, .NET, C++, Rust, Flutter, or Tauri project, or restoring SDK packages after cloning.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use
 

.github/plugin/skills/winapp-cli/signing/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-signing
 description: Create and manage code signing certificates for Windows apps and MSIX packages. Use when generating a certificate, signing a Windows app or installer, or fixing certificate trust issues.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use
 

.github/plugin/skills/winapp-cli/troubleshoot/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: winapp-troubleshoot
 description: Diagnose and fix common Windows app packaging, signing, identity, and SDK errors. Use when encountering errors with MSIX packaging, certificate signing, Windows SDK setup, or app installation.
-version: 0.2.1
+version: 0.2.2
 ---
 ## When to use