Skip to content

Reconcile stable main changes with release/experimental - #660

Draft
shisan (qiutongMS) wants to merge 21 commits into
release/experimentalfrom
integration/main-reconciliation
Draft

Reconcile stable main changes with release/experimental#660
shisan (qiutongMS) wants to merge 21 commits into
release/experimentalfrom
integration/main-reconciliation

Conversation

@qiutongMS

@qiutongMS shisan (qiutongMS) commented Aug 25, 2026

Copy link
Copy Markdown

Main Branch Reconciliation Change Summary

Summary

This branch rebuilds main from the release/experimental sample set while
selectively incorporating stable, applicable changes from main,
release/2.0-stable, and reviewed feature branches.

The reconciliation:

  • retains release/experimental as the directory and content baseline;
  • ports stable fixes by behavior instead of replacing complete sample trees;
  • removes experimental-only samples from the stable branch;
  • aligns retained MSBuild samples with Windows App SDK 2.4.0;
  • preserves release-only fixes and Central Package Management where they are
    newer or safer than their main equivalents; and
  • records intentionally omitted changes and follow-up work.

The pinned source revisions are:

Source Revision
main 18431c6d
release/experimental 26eddcdf
release/2.0-experimental 63efdc9a
release/2.0-stable 5327f5c4

Root and Shared Infrastructure

Shared C++ build compatibility

Stable Windows App SDK 2.4 dependency graph

  • Updated Samples/Directory.Packages.props from Windows App SDK 1.8 to the
    stable 2.4.0 metapackage and its matching split-package versions.
  • Updated the matching Foundation, AI, ML, MSIX BuildTools, and WebView2
    versions resolved from the official 2.4.0 dependency closure.
  • Scoped UpdateVersions.ps1 to the root central package file by default.
    Child Directory.Packages.props files now require explicit selection.
  • Changed version harvesting to use the metapackage's lowest compatible
    dependency versions rather than unrelated future versions.
  • Kept MAUI $(MauiVersion) references workload-managed.
  • Source: official Microsoft.WindowsAppSDK 2.4.0 NuGet dependency graph.

Root documentation

  • Added repository-level links to the WindowsML diagnostics workflow.

Samples/AppLifecycle

Samples/Islands

WinForms XAML Islands

Existing SimpleIslandApp

  • Kept the existing Islands/cpp-win32-unpackaged location.
  • Replaced the network-dependent WebView2 demonstration with an offline
    FlipView and five packaged image assets.
  • Ported the behavior from main@72b7d1b9, PR Updating Island sample to use FlipView instead of WebView #432.
  • Intentionally omitted the directory move from main@562c3091, PR Add UXFrameworksOnIslands sample for WindowsAppSDK 1.7.0. #439,
    because the release path and project configuration are newer.
  • Did not reintroduce packages.config or hard-coded package imports.
  • Validation reached the pre-existing duplicate
    WindowsAppRuntimeAutoInitializer.cpp issue reproduced on the unchanged
    baseline.

UXFrameworksOnIslands

Samples/Input

  • Ported the stable keyboard events and keyboard accelerator scenario.
  • Retained the release Net 8 target, Central Package Management, runtime
    identifiers, and publish profiles instead of copying older project settings.
  • Source: main@9ffb7096, PR Keyboard events sample in winui3 #383.
  • Validation: project diagnostics passed. The targeted x64 Release build is
    blocked during restore by the pre-existing absence of
    Microsoft.NETCore.App.Crossgen2.win-x64 8.0.30 from the configured feed.

Samples/Windowing

  • Ported the native DispatcherQueue and AppWindow lifetime refactoring.
  • Replaced the custom Win32 message window and WNDPROC loop with the Windows
    App SDK DispatcherQueue.
  • Exits the queue from the AppWindow destroying event and uses the standard
    Overlapped presenter.
  • Retained the release path, Central Package Management, and later package
    configuration instead of copying the older main project wholesale.
  • Source: main@d3922307, PR Clean-up AppWindow sample to use WinAppSDK DispatcherQueue #415.

The old Windowing WAP directory was not restored because it was superseded by
the release single-project MSIX conversion in PR #579.

SecureUI, which was introduced by the same PR, was excluded. It is identified
as a test project, has test metadata, has no README, depends on a pre-existing
isolated desktop that the repository does not create, and overlaps the public
Windowing sample.

