Reconcile stable sample changes into main - #665
Open
shisan (qiutongMS) wants to merge 7 commits into
Open
Conversation
shisan (qiutongMS)
force-pushed
the
integration/main-cpm
branch
3 times, most recently
from
September 2, 2026 03:32
b5e19a0 to
b05b442
Compare
shisan (qiutongMS)
force-pushed
the
integration/main-cpm
branch
from
September 2, 2026 05:29
977abb1 to
cd1aba3
Compare
Project the centralized NuGet package management model established on release/2.0-stable by PR #590 onto the current main sample set and package baselines. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Match the sample layout established on release/2.0-stable by PR #590 and inherit the root Samples package graph instead of maintaining a separate dependency boundary. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
shisan (qiutongMS)
force-pushed
the
integration/main-cpm
branch
from
September 2, 2026 05:31
cd1aba3 to
0212804
Compare
Bring the established release/2.0-stable source fixes into the retained main samples. Resolve the C4100 warnings covered by PR #513, preserve the newer Push notification ObjectId guidance, and add the WIL C++/WinRT support include required by the stable Insights CPM conversion in PR #590. Stable evidence: PR #513 / 081a0f4 and PR #590 / f933100. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Bring the straightforward release/2.0-stable sample set into main in one reconciliation step: BackgroundTask, CameraCaptureUI, OAuth2Manager, Badge notifications, StoragePickers, Unpackaged WinForms, DrawingIsland, and UXFrameworksOnIslands. Keep the stable sample behavior while adapting package references, native toolsets, documentation, and CI wiring to the current main infrastructure. Stable evidence: PRs #367, #392, #395, #398, #400, #402, #403, #405, #413, #421, #422, #427, #455, #512, and #590. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Adopt the release/2.0-stable single-project MSIX layout for the ResourceManagement and Windowing C++ WinUI samples. Move byte-identical package assets and manifests into the application projects, remove the redundant WAP projects, and keep all sample source behavior unchanged. Stable evidence: PR #590 / f933100 on release/2.0-stable. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
release/2.0-stablecontains established sample changes that are still missing frommain. This PR incrementally reconciles those changes intomain.This is not a wholesale branch merge, and CPM is only the first part of the reconciliation. Each commit represents one independently reviewable and validated reconciliation step. A step may contain several straightforward samples when they share the same operation, while complex sample families remain separate commits. Every completed commit records what changed and the corresponding evidence on
release/2.0-stable.Reconciled commits
ba853167— Adopt stable branch central package managementWhat changed
packages.configto directPackageReference.ReferenceOutputAssembly=falseto native WAP project references.UpdateVersions.ps1to update every matching declaration across all repositoryDirectory.Packages.propsfiles and fail if stale resolved dependency versions remain.Stable evidence
f9331002onrelease/2.0-stableMain adaptation
Versions already present on
mainremain the baseline where the branches differ. SecureUI exists only onmain, so its retained native project applies the same CPM and WAP integration pattern used by the stable Windowing sample.0212804f— Move DynamicDependencies under SamplesWhat changed
DynamicDependenciesSampletoSamples/DynamicDependenciesSample.Directory.Packages.props.Samplesbuild settings.Stable evidence
f9331002onrelease/2.0-stable3d6270a3— Port stable fixes to existing samplesWhat changed
mainPush notificationObjectIdguidance.Stable evidence
081a0f44onrelease/2.0-stablef9331002onrelease/2.0-stable0a81c45b— Import established stable samplesWhat changed
v145/ VS 2022v143selection pattern to imported native projects.Stable evidence
f9331002onrelease/2.0-stablea9e12a71— Align stable sample packagingWhat changed
main.Stable evidence
f9331002onrelease/2.0-stablea46feef3— Reconcile Windows AI Foundry samplesWhat changed
Stable evidence
08b6f95donrelease/2.0-stable1b5c3142onrelease/2.0-stable2cbefb54onrelease/2.0-stablef4876c92onrelease/2.0-stableMain adaptation
The imported MSBuild projects now participate in
main's root CPM graph. The MAUI workload's former inline versions were centralized because NuGet rejects them under CPM; the CMake sample remains on its stable, self-contained vcpkg dependency graph rather than introducing the deferred root-to-CMake version bridge.c0bef5c8— Reconcile WindowsML samplesWhat changed
mainexecution-provider, performance, model-catalog, diagnostics, cpp-abi, and WinMLEpCatalog work.Stable evidence
a08ec174onrelease/2.0-stabled523b8deonrelease/2.0-stable1a3488a3onrelease/2.0-stable5327f5c4onrelease/2.0-stableMain adaptation
The imported native projects use the current
v145toolset and inheritmain's WindowsML security settings. Becausemainisolates native outputs per project, ConsoleClient explicitly copies WindowsMLWrapper into its output directory; the scoped WindowsML CPM graph and all newer provider/readiness behavior remain unchanged.Validation
Samples/Directory.Packages.props. The ARM64 packaged-app launch tests consequently retained the checked-in 2.4.0 runtime dependency and failed with0x80073CF3. This run is not counted as passing validation; it must be rerun after the Aggregator updater handles root CPM.