Skip to content

Fix native libs selection in System.IO.Ports package #106231

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
merged 2 commits into from
Aug 12, 2024
Merged

Fix native libs selection in System.IO.Ports package #106231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a1f44
Fix native libs selection in System.IO.Ports package
akoeplinger Aug 10, 2024
bf920ea
Don't hardcode list of supported RIDs
akoeplinger Aug 12, 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
18 changes: 18 additions & 0 deletions src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,30 @@
<PackageReadmeFilePath>$(MSBuildThisFileDirectory)../src/PACKAGE.md</PackageReadmeFilePath>
</PropertyGroup>

<ItemGroup>
<!-- Extract supported RIDs from the .proj file names -->
<RIDSpecificProject Include="$(MSBuildThisFileDirectory)runtime.*.runtime.native.System.IO.Ports.proj" />
<PackageSupportedRID Include="@(RIDSpecificProject->'%(Filename)'->Replace('.runtime.native.System.IO.Ports', '')->Replace('runtime.', ''))" />
Copy link
Member

@ericstj ericstj Aug 12, 2024

Choose a reason for hiding this comment

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

Clever way of finding the full set of RIDs. I was going to suggest regex property function - but this is fine and concise.


<!-- We need to add a placeholder file for all RIDs except the one that is actually included in the RID-specific package.
This prevents an issue where during publish the SDK would select e.g. both linux-x64 and linux-musl-x64 assets because of the fallback path in the RID graph. -->
<PackagePlaceholderRID Include="@(PackageSupportedRID)" Exclude="$(OutputRID)" />
</ItemGroup>

<ItemGroup>
<None Include="$(NativeBinDir)$(LibPrefix)System.IO.Ports.Native$(LibSuffix)"
PackagePath="runtimes/$(OutputRID)/native"
Pack="true" />
<None Include="$(PlaceholderFile)"
PackagePath="@(PackagePlaceholderRID->'runtimes/%(Identity)/native')"
Pack="true" />
</ItemGroup>

<Target Name="ValidatePackageSupportedRID" BeforeTargets="Build">
<Error Text="$(OutputRID) is missing from PackageSupportedRID."
Condition="!@(PackageSupportedRID->AnyHaveMetadataValue('Identity', '$(OutputRID)'))" />
</Target>

<Target Name="AddRuntimeSpecificNativeSymbolToPackage">
<ItemGroup>
<TfmSpecificDebugSymbolsFile Include="$(NativeBinDir)$(LibPrefix)System.IO.Ports.Native$(LibSuffix)$(SymbolsSuffix)"
Expand Down