Samples/Notifications

  • Corrected the Push notification sample's Azure identifier terminology from
    AppId to ObjectId.
  • Retained the release-side C4100 warning fix in the same source file.
  • Source: main@70e13b7c, PR Update cpp-console.cpp #238.
  • This is a comment-only documentation correction; runtime behavior is
    unchanged.

Samples/ResourceManagement

  • Kept the release/experimental single-project MSIX C++ WinUI sample.
  • Did not restore the old C++ WinUI WAP directory from main.
  • The WAP project existed at the common ancestor and was superseded by
    release/experimental@0d035e00, PR Use Centralized Nuget Package Management for vcxproj #579.
  • Business source and image assets are equivalent; the manifest differences
    only reflect the single-project MSIX resource layout.
  • No ResourceManagement source migration was required.

Samples/WindowsAIFoundry

C# WinUI stable gallery

MAUI, WinForms, and WPF projects

  • Normalized documentation and sparse package manifests away from obsolete
    experimental runtime references.
  • Updated the sparse WinForms and WPF manifests to
    Microsoft.WindowsAppRuntime.2 version 2.4.0.0.
  • Preserved the MAUI readiness fallback with version-neutral rationale.
  • Removed an unnecessary experimental Bootstrap call from the fully packaged
    WPF sample.
  • Source for the WPF Bootstrap fix:
    user/qiutongshen/changeExp@acbc15e2.
  • Corrected the invalid sparse WinForms PRI filename
    SplashScreen.scale-200 (1).png.
  • Validation: sparse WinForms and sparse WPF x64 Release passed with no
    warnings.

CMake sparse console

  • Retargeted the custom vcpkg overlay from experimental packages to stable
    Windows App SDK 2.1.3.
  • Kept the sample focused on LanguageModel; did not import the feature
    branch's ImageScaler scenario.
  • Added explicit x64 and ARM64 vcpkg triplets.
  • Updated sparse package registration and build documentation.
  • Source:
    user/yeelam/cpp-console-sparse-add-imagescaler@f75df95c.
  • Validation: x64 Debug configure, build, link, and sparse registration passed.
    Runtime activation succeeded, but model readiness returned 0x80070490
    because no suitable model was installed.

Samples/WindowsML

Stable package and EP/performance behavior

WinUI initialization

WinML EP Catalog

Diagnostics

  • Imported WPR and WPA profiles for Windows ML, ONNX Runtime, and execution
    provider ETW events.
  • Hardened Get-WinMLRundown.ps1 instead of copying it unchanged:
    • no automatic Windows ADK installation;
    • explicit exporter and input validation;
    • isolated temporary CSV output;
    • no deletion of caller-owned CSV files; and
    • nonzero exporter failure propagation.
  • Source: main@177b65dc, PR Adding log files for capturing Windows ML logs #602.
  • Validation: PowerShell syntax, XML, isolation, cleanup, and failure
    propagation passed. Real WPR capture requires an elevated shell.

C++ ABI mitigation settings

Final difference audit

The complete WindowsML x64 Release solution passes with Windows App SDK 2.4.0
and no warnings or errors.

The following decisions remain intentionally separate:

Samples/AppContentSearch

  • Removed the complete sample from the stable branch.
  • It exists only in release/experimental, is absent from
    release/2.0-stable, and explicitly requires experimental AppContentSearch
    APIs and a Windows App SDK 2.0 experimental package.

Samples/WinUI/ConditionalPredicate

  • Removed the complete sample from the stable branch.
  • It exists only in release/experimental, is absent from
    release/2.0-stable, and explicitly requires the experimental conditional
    XAML predicate API and experimental split packages.

Samples/StoragePickers

  • Updated the runtime prerequisite documentation from Windows App SDK 1.8 to
    2.4.
  • No sample source behavior changed.

Samples/Widgets

Other Retained Sample Folders

All other retained MSBuild samples keep their release/experimental source and
directory layout. They inherit Windows App SDK 2.4.0 from
Samples/Directory.Packages.props; they did not receive unrelated source
changes from main.

The following broad differences were explicitly not imported:

Validation Summary

Successful validation includes:

  • WindowsML x64 Release with Windows App SDK 2.4.0;
  • WinML EP Catalog x64 Release and smoke test;
  • WindowsAIFoundry sparse WinForms and WPF x64 Release;
  • WindowsAIFoundry CMake sparse x64 configure, build, link, and registration;
  • Islands WinForms XAML Islands x64 Release;
  • Widgets x64 Release;
  • WindowsML Python stable dependency resolution without the ORT nightly feed;
    and
  • WindowsML diagnostics syntax, XML, isolation, cleanup, and failure tests.

