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

Fix the condition to exclude only native shared libs #109676

Merged
merged 2 commits into from
Nov 10, 2024

Conversation

am11
Copy link
Member

@am11 am11 commented Nov 9, 2024

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Nov 9, 2024
@am11 am11 requested a review from akoeplinger November 9, 2024 23:01
@dotnet-policy-service dotnet-policy-service bot added the community-contribution Indicates that the PR has been added by a community member label Nov 9, 2024
@am11 am11 added area-Setup and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Nov 9, 2024
@@ -26,7 +26,7 @@
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<File Include="@(LibrariesRuntimeFiles)" TargetPath="framework" />
<!-- exclude shared libs as we only need static ones -->
<LibPackageExcludes Include="framework\%2A%2A\%2A$(LibSuffix)"/>
<LibPackageExcludes Include="framework\%2A%2A\%2ANative$(LibSuffix)"/>
Copy link
Member

Choose a reason for hiding this comment

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

going to merge this to unblock the build but I think checking IsNative would be better, like we do here:

<IlcReference Include="@(LibrariesRuntimeFiles)" Condition="'%(Extension)' == '.dll' and '%(LibrariesRuntimeFiles.IsNative)' != 'true'"/>

Copy link
Member Author

Choose a reason for hiding this comment

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

Turned out to be much cleaner #109683

@akoeplinger akoeplinger merged commit 5db0ce0 into dotnet:main Nov 10, 2024
70 checks passed
@am11 am11 deleted the patch-14 branch November 10, 2024 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-Setup community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants