Include STL/CRT libs and headers with LKG to eliminate yvals_core.h static_assert build errors on mismatch #4933
Conversation
This file contains 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
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Scottj1s
changed the title
Scottj1s
commented
Dec 6, 2024
Comment on lines
+11
to
+20
| <!-- The LKG toolset only supports Platform=win32. To work around, we TreatAsLocalProperty=Platform above to | ||
| enable overriding the global (command-line) Platform, explicitly import LKG's custom.props, and restore Platform. --> | ||
| <PropertyGroup Condition="'$(Platform)'=='x86'"> | ||
| <WorkaroundLkgWin32>true</WorkaroundLkgWin32> | ||
| <Platform>Win32</Platform> | ||
| </PropertyGroup> | ||
| <Import Project="custom.props" Condition="Exists('custom.props') and '$(WorkaroundLkgWin32)'=='true'" /> | ||
| <PropertyGroup Condition="'$(WorkaroundLkgWin32)'=='true'"> | ||
| <Platform>x86</Platform> | ||
| </PropertyGroup> |
There was a problem hiding this comment.
Scottj1s
commented
Dec 6, 2024
| { | ||
| if ($AzureBuildStep -ne "all") | ||
| { | ||
| $env:NUGET_RESTORE_MSBUILD_ARGS = "/binaryLogger:BuildOutput\binlogs\$Label.restore.$Platform.$Configuration.binlog /p:Platform=$Platform /p:Configuration=$Configuration" |
There was a problem hiding this comment.
Scottj1s
requested review from
kythant,
alexlamtest and
JesseCol
and removed request for
kythant and
alexlamtest
kythant
approved these changes
Dec 6, 2024
Scottj1s
commented
Dec 6, 2024
Comment on lines
+7
to
+8
| <UseInternalMSUniCrtPackage>true</UseInternalMSUniCrtPackage> | ||
| <UndockedSettingsLoaded>true</UndockedSettingsLoaded> |
There was a problem hiding this comment.
the MsUCRT package requires explicit acknowledgement (opt in, on top of the yml task properties)
Scottj1s
commented
Dec 6, 2024
Comment on lines
+24
to
+26
| includeUCRT: true | ||
| ucrtFeedPat: $(System.AccessToken) | ||
| platform: $(buildPlatform) |
There was a problem hiding this comment.
this is the essential change - include the UCRT (STL/CRT libs/headers) along with the tools
JesseCol
approved these changes
Dec 6, 2024
alexlamtest
reviewed
Dec 6, 2024
godlytalias
pushed a commit
that referenced
this pull request
Dec 13, 2024
…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
Scottj1s
added a commit
that referenced
this pull request
Dec 13, 2024
…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
Scottj1s
added a commit
that referenced
this pull request
Dec 14, 2024
* Include STL/CRT libs and headers with LKG to eliminate yvals_core.h static_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 * Find custom.props in parent dir (#4946) * Update LkgToolset.props Fix build break - custom.props in parent directory * Update LkgToolset.props
codendone
pushed a commit
that referenced
this pull request
Jan 10, 2025
…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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When PR pipeline build agents take a Visual Studio update, the STL/CRT headers can become out of sync with the LKG toolset, causing this build error:
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.42.34433\include\yvals_core.h(902,1): Error C2338: static_assert failed: 'error STL1001: Unexpected compiler version, expected MSVC 19.41 or newer.'
This PR:
Verified that all DLLs in transport package are still Hybrid CRT linked