Skip to content

Fix the condition to exclude only native shared libs #109676

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.

Sign up for GitHub

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

Merged
akoeplinger merged 2 commits into from
Nov 10, 2024
+1 −1
Merged

Fix the condition to exclude only native shared libs #109676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3457e
Fix the condition to exclude only native shared libs
am11 Nov 9, 2024
fafda21
Update Microsoft.DotNet.ILCompiler.pkgproj
am11 Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy Markdown
Member

@akoeplinger akoeplinger Nov 10, 2024

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:

runtime/src/tests/tracing/eventcounter/runtimecounters.csproj

Line 26 in d820873

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

Copy link
Copy Markdown
Member Author

@am11 am11 Nov 10, 2024

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


<File Include="$(CoreCLRILCompilerDir)*" TargetPath="tools" />
<File Include="$(CoreCLRAotSdkDir)*" TargetPath="sdk" />
Expand Down