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

Sync eng/native from dotnet/runtime #4178

Merged
merged 6 commits into from
Aug 24, 2023
Merged

Conversation

am11
Copy link
Member

@am11 am11 commented Aug 22, 2023

@am11
Copy link
Member Author

am11 commented Aug 22, 2023

cc @elinor-fung, @jkoritzinsky last sync was 56d6c65 (in the future, we can start moving more common parts upstream for complete de-duplication)

eng/InstallRuntimes.proj Outdated Show resolved Hide resolved
@am11 am11 force-pushed the feature/native/build branch from 86d30ba to d1d6522 Compare August 23, 2023 00:42
@am11 am11 marked this pull request as ready for review August 23, 2023 00:42
@am11 am11 requested a review from a team as a code owner August 23, 2023 00:42
@am11
Copy link
Member Author

am11 commented Aug 23, 2023

@mikem8361, PTAL. Once we sync PAL with runtime, we can revert the last commit (1fb94fc). The checks which were there to support printf were deleted after the removal of PAL's printf implementation in runtime. Other than that, eng/native is in sync. 🙏

<SOSPath>$(InstallDir)/libsosplugin.so</SOSPath>
</Option>
<Option Condition="$(OS) == OSX">
<Option Condition="'$(OS)' == 'osx'">
Copy link
Member

Choose a reason for hiding this comment

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

This isn't msbuild, though the parser should handle it OK

@mikem8361 mikem8361 merged commit c1cbf66 into dotnet:main Aug 24, 2023
@am11 am11 deleted the feature/native/build branch August 24, 2023 21:22
@github-actions github-actions bot locked and limited conversation to collaborators Jan 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants