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.

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

Find custom.props in parent dir #4946

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Find custom.props in parent dir #4946

merged 2 commits into from
Dec 10, 2024

Conversation

Scottj1s
Copy link
Member

@Scottj1s Scottj1s commented Dec 9, 2024

Fix build break - custom.props in parent directory

A microsoft employee must use /azp run to validate using the pipelines below.

WARNING:
Comments made by azure-pipelines bot maybe inaccurate.
Please see pipeline link to verify that the build is being ran.

For status checks on the main branch, please use TransportPackage-Foundation-PR
(https://microsoft.visualstudio.com/ProjectReunion/_build?definitionId=81063&_a=summary)
and run the build against your PR branch with the default parameters.

Fix build break - custom.props in parent directory
@Scottj1s
Copy link
Member Author

Scottj1s commented Dec 9, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Scottj1s
Copy link
Member Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Scottj1s Scottj1s enabled auto-merge (squash) December 10, 2024 00:12
@Scottj1s Scottj1s merged commit ff735c5 into main Dec 10, 2024
26 checks passed
@Scottj1s Scottj1s deleted the user/sjones/custom_props branch December 10, 2024 02:08
godlytalias pushed a commit that referenced this pull request Dec 13, 2024
* Update LkgToolset.props

Fix build break - custom.props in parent directory

* Update LkgToolset.props
Scottj1s added a commit that referenced this pull request Dec 13, 2024
* Update LkgToolset.props

Fix build break - custom.props in parent directory

* Update LkgToolset.props
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
* Update LkgToolset.props

Fix build break - custom.props in parent directory

* Update LkgToolset.props
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