Known environment or follow-up items:

  • final full retained-sample validation will be run separately;
  • C# WinUI ReadyToRun restore requires
    Microsoft.NETCore.App.Crossgen2.win-x64 8.0.30 in the test package source;
  • several native projects retain explicit v143 and require that toolset;
  • WindowsML WPR capture requires an elevated shell;
  • runtime AI scenarios require suitable models and hardware; and
  • the SqueezeNet clean-cache parallel download race remains a separate
    reliability issue.

Appendix: Main PR Disposition Ledger

Expand all 54 reviewed main PRs and their dispositions

Scope and Method

This ledger accounts for every first-parent commit on main after its fork
from the pinned release/experimental baseline:

Item Revision
Merge base 62316b1f7db932477d4a3811afb0bdaf91ae614b
Pinned main 18431c6d0111d6a4bd8d46b9c8a82add47ccb013
Pinned release/experimental 26eddcdf3240e6f0c89643ca3b7e303bbf3b6a78
Integration branch integration/main-reconciliation
Integration HEAD 09f6c687

There are 54 first-parent main commits in scope. PRs are used as the primary
unit because they explain intent better than commit subjects alone. The main
commit is retained as immutable evidence.

Already in baseline does not always mean an identical commit exists on
release/experimental. It can also mean that the release branch independently
contains the same final behavior or a later evolution of it. Eight commits are
strictly patch-equivalent according to
git cherry release/experimental main; those entries say so explicitly.

The dispositions are:

  • Already in baseline: no integration change was required.
  • Ported: the effective behavior was reapplied to the release layout.
  • Imported: a missing stable sample or tool was added.
  • Partially ported: only the applicable part was retained.
  • Omitted / superseded: a newer release implementation or an intentional
    branch decision replaced the main change.
  • Excluded: the content was reviewed and intentionally kept out.
  • Deferred: applicable work was separated from this reconciliation.
  • Reverted upstream: the main change was undone in the reviewed range.

PR-by-PR Disposition

PR #361 - Remove the Square sample app

  • Main commit/date: ba29b02e, 2024-07-02.
  • Area: Samples/Content and its CI definition.
  • Baseline relationship: the Square sample is also absent from
    release/experimental.
  • Disposition: Already in baseline.
  • Reason/evidence: the required final state is present; no integration commit
    was necessary.

PR #371 - Avoid direct nuget.org use in the aggregate pipeline

  • Main commit/date: b73d7ba9, 2024-08-16.
  • Area: Samples/nuget.config.
  • Baseline relationship: the release branch has a later feed layout using the
    public sample-dependency feed plus injectable localpackages.
  • Disposition: Omitted / superseded.
  • Reason/evidence: the release feed strategy was intentionally retained;
    copying this older config would discard release-side package testing
    behavior.

PR #375 - Build 2024 changes

PR #382 - Revert PR #375

PR #383 - Add the WinUI keyboard events scenario

  • Main commit/date: 9ffb7096, 2024-09-16.
  • Area: Samples/Input/cs-winui.
  • Baseline relationship: the Input sample exists, but
    KeyboardShortcutManager.xaml and its scenario registration do not.
  • Disposition: Ported.
  • Reason/evidence: the scenario source and registration were adapted to the
    release Net 8 and Central Package Management project in ee10b272; old
    package versions and project settings were not copied.

PR #399 - Mitigate shared BinSkim findings

  • Main commit/date: 8e5af645, 2024-12-05.
  • Area: shared C++ mitigation settings and self-contained deployment projects.
  • Baseline relationship: release PR Add Directory.Build.props #378 introduced the shared props, and
    later release changes retained the effective CFG, SDL, /dynamicbase,
    /Qspectre, and CET settings.
  • Disposition: Already in baseline.
  • Reason/evidence: current Samples/Directory.Build.props contains the
    effective mitigations; no main file replacement was needed.

PR #396 - Add the public NuGet feed

  • Main commit/date: d5d05186, 2024-12-05. The subject also references the
    originating PR Add Public NuGet Feed to Support Developers Without Private Feed Access #393.
  • Area: Samples/nuget.config.
  • Baseline relationship: the release config already uses the public
    WinAppSDK-SampleDeps feed and preserves localpackages injection.
  • Disposition: Omitted / superseded.
  • Reason/evidence: the newer release feed configuration was retained.

PR #404 - Add the initial Windows Copilot Runtime sample

  • Main commit/date: bbba82de, 2025-02-06.
  • Area: former Samples/WindowsCopilotRuntime.
  • Baseline relationship: the initial WCR gallery evolved into
    Samples/WindowsAIFoundry on the release branch.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: the obsolete WCR directory was not restored; the stable
    WindowsAIFoundry gallery was retained and reconciled instead.

PR #407 - Fix unpackaged WCR asset loading

  • Main commit/date: 71a9d5b7, 2025-02-20.
  • Area: WCR storage helpers, project configuration, and publish profiles.
  • Baseline relationship: the relevant helpers and unpackaged-app evolution are
    present in the successor WindowsAIFoundry sample.
  • Disposition: Already in baseline as evolved behavior.
  • Reason/evidence: restoring the old WCR tree would duplicate the successor
    sample.

PR #410 - Correct WCR run instructions

  • Main commit/date: 2dbf21fe, 2025-02-21.
  • Area: WCR documentation and package configuration.
  • Baseline relationship: the WCR project and its instructions were superseded
    by WindowsAIFoundry.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: obsolete project-specific instructions were not copied.

PR #414 - Refresh repository documentation

  • Main commit/date: cf8db73e, 2025-02-26.
  • Area: root README, header image, and sample guidelines.
  • Baseline relationship: release-side documentation continued independently
    and describes its larger sample set.
  • Disposition: Omitted / superseded.
  • Reason/evidence: the release README was retained and only reconciliation-
    specific WindowsML diagnostic links were later added in a3f39c7f.

PR #415 - Refactor Windowing to the Windows App SDK DispatcherQueue

  • Main commit/date: d3922307, 2025-03-07.
  • Area: Windowing plus the SecureUI test project.
  • Baseline relationship: Windowing exists in a newer release packaging layout;
    SecureUI is absent.
  • Disposition: Partially ported.
  • Reason/evidence: the DispatcherQueue/AppWindow behavior was ported in
    0c0a28fc. SecureUI was excluded because it is an incomplete isolated-
    desktop test project rather than a standalone public sample.

PR #416 - Add the WCR contribution guide

  • Main commit/date: f9f14066, 2025-03-17.
  • Area: former WCR documentation.
  • Baseline relationship: the directory was superseded by WindowsAIFoundry.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: WCR-specific contribution material was not restored.

PR #417 - Add WCR ARM64 configuration instructions

  • Main commit/date: 8bb871b1, 2025-03-19.
  • Area: former WCR README.
  • Baseline relationship: the old README was superseded by the release
    WindowsAIFoundry documentation.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: no obsolete documentation was copied.

PR #425 - Change the pull request template

  • Main commit/date: ba69392a, 2025-03-24.
  • Area: docs/pull_request_template.md.
  • Baseline relationship: the release branch retained a different checklist.
  • Disposition: Omitted / superseded.
  • Reason/evidence: PR Change PR template #425 contains a time-specific note that /azp run was
    not working and an internal-only validation link. It is process policy, not
    sample behavior, and was not carried into the reconciled sample branch.

PR #438 - Cherry-pick Background Task samples from experimental

  • Main commit/date: 37af04ab, 2025-04-08.
  • Area: Samples/BackgroundTask, root README, and BackgroundTask CI.
  • Baseline relationship: this PR explicitly originated from the experimental
    branch; the release baseline contains the sample and later release changes.
  • Disposition: Already in baseline.
  • Reason/evidence: importing the main copy would move the baseline backward.

PR #432 - Replace the SimpleIslandApp WebView with FlipView

  • Main commit/date: 72b7d1b9, 2025-04-09.
  • Area: Samples/Islands/cpp-win32-unpackaged.
  • Baseline relationship: the release sample retained the older WebView
    experience at a newer project layout.
  • Disposition: Ported.
  • Reason/evidence: the offline FlipView behavior and assets were ported to the
    retained release path in db1764b9.

PR #439 - Add UXFrameworksOnIslands and move SimpleIslandApp

  • Main commit/date: 562c3091, 2025-04-10.
  • Area: Samples/Islands.
  • Baseline relationship: UXFrameworksOnIslands is present in the baseline, but
    the baseline retains cpp-win32-unpackaged instead of main's moved
    SimpleIslandApp directory.
  • Disposition: Partially ported.
  • Reason/evidence: the existing UX sample was retained and later received the
    PR Build C++ samples with C++20 to fix STL1011, and map VS 2026 to v145 #657 compiler fixes in e24ee5eb; the directory move, packages.config,
    and hard-coded package imports were intentionally omitted.

PR #445 - Prepare the WCR sample for 1.8

  • Main commit/date: a755316d, 2025-04-16.
  • Area: former WCR gallery and documentation.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks a755316d as patch-equivalent.

PR #447 - Simplify WCR command-line run instructions

  • Main commit/date: cdf6aec5, 2025-04-22.
  • Area: former WCR README.
  • Baseline relationship: the old WCR documentation was superseded by
    WindowsAIFoundry documentation and packaging.
  • Disposition: Omitted / superseded.
  • Reason/evidence: the instructions no longer describe the retained project.

PR #452 - Update MSIX BuildTools references

  • Main commit/date: 82912c3a, 2025-04-23.
  • Area: package references across 122 project files.
  • Baseline relationship: the release branch moved projects to Central Package
    Management and later package versions.
  • Disposition: Omitted / superseded.
  • Reason/evidence: per-project version edits were not restored. The current
    stable dependency graph is centralized by 09f6c687.

PR #467 - Merge WCR and Windows AI API gallery work

  • Main commit/date: d21cc80b, 2025-05-20.
  • Area: transition from WindowsCopilotRuntime to WindowsAIFoundry.
  • Baseline relationship: the release branch contains a later WindowsAIFoundry
    gallery with additional feature work.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: the stable release gallery was reconciled in ab49e54a
    instead of importing this older tree.

PR #386 - Add the WinForms XAML Islands sample

  • Main commit/date: 4d1f233a, 2025-05-28.
  • Area: Samples/Islands/cs-winforms-unpackaged.
  • Baseline relationship: missing from release/experimental.
  • Disposition: Imported.
  • Reason/evidence: imported and converted to Central Package Management in
    e7794ab0.

PR #483 - Add Windows AI package permissions

  • Main commit/date: 8c29ea6f, 2025-07-01.
  • Area: WindowsAIFoundry project and package manifest.
  • Baseline relationship: the release WindowsAIFoundry successor contains the
    required permission evolution.
  • Disposition: Already in baseline as evolved behavior.
  • Reason/evidence: the stable gallery was retained and normalized rather than
    replacing its manifest with the older main version.

PR #518 - Add a WinUI class library to the WinForms Island sample

  • Main commit/date: aaff62fc, 2025-09-17.
  • Area: WinForms XAML Islands and SampleWinUIClassLibrary.
  • Baseline relationship: missing from release/experimental.
  • Disposition: Imported.
  • Reason/evidence: both coupled projects were imported in e7794ab0.

PR #527 - Add the initial WindowsML 1.8.1 sample family

  • Main commit/date: dd8e1668, 2025-09-23.
  • Area: Samples/WindowsML.
  • Baseline relationship: the release branch contains the WindowsML family
    plus later release-side structure, package, and reliability changes.
  • Disposition: Already in baseline as an evolved successor.
  • Reason/evidence: reconciliation started from the release WindowsML tree and
    reviewed only later main-only deltas.

PR #531 - Correct the ResNet C# registration API

  • Main commit/date: fb7a87c5, 2025-09-23.
  • Area: WindowsML/cs/ResnetBuildDemoCS.
  • Baseline relationship: the exact effective one-line fix is present.
  • Disposition: Already in baseline.
  • Reason/evidence: the PR patch reverse-applies cleanly to the retained file.

PR #530 - Improve WindowsML MSIX packaging

  • Main commit/date: 4f01fbe3, 2025-09-23.
  • Area: WindowsML C++, C#, and WinUI packaging.
  • Baseline relationship: the release WindowsML tree contains later packaging
    and Central Package Management evolution.
  • Disposition: Already in baseline as evolved behavior.
  • Reason/evidence: main's older project files were not copied over the newer
    release layout.

PR #534 - Consolidate ResNet projections and fix warnings

  • Main commit/date: 9de4fb5e, 2025-09-24.
  • Area: WindowsML C# projections and solution membership.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks 9de4fb5e as patch-equivalent.

PR #540 - Align WindowsML with the repository NuGet macro

PR #542 - Add Visual Studio detection to build.cmd

  • Main commit/date: 146e58c3, 2025-10-07.
  • Area: root build script.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks 146e58c3 as patch-equivalent.

PR #544 - Add WindowsML ABI execution-provider enumeration

  • Main commit/date: 83363856, 2025-10-07.
  • Area: WindowsML/cpp-abi.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks 83363856 as patch-equivalent.

PR #546 - Fix warnings in WindowsML C# WinUI

  • Main commit/date: 6bced4ce, 2025-10-09.
  • Area: WindowsML/cs-winui.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks 6bced4ce as patch-equivalent.

PR #545 - Add NuGet package source mappings

  • Main commit/date: 253cb094, 2025-10-15.
  • Area: Samples/nuget.config.
  • Baseline relationship: release testing depends on its own active public
    sample feed and injectable localpackages source.
  • Disposition: Omitted / superseded.
  • Reason/evidence: main's mapping encodes its older source and package-pattern
    set, while this reconciliation intentionally retained the release feed
    configuration. Feed hydration remains an environment concern rather than a
    branch code change.

PR #519 - Add WindowsML CMake samples

PR #238 - Correct Azure AppId terminology to ObjectId

  • Main commit/date: 70e13b7c, 2025-10-30.
  • Area: Notifications/Push/cpp-console-packaged.
  • Baseline relationship: release PR fix: resolve C4100 unreferenced parameter warnings across samples #513 independently fixed the same file's
    C4100 warning, but did not carry this terminology correction.
  • Disposition: Ported.
  • Reason/evidence: the two comment-only ObjectId edits were applied in
    ef2bc29b while retaining the release-side warning fix.

PR #572 - Add WindowsML model management

  • Main commit/date: c878baef, 2025-11-12.
  • Area: WindowsML model management and package updates.
  • Baseline relationship: the release WindowsML tree contains the model
    management evolution with later package and source changes.
  • Disposition: Already in baseline as evolved behavior.
  • Reason/evidence: the release implementation was retained.

PR #577 - Add native WindowsML compile and link switches

  • Main commit/date: 0676b07f, 2025-12-10.
  • Area: native WindowsML build settings.
  • Baseline relationship: equivalent release-side build behavior is already
    present, although the aggregate patch is not SHA-equivalent.
  • Disposition: Already in baseline.
  • Reason/evidence: the retained release build props contain the effective
    switches.

PR #578 - Refactor WindowsML Python samples

  • Main commit/date: 8393a02f, 2025-12-12.
  • Area: WindowsML/python.
  • Baseline relationship: strictly patch-equivalent to a release-side commit.
  • Disposition: Already in baseline.
  • Reason/evidence: git cherry marks 8393a02f as patch-equivalent.

PR #588 - Add execution-provider configuration options

PR #602 - Add WindowsML diagnostic capture tools

  • Main commit/date: 177b65dc, 2026-02-26.
  • Area: WPR/WPA profiles, scripts, and documentation.
  • Baseline relationship: missing from release/experimental.
  • Disposition: Imported.
  • Reason/evidence: imported and hardened for validation, temporary-file
    isolation, and failure propagation in a3f39c7f.

PR #597 - Partition native WindowsML sample outputs

  • Main commit/date: aec94421, 2026-03-21.
  • Area: native WindowsML build output and package cleanup.
  • Baseline relationship: equivalent release-side structure and build fixes
    are already present.
  • Disposition: Already in baseline.
  • Reason/evidence: the release implementation was retained rather than
    replacing its project files.

PR #593 - Add the WinML EP Catalog CMake sample

PR #609 - Disable sideloading telemetry DLLs

  • Main commit/date: d4df394e, 2026-03-30.
  • Area: Samples/Directory.Build.props.
  • Baseline relationship: release PR Fix BA2022 telemetry DLL binplacement on release/experimental #647 independently applies the same
    effective property.
  • Disposition: Already in baseline.
  • Reason/evidence: baseline commit a473238d sets
    AppxLogTelemetryFromSideloadingScript to false.

PR #629 - Avoid a Vitis AI null-provider-options crash

  • Main commit/date: 9f033250, 2026-04-20.
  • Area: shared WindowsML provider configuration.
  • Baseline relationship: main-only fix in the reviewed range.
  • Disposition: Ported.
  • Reason/evidence: included in the EP/performance reconciliation commit
    0f8f31d2.

PR #634 - Fix WindowsML EP and performance compile paths

  • Main commit/date: a1f17bc6, 2026-05-05.
  • Area: WindowsML native, managed, and shared source.
  • Baseline relationship: main-only bug-bash fixes.
  • Disposition: Ported.
  • Reason/evidence: included in 0f8f31d2.

PR #635 - Remove the unsupported DISABLE EP policy option

  • Main commit/date: 6e81dc60, 2026-05-06.
  • Area: WindowsML native, managed, and shared source.
  • Baseline relationship: main-only correction.
  • Disposition: Ported.
  • Reason/evidence: included in 0f8f31d2.

PR #625 - Initialize the WindowsML WinUI application resources

  • Main commit/date: b86248e9, 2026-05-27.
  • Area: WindowsML/cs-winui.
  • Baseline relationship: the initialization call was absent.
  • Disposition: Ported.
  • Reason/evidence: App.InitializeComponent() was added in 3401626e.

PR #642 - Correct TensorRT RTX provider matching

  • Main commit/date: 73606301, 2026-05-27.
  • Area: WindowsML native and shared provider logic.
  • Baseline relationship: main-only correction.
  • Disposition: Ported.
  • Reason/evidence: included in 0f8f31d2.

PR #641 - Correct CppConsoleDll expected output

  • Main commit/date: b82ddd7f, 2026-05-27.
  • Area: WindowsML CppConsoleDll documentation and cleanup.
  • Baseline relationship: the retained sample required the correction.
  • Disposition: Ported.
  • Reason/evidence: completed in the final WindowsML audit commit 86903001.

PR #643 - Move WindowsML to the stable 2.1.3 package graph

  • Main commit/date: f37e15e9, 2026-06-02.
  • Area: WindowsML packages, CMake, Python, shared behavior, and sample cleanup.
  • Baseline relationship: a mixed change containing stable fixes, package
    transitions, generated imports, and sample removals.
  • Disposition: Partially ported.
  • Reason/evidence: stable EP behavior, Python dependencies, catalog fallback,
    and EP Catalog location/package changes were incorporated by 0f8f31d2,
    8d73c7c5, and 86903001. Generated packages.config imports and hard-coded
    paths were omitted. Removal of CppConsoleDll, CppResnetBuildDemo, and
    ResnetBuildDemoCS remains deferred to final review.

PR #653 - Cherry-pick the cpp-abi CFG change

PR #655 - Complete cpp-abi BinSkim mitigations

  • Main commit/date: f5ec17bf, 2026-07-17.
  • Area: WindowsML/cpp-abi.
  • Baseline relationship: main contains additional CFG, SDL, /dynamicbase,
    /Qspectre, and CET configuration.
  • Disposition: Ported.
  • Reason/evidence: the effective settings were adapted to release Central
    Package Management in 099aa2f7; generated package imports were omitted.

PR #657 - Use C++20 and map Visual Studio 2026 to v145

  • Main commit/date: 18431c6d, 2026-08-11.
  • Area: shared C++ props, AppLifecycle, Islands, and Widgets.
  • Baseline relationship: the Visual Studio 2026 mapping was already present,
    while the C++20 and compiler-conformance changes were only partly present.
  • Disposition: Partially ported / partially deferred.
  • Reason/evidence: applicable C++20, AppLifecycle, Islands, and Widgets fixes
    were ported in e24ee5eb. Repository-wide removal of project-local v143
    selections was intentionally deferred to a separate PR.

Accounting

All 54 first-parent main commits are represented exactly once above:

Final disposition Count
Already in baseline, including evolved successors 25
Ported or imported 15
Partially ported 4
Omitted or superseded 8
Reverted upstream 2
Total 54

The eight strictly patch-equivalent main commits are:

a755316d  PR #445
9de4fb5e  PR #534
8adfdf35  PR #540
146e58c3  PR #542
83363856  PR #544
6bced4ce  PR #546
8393a02f  PR #578
c4bd030b  PR #653

This ledger is maintained in the PR description rather than committed as
repository content.

Qiutong Shen (from Dev Box) and others added 21 commits August 24, 2026 13:27
Qiutong Shen (from Dev Box)
Add main branch reconciliation design and matrix
a6655bb 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Port shared C++ build compatibility fixes
e24ee5e 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Import WinForms XAML Islands sample
e7794ab 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Port SimpleIslandApp FlipView experience
db1764b 
Port the offline FlipView and its image assets while retaining the existing directory layout and central package management.

Source: main@72b7d1b9 (#432)

Omitted: directory move from main@562c3091 (#439)

Validation: x64 Release remains blocked by a pre-existing duplicate WindowsAppRuntimeAutoInitializer.cpp error reproduced on the committed baseline.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Port Windowing DispatcherQueue refactor
0c0a28f 
Port the native Windowing runtime changes from main@d3922307 (PR #415), originally under Samples/Windowing/cpp/cpp-win32, while retaining central package management and the stable 1.8 SDK configuration.

Record the approved AppLifecycle and ResourceManagement packaging dispositions, exclude SecureUI, and document the pre-existing Foundation auto-initializer build failure.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Stabilize Windows AI Foundry WinUI gallery
ab49e54 
Align Samples/WindowsAIFoundry/cs-winui with release/2.0-stable@5327f5c4. Remove the experimental VideoScaler and ImageForegroundExtractor scenarios from PRs #592 and #594, update the TextRecognizer example, and use the stable 2.1.3 package selected by PR #638.

Retain baseline encoding and later fixes, record the completed Windowing packaging review, and document remaining cross-project runtime normalization work. The targeted build is blocked by a missing Crossgen2 8.0.30 package, reproduced on the committed baseline.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Normalize Windows AI stable runtime references
cfd5d53 
Use the stable 1.8 framework identity and minimum version from Microsoft.WindowsAppSDK.Runtime 1.8.250916003 metadata.

Port the packaged WPF Bootstrap removal from acbc15e and keep the CMake retarget as a separate pending decision.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Stabilize Windows AI Foundry CMake sample
cd07c07 
Retarget the custom vcpkg overlay and sparse package to Windows App SDK 2.1.3 without importing the feature-branch ImageScaler scenario.

Set explicit vcpkg triplets, correct the CMake build and sparse registration documentation, and record the x64 validation results.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Port WindowsML stable EP performance support
0f8f31d 
Align the WindowsML central package set with stable Windows App SDK 2.1.3 and port the main-only EP performance chain from PRs #588, #634, #635, #629, #642, and #643.

Preserve release Central Package Management, defer the PR #643 legacy sample removals to final integration review, and record the x64 Release validation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Initialize WindowsML WinUI application resources
3401626 
Port main PR #625 so the WindowsML WinUI App initializes its XAML resources before launching the main window.

Record that the fix is absent from the pinned release branches and validate the complete WindowsML x64 Release solution.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Import stable WinML EP Catalog sample
8d73c7c 
Import the CMake WinML C API sample introduced by main PR #593 and moved and stabilized by PR #643. Record its independent build boundary, provenance, and x64 validation in the reconciliation docs and matrix.

Source-commit: 64eee70
Source-commit: f37e15e

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Import WindowsML diagnostic capture tools
a3f39c7 
Import the stable WPR and WPA profiles from main PR #602, link them from the repository documentation, and harden rundown conversion so it does not install system components or delete caller-owned CSV files. Record targeted validation and the administrator-only WPR capture follow-up.

Source-commit: 177b65d

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Defer SqueezeNet download race fix
843e2d8 
Retain the release branch target behavior during main reconciliation and record the clean parallel download race as a separate reliability PR. Clarify that the main-only target difference does not resolve the reproduced contention.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Port WindowsML cpp-abi CFG settings
099aa2f 
Port main PR #655's complete CFG and SDL configuration while retaining the release Central Package Management project. Exclude main's generated packages.config imports and record the source and validation in the reconciliation docs and matrix.

Source-commit: f5ec17b

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Complete WindowsML reconciliation audit
8690300 
Port the retained CppConsoleDll cleanup, complete the stable Python 2.1.3 dependency migration without the ORT nightly feed, and restore the C# Model Catalog missing-file fallback. Record the final file-level audit and mark WindowsML reconciliation complete while preserving documented deferrals.

Source-commit: b82ddd7
Source-commit: f37e15e

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Exclude experimental-only stable samples
f9dedf8 
Document the Windows App SDK 2.4 dependency unification plan and scope UpdateVersions.ps1 to explicit central package files.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Upgrade central dependencies to Windows App SDK 2.4
09f6c68 
Move retained MSBuild samples onto the root 2.4 graph, keep only WindowsML-specific central versions locally, and align sparse runtime manifests and documentation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Remove reconciliation tracking artifacts
160a1ab 
Keep temporary design and matrix records out of the final squashed repository content.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Add Input keyboard events scenario
ee10b27 
Port the stable keyboard event and accelerator scenario from main PR #383 while retaining the release project configuration and central package management.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Correct Push notification Azure identifier terminology
ef2bc29 
Port the AppId-to-ObjectId documentation correction from main PR #238.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qiutong Shen (from Dev Box)
Align CMake samples with stable package graph
817ff7b 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@yeelam-gordon Gordon Lam (yeelam-gordon) yeelam-gordon approved these changes
Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@qiutongMS @yeelam-gordon