Skip to content

Reconcile main and release/2.0-stable source trees - #668

Draft
shisan (qiutongMS) wants to merge 4 commits into
release/2.0-stablefrom
integration/main-stable-reconciliation
Draft

Reconcile main and release/2.0-stable source trees#668
shisan (qiutongMS) wants to merge 4 commits into
release/2.0-stablefrom
integration/main-stable-reconciliation

Conversation

@qiutongMS

@qiutongMS shisan (qiutongMS) commented Sep 4, 2026

Copy link
Copy Markdown

Description

Goal

Align main and release/2.0-stable to the same buildable source tree, while preserving both branches' histories in main.

Approach

Use release/2.0-stable as the baseline because the main delta is smaller. This reconciliation is organized into four reviewable commits:

  1. [SOURCE] - Add 2 sample solutions, reconcile updates across 18 existing sample areas, and remove 10 retired sample solutions based on main, while retaining 4 stable-only sample areas.
  2. [INTEGRATION] - Reconcile CPM, solution and WAP wiring, package identity, runtime initialization, and pipeline integration.
  3. [MECHANICAL] - Apply six repository-wide rules for package migration, toolsets, C++20, and publish metadata. These changes can be reviewed by rule rather than file by file.
  4. [SEMANTIC] - Apply the minimum behavioral adaptation required by the combined tree; only two files are changed.

Please review the four commits separately. Functional review should focus on [INTEGRATION] and [SEMANTIC]; [MECHANICAL] contains only repeatable bulk transformations.

[SOURCE] inventory

The source composition changes 562 paths relative to release/2.0-stable. Each resulting changed blob comes directly from the pinned main revision; retained stable content remains unchanged.

  • Added from main:
    • WinForms XAML Islands, together with its supporting WinUI class library.
    • SecureUI.
  • Major updates from main:
    • Islands: replace the older DrawingIsland, UXFrameworksOnIslands, and C++ SimpleIsland solutions with the WinForms XAML Islands sample and supporting WinUI class library.
    • WindowsML: bring in the current execution-provider, performance, model-management, diagnostics, and sample updates.
    • Input: add the Keyboard Shortcut Manager scenario.
    • Notifications: remove the retired Badge samples and retain the current App and Push implementations.
    • Windowing and AppLifecycle: bring in the current source and packaging layouts.
  • Additional source synchronization: Composition, CustomControls, DeploymentManager, Insights, Installer, Mica, PhotoEditor, ResourceManagement, SelfContainedDeployment, TextRendering, Unpackaged, and Widgets.
  • Removed to match main: 10 retired sample solutions: 4 BackgroundTask solutions, 3 older Islands solutions, 2 Notifications Badge solutions, and 1 Unpackaged WinForms solution.
  • Retained from stable: the stable-only CameraCaptureUI, DynamicDependenciesSample, OAuth2Manager, and StoragePickers sample areas, plus the stable-evolved WindowsAIFoundry implementation.
  • Repository-level source updates from main: sample feed hydration and restore tooling, build entry points, templates, and sample documentation.

Result

This PR merges integration/main-stable-reconciliation into release/2.0-stable. A follow-up PR will merge integration/main-stable-reconciliation-final into main.

The review and final branches contain exactly the same code. The final branch only adds the ancestry required to preserve both branch histories in main.

Target Release

2.0 Stable

Validation

  • Source provenance, commit boundaries, CPM, solution/WAP references, and updater modes have been audited.
  • The five external-WAP solutions build for x64 and ARM64 Release with valid package layouts.
  • Full Aggregator pipeline validation is pending.

Checklist

Compose the pinned main source tree with the approved stable-only and evolved sample inventory.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@qiutongMS
shisan (qiutongMS) force-pushed the integration/main-stable-reconciliation branch from 34b1275 to 09fed94 Compare September 4, 2026 16:49
Qiutong Shen (from Dev Box) and others added 3 commits September 5, 2026 02:02
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Use the public ToggleButton state API with the Windows App SDK 2.4 projection and document the complete reconciled sample inventory.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@qiutongMS
shisan (qiutongMS) force-pushed the integration/main-stable-reconciliation branch from 09fed94 to ea44ee9 Compare September 4, 2026 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant