Skip to content

Fix the condition to exclude only native shared libs#109676

Merged
akoeplinger merged 2 commits intodotnet:mainfrom
am11:patch-14
Nov 10, 2024
Merged

Fix the condition to exclude only native shared libs#109676
akoeplinger merged 2 commits intodotnet:mainfrom
am11:patch-14

Conversation

@am11
Copy link
Copy Markdown
Member

@am11 am11 commented Nov 9, 2024

@ghost ghost 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
<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
Copy Markdown
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
Copy Markdown
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
@am11 am11 deleted the patch-14 branch November 10, 2024 11:45
mikelle-rogers pushed a commit to mikelle-rogers/runtime that referenced this pull request Dec 10, 2024
* Fix the condition to exclude only native shared libs

* Update Microsoft.DotNet.ILCompiler.pkgproj
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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