[REBASE&FF] BaseTools: WindowsVsToolChain: Fitler vs vars on specific vc - #1944
Merged
Joey Vagedes (Javagedes) merged 2 commits intoSep 29, 2026
Conversation
…icrosoft#1310)" This reverts commit 3490e2a.
Filters the extra vs vars gathered via QueryVcVariables() to specifically be the ones associated with the vc version set in the same plugin. This is to prevent the version compiler version differenting from the version of any included .c / .h files that are made available through the vs vars such as LIB, INCLUDE, etc. Additionally logs a message when multiple vc versions are detected on the system and specifically which vc version is being used. Signed-off-by: Joey Vagedes <joey.vagedes@gmail.com> (cherry picked from commit d07d3f5a5769cc8c9f76385174b73ea85525077d)
Joey Vagedes (Javagedes)
requested review from
Aaron (apop5),
Michael Kubacki (makubacki) and
Oliver Smith-Denny (os-d)
September 29, 2026 14:22
Contributor
✅ QEMU Validation PassedSource Dependencies
Results
Workflow run: https://github.com/microsoft/mu_basecore/actions/runs/36583235227 This comment was automatically generated by the Mu QEMU PR Validation workflow. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release/202608 #1944 +/- ##
=================================================
Coverage ? 1.86%
=================================================
Files ? 1674
Lines ? 423339
Branches ? 5159
=================================================
Hits ? 7878
Misses ? 415366
Partials ? 95
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Oliver Smith-Denny (os-d)
approved these changes
Sep 29, 2026
Aaron (apop5)
approved these changes
Sep 29, 2026
Michael Kubacki (makubacki)
approved these changes
Sep 29, 2026
Joey Vagedes (Javagedes)
merged commit Sep 29, 2026
d5246fc
into
microsoft:release/202608
103 checks passed
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
5 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.
Description
This pull request reverts the MU_BASECORE commit and cherry-picks the edk2 commit using
git cherry-pick -x <commit>.How This Was Tested
N/A
Integration Instructions
N/A