Skip to content

Commit

Permalink
Build rid specific pkgs under condition and -s390x (#56906)
Browse files Browse the repository at this point in the history
Build rid specific packages under libraries only when targeting the
primary runtime flavor to avoid duplicate packages being published.

Remove the runtime.native.System.IO.Ports s390x variant as that one
isn't built in official builds and causes the restore of the
meta package runtime.native.System.IO.Ports to fail because of its
missing dependency.
  • Loading branch information
ViktorHofer authored Aug 5, 2021
1 parent 1a4675d commit e9268fb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.

This file was deleted.

10 changes: 6 additions & 4 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
</ItemGroup>

<ItemGroup>
<!-- Build the identity package in the allconfigurations build. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<!-- Build the runtime specific package matching the current RID, outside of an allconfigurations build. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRid).*.proj" Condition="'$(BuildAllConfigurations)' != 'true'" />
<!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" />
<!-- During an official Build, build the rid specific package matching the OutputRid only outside of an allconfigurations build and only when targeting the CoreCLR runtime.
The limitation on the CoreCLR runtime is entirely artificial but avoids duplicate assets being publish. -->
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRid).*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or
('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down

0 comments on commit e9268fb

Please sign in to comment.