FI: main to release/dev/monobuild#6560
Open
kythant wants to merge 3 commits into
Open
Conversation
… making downloading-latest-package opt-in (#6555) * Fix Foundation PR builds: make latest-nightly VSIX download opt-in * Disambiguate by-branch nightly download step name
Brings 2 commits from main into release/dev/monobuild: - 78ae54d Bump to latest majors (#6550) - 9f95bdf Fix break on Foundation PR builds: restore original build behavior by making downloading-latest-package opt-in (#6555) 1 conflict, resolved in favor of HEAD (monobuild): build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml main's #6555 reintroduces the legacy LatestOfficialBuildID pinned-download path and adds an opt-in UseLatestNightlyFromBranch parameter that points back at OfficialPipelineID. monobuild already has its own resolution for this: by-branch download from the OS-project monobuild nightly (pipeline: 190463) with NightlyBranchName defaulting to 'refs/heads/release/dev/monobuild'. Adopting main's opt-in path would re-introduce the cross-project lookup that broke PR #6549 validation, so keep monobuild's version as-is. The other 2 files auto-merged cleanly: .github/workflows/build.yml build/AzurePipelinesTemplates/WindowsAppSDK-VSIXTemplates-BuildValidation-Stage.yml
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s), but failed to run 1 pipeline(s). |
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
3 participants
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.
FI from main into
elease/dev/monobuild.
Brings 2 commits from main:
Conflict resolution
1 conflict in �uild/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml, resolved in favor of HEAD (monobuild).
main's #6555 reintroduces the legacy LatestOfficialBuildID pinned-download path and adds an opt-in UseLatestNightlyFromBranch parameter that points back at OfficialPipelineID. monobuild already has its own resolution for this: by-branch download from the OS-project monobuild nightly (pipeline 190463) with NightlyBranchName defaulting to
efs/heads/release/dev/monobuild. Adopting main's opt-in path would re-introduce the cross-project lookup that broke PR #6549 validation, so keeping monobuild's version as-is.
The other 2 files auto-merged cleanly: