Fix native libs selection in System.IO.Ports package #106231
Conversation
The runtime.native.System.IO.Ports package depends on all the RID-specific packages, this causes an issue when publishing for a RID like `linux-musl-x64` since the RID graph has a fallback path of `linux-musl-x64 -> linux-x64 -> linux` so the SDK would select the native libs from _both_ the `runtime.linux-musl-x64.runtime.native.System.IO.Ports` and `runtime.linux-x64.runtime.native.System.IO.Ports` packages which causes a conflict. To fix this we add `_._` placeholder entries for all RIDs except the one where we have a native asset so the SDK ignores the non-matching ones. Fixes dotnet#104710
|
cc @wfurt |
| <PackageSupportedRID Include="android-arm" /> | ||
| <PackageSupportedRID Include="android-arm64" /> | ||
| <PackageSupportedRID Include="android-x64" /> | ||
| <PackageSupportedRID Include="android-x86" /> | ||
| <PackageSupportedRID Include="linux-arm" /> | ||
| <PackageSupportedRID Include="linux-arm64" /> | ||
| <PackageSupportedRID Include="linux-bionic-arm64" /> | ||
| <PackageSupportedRID Include="linux-bionic-x64" /> | ||
| <PackageSupportedRID Include="linux-musl-arm" /> | ||
| <PackageSupportedRID Include="linux-musl-arm64" /> | ||
| <PackageSupportedRID Include="linux-musl-x64" /> | ||
| <PackageSupportedRID Include="linux-x64" /> | ||
| <PackageSupportedRID Include="maccatalyst-arm64" /> | ||
| <PackageSupportedRID Include="maccatalyst-x64" /> | ||
| <PackageSupportedRID Include="osx-arm64" /> | ||
| <PackageSupportedRID Include="osx-x64" /> |
There was a problem hiding this comment.
I would like @ericstj to comment on this PR (as I'm currently out). IMO it would be better to not rely on a static list here as that requires more things to touch when adding a new runtime RID package.
From a given RID it should be possible to get the parent RIDs either via an SDK task or via a custom msbuild task.
There was a problem hiding this comment.
We'd need the other way round, going from parent RID to child RIDs since we need to include those in the parent-RID-package. I'm not sure that will be easier. I can try basing it off of the runtime.<RID>.runtime.native.System.IO.Ports.proj files though.
| <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.', ''))" /> |
There was a problem hiding this comment.
Clever way of finding the full set of RIDs. I was going to suggest regex property function - but this is fine and concise.
The runtime.native.System.IO.Ports package depends on all the RID-specific packages, this causes an issue when publishing for a RID like
linux-musl-x64since the RID graph has a fallback path oflinux-musl-x64 -> linux-x64 -> linuxso the SDK would select the native libs from both theruntime.linux-musl-x64.runtime.native.System.IO.Portsandruntime.linux-x64.runtime.native.System.IO.Portspackages which causes a conflict.To fix this we add
_._placeholder entries for all RIDs except the one where we have a native asset so the SDK ignores the non-matching ones.Fixes #104710