Skip to content

Cherry pick LKG/MsUCRT fixes #4970

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.

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

Merged
merged 2 commits into from
Dec 14, 2024
Merged

Conversation

Scottj1s
Copy link
Member

@Scottj1s Scottj1s commented Dec 13, 2024

See:
#4933

…tatic_assert build errors on mismatch (#4933)

* include STL/CRT libs/headers with LKG

* add platform

* opt into internal UCRT

* opt into undocked settings loaded

* publish binlogs on failure

* use lower case platform for LKG toolset

* treat Platform as local to allow override of x86 to win32 for LKG

* define GUID_NULL, publish binlog on binary build failure

* define GUID_NULL another way

* collect binlogs for nuget restores

* fix restore binlog name

* nuget restore with platform for LKG compat, renamed BuildBinaries to BuildFoundation for clarity

* setting platform to win32 has downstream effects - surgically wrapping LKG imports instead

* import MsUCRT x86 targets explicitly

* removed unnecessary LKG targets overrides
* Update LkgToolset.props

Fix build break - custom.props in parent directory

* Update LkgToolset.props
@Scottj1s
Copy link
Member Author

/azp run

Copy link
Member

@DrusTheAxe DrusTheAxe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM modulo comments

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Scottj1s Scottj1s enabled auto-merge (squash) December 13, 2024 22:49
@Scottj1s Scottj1s merged commit 3d7cec3 into release/1.6-stable Dec 14, 2024
26 checks passed
@Scottj1s Scottj1s deleted the user/sjones/cp_lkg_msucrt branch December 14, 2024 00:57
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.

3 participants