Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Users/merlynop/mergenode20 #20769

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft

Users/merlynop/mergenode20 #20769

wants to merge 33 commits into from
+145,107 −1,588,602

Conversation

merlynomsft
Copy link
Contributor

Task name:

Description:

Documentation changes required: (Y/N)

Added unit tests: (Y/N)

Attached related issue: (Y/N)

Checklist:

  • Task version was bumped - please check instruction how to do it
  • Checked that applied changes work as expected

@merlynomsft
merge base wip
1264eba
@merlynomsft
mergebase implementation
3fc8752
@merlynomsft
fix .tmp exists error due to double-deleting _buildconfig override files
2d251c4
@merlynomsft
// 1. keep version of config being merged (only bump version if needed!)
ae4b17a 
//     2. we'll assume that any configs needed for the 'merged' buildconfig are enabled
//        this means, we won't bump version even if the build config version is 'lower' than the base version
@merlynomsft
add bugs /todos
85fe65f
@merlynomsft
update todo
7bb9053
@merlynomsft
another todo
1d68382
@merlynomsft
Remove unneeded #ifelse to simplify merging baseconfigs
aa625ed 
Only erase preprocessor instructions being merged.. . if X is to be collapsed, collapse all #if X ... #else ... #endif into content of #if block (erasing #else).  but retain #if Y ... #else ... #endif
Fix to retain default buildconfig when other configs present
@merlynomsft
disable merges (initially)
0be07c6 
verify scenerio will enforce merge for config (note)
@merlynomsft
cleanup
718f704
@merlynomsft
ensure we don't overwrite base version with a "lower" version number …
fe32f1f 
…when merging config
@merlynomsft
Merge branch 'master' into users/merlynop/mergebase
95581a1
@merlynomsft
bump
c396a9a
@merlynomsft
test
e0119a6
@merlynomsft
node 20 clean up test
51118e3
@merlynomsft
Merge remote-tracking branch 'origin/master' into users/merlynop/merg…
01e39d1 
…enode20
@merlynomsft
fix cfs issues
98fcc8a
@merlynomsft
update make-options
2a15cde
@merlynomsft
Revert "update make-options"
3d5402a 
This reverts commit 2a15cde.
@merlynomsft
Revert "fix cfs issues"
e393b58 
This reverts commit 98fcc8a.
@merlynomsft
Revert "node 20 clean up test"
e28d681 
This reverts commit 51118e3.
@merlynomsft
fix for merging tasks with multiple configs
ba50b27
@merlynomsft
test node20 cleanup
2746cd3
@merlynomsft
fix verify-registries.js to handle deleted configs , update make-options
6451ce2
@merlynomsft
cfs fixes
5a48ae6
@merlynomsft
ci
2771c05
@merlynomsft
revert make-options.json
80be06f
@merlynomsft
Revert "cfs fixes"
f2bf6d6 
This reverts commit 5a48ae6.
@merlynomsft
Revert "test node20 cleanup"
557eed7 
This reverts commit 2746cd3.
@merlynomsft
Merge remote-tracking branch 'origin/master' into users/merlynop/merg…
9c295bb 
…enode20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tarunramsinghani tarunramsinghani Awaiting requested review from tarunramsinghani tarunramsinghani will be requested when the pull request is marked ready for review tarunramsinghani is a code owner

@DergachevE DergachevE Awaiting requested review from DergachevE DergachevE will be requested when the pull request is marked ready for review DergachevE is a code owner

@rasunkar rasunkar Awaiting requested review from rasunkar rasunkar will be requested when the pull request is marked ready for review rasunkar is a code owner

@carl-tanner carl-tanner Awaiting requested review from carl-tanner carl-tanner will be requested when the pull request is marked ready for review carl-tanner is a code owner

@fadnavistanmay fadnavistanmay Awaiting requested review from fadnavistanmay fadnavistanmay will be requested when the pull request is marked ready for review fadnavistanmay is a code owner

@b-barthel b-barthel Awaiting requested review from b-barthel b-barthel will be requested when the pull request is marked ready for review b-barthel is a code owner

@kunalkaroth kunalkaroth Awaiting requested review from kunalkaroth kunalkaroth will be requested when the pull request is marked ready for review kunalkaroth is a code owner

@manolerazvan manolerazvan Awaiting requested review from manolerazvan manolerazvan will be requested when the pull request is marked ready for review manolerazvan is a code owner

@YevheniiKholodkov YevheniiKholodkov Awaiting requested review from YevheniiKholodkov YevheniiKholodkov will be requested when the pull request is marked ready for review YevheniiKholodkov is a code owner

@jvano jvano Awaiting requested review from jvano jvano will be requested when the pull request is marked ready for review jvano is a code owner

@dannysongg dannysongg Awaiting requested review from dannysongg dannysongg will be requested when the pull request is marked ready for review dannysongg is a code owner

@mkarmark mkarmark Awaiting requested review from mkarmark mkarmark will be requested when the pull request is marked ready for review mkarmark is a code owner

@joslinmicrosoft joslinmicrosoft Awaiting requested review from joslinmicrosoft joslinmicrosoft will be requested when the pull request is marked ready for review joslinmicrosoft is a code owner

@marianan marianan Awaiting requested review from marianan marianan will be requested when the pull request is marked ready for review marianan is a code owner

@FinVamp1 FinVamp1 Awaiting requested review from FinVamp1 FinVamp1 will be requested when the pull request is marked ready for review FinVamp1 is a code owner

@patelchandni patelchandni Awaiting requested review from patelchandni patelchandni will be requested when the pull request is marked ready for review patelchandni is a code owner

@cormacpayne cormacpayne Awaiting requested review from cormacpayne cormacpayne will be requested when the pull request is marked ready for review cormacpayne is a code owner

@daniv-msft daniv-msft Awaiting requested review from daniv-msft daniv-msft will be requested when the pull request is marked ready for review daniv-msft is a code owner

@imenkov imenkov Awaiting requested review from imenkov imenkov will be requested when the pull request is marked ready for review imenkov is a code owner

@lucen-ms lucen-ms Awaiting requested review from lucen-ms lucen-ms will be requested when the pull request is marked ready for review lucen-ms is a code owner

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.
1 participant
@merlynomsft