Skip to content

Snap release/2.0-stable to release/2.0-experimental - #6527

Merged
agniuks merged 12 commits into
release/2.0-experimentalfrom
user/agnel/snap_june_exp
Jun 2, 2026
Merged

Snap release/2.0-stable to release/2.0-experimental#6527
agniuks merged 12 commits into
release/2.0-experimentalfrom
user/agnel/snap_june_exp

Conversation

@agniuks

@agniuks agniuks commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Manual snap from release/2.0-stable to release/2.0-experimental so the upcoming 2.0-experimental release picks up all servicing changes from stable.

Source commit: ec4c96b


IMPORTANT: Do NOT squash merge this PR!
Use 'Merge (preserve all commits)' to maintain the complete commit history.

* Update Bootstrapper for WinAppSDK 2.x/SemVer

* Drop Compatibility.v1.x as it's a big cost to day-to-day for low gain (poor ROI). Better handled at the higher level testing actual product instead of testing via a UT

* Drop Compatibility.v1.x

* Fix a bad sprintf edit

* More test fixes

* More test fixes

* Fix VersionShortTag and Installer output

* SemVer now only uses Major, and has a different possible Tag

* Remove an extra '\'

* Allow old or new in the Installer match

* Missed the framework Regex

---------

Co-authored-by: Chris Wall (WIN SDE) <chriwall@microsoft.com>
Co-authored-by: Dreynor87 <wall_c.s@outlook.com>
…ary (#6462)

* Automate Patch and Revision versions using Azure DevOps Variable Library

Add version automation to the Open (Foundation) repo, mirroring the pattern
from the Aggregator repo. Uses a separate '{MajorVersion}-Foundation-Versions'
Library to track PatchVersion and Revision across builds.

- Add WindowsAppSDK-VersionVariables.yml to load version vars from Library
- Add WindowsAppSDK-UpdateLibrary-Job.yml to bump versions after official builds
- Update Official/PR/Nightly pipelines to include version templates
- Update PackTransportPackage to use Library-based versioning for official builds
- Patch only bumps on official builds (not PR or Nightly)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Remove the system.debug, since parameters.debug is empty

* Change name of pipeline run

* Respond to Agne 1

* Revert the change to depending on Publish

---------

Co-authored-by: Chris Wall (WIN SDE) <chriwall@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…fic PRI files (#6376) (#6492)

* Fix sparse-packaged apps unable to discover module-specific PRI files (#6376)

* Fix sparse-packaged apps unable to discover module-specific PRI files

Sparse-packaged apps have package identity (via AddPackageByUriAsync) but
deploy resources as loose files next to the executable. GetDefaultPriFile()
determines isPackaged=true for these apps (since they have identity), causing
GetDefaultPriFileForCurentModule to pass "resources.pri" to
MrmGetFilePathFromName — which only searches for that exact filename,
skipping the [modulename].pri fallback that unpackaged apps receive.

When the "resources.pri" search fails for apps with identity, fall back to
the unpackaged discovery path (pass nullptr to MrmGetFilePathFromName) which
triggers the broader search including "[modulename].pri" derived via
PathCchRenameExtension from the process executable name.

If the fallback also fails, return the original HRESULT from the
"resources.pri" search so callers that check for specific errors
(e.g., ERROR_FILE_NOT_FOUND) are not broken.

Existing test coverage:
- DefaultResourceManagerWithExePri validates the nullptr fallback mechanism
- DefaultResourceManager validates error behavior when no PRI exists
- DefaultResourceManagerWithResourcePri validates the normal packaged path

A full sparse-app integration test requires actual sparse package
registration (AddPackageByUriAsync) which is beyond unit test scope.

Fixes: microsoft/microsoft-ui-xaml#10856

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Address PR review: simplify flow, shorten comment, gate on file-not-found

* Add backward-compatibility comment on return hr

* Move backward-compat comment to fallback block for clarity

* Keep comment sentences on single lines

* Use existing IsResourceNotFound() helper instead of manual HRESULT checks

* Merge two-line comment into single line

Agent-Logs-Url: https://github.com/microsoft/WindowsAppSDK/sessions/ed36cfc6-52ad-414b-8e1a-dc16f413a97e

Co-authored-by: yeelam-gordon <73506701+yeelam-gordon@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

* Add containment for sparse PRI fallback fix

Bug 62382643: gate the sparse PRI fallback with containment so
it can be rolled back if needed.

* Fix containment version to WinAppSDK_2_1_5

* Fix bug ID in containment comment

* Contain all changed code inside containment gate

* Use IsPackagedProcess() for package detection inside containment

* Add MRTCore_SparsePackagedPriFallback to RuntimeCompatibilityChange enum

* Revert "Add MRTCore_SparsePackagedPriFallback to RuntimeCompatibilityChange enum"

This reverts commit 73d274f.

---------

Co-authored-by: Gordon Lam <73506701+yeelam-gordon@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: agniuks <41223743+agniuks@users.noreply.github.com>
The currently-published Foundation packages on nuget.org are 2.0.21
(stable) and 2.0.22-experimental. Bump the hardcoded patch from 21 to 23
so the next 2.2.0 RC build doesn't collide with either.

This is a manual bump because the patch-version automation (PR #6486)
has not yet landed on release/2.0-stable.

Co-authored-by: Agnel Kurian <agnelk@microsoft.com>
#6513)

* Update dependencies from https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP build 20260527.1
On relative base path root
Microsoft.FrameworkUdk , Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage From Version 2.0.0-stable-27200.1023.260525-0800.2 -> To Version 2.0.0-stable-27200.1024.260527-1035.0
Microsoft.WindowsAppSDK.InteractiveExperiences From Version 2.0.14-stable-Rolling.20260525.3 -> To Version 2.0.14-stable-Rolling.20260527.1

* Update dependencies from https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP build 20260528.1
On relative base path root
Microsoft.FrameworkUdk , Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage From Version 2.0.0-stable-27200.1023.260525-0800.2 -> To Version 2.0.0-stable-27200.1024.260527-1035.1
Microsoft.WindowsAppSDK.InteractiveExperiences From Version 2.0.14-stable-Rolling.20260525.3 -> To Version 2.0.15

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: agniuks <41223743+agniuks@users.noreply.github.com>
Co-authored-by: Agnel Kurian <agnelk@microsoft.com>
…sOnStable

User/chriwall/automate versions on stable
@agniuks

agniuks commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

Closing - opened in wrong repo by mistake. Will redo against microsoft-ui-xaml-lift.

@agniuks agniuks closed this Jun 2, 2026
@agniuks
agniuks deleted the user/agnel/snap_june_exp branch June 2, 2026 16:11
@agniuks
agniuks restored the user/agnel/snap_june_exp branch June 2, 2026 17:24
@agniuks agniuks reopened this Jun 2, 2026
@agniuks

agniuks commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@agniuks
agniuks merged commit 5882468 into release/2.0-experimental Jun 2, 2026
10 of 20 checks passed
@agniuks
agniuks deleted the user/agnel/snap_june_exp branch June 2, 2026 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants