Skip to content
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.

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

Fix duplicated assets in official build #89188

Merged
merged 1 commit into from
Jul 19, 2023

Conversation

akoeplinger
Copy link
Member

The additional osx-x64 and osx-arm64 legs added for NativeAOT in #89018 caused the runtime.osx-*.Microsoft.DotNet.ILCompiler and runtime.osx-*.runtime.native.System.IO.Ports` packages to be duplicated.

This change makes sure we only publish them from one leg (the CoreCLR one).

The additional osx-x64 and osx-arm64 legs added for NativeAOT in dotnet#89018 caused the `runtime.osx-*.Microsoft.DotNet.ILCompiler` and runtime.osx-*.runtime.native.System.IO.Ports` packages to be duplicated.

This change makes sure we only publish them from one leg (the CoreCLR one).
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 19, 2023
@akoeplinger akoeplinger added area-Infrastructure-libraries and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 19, 2023
@akoeplinger
Copy link
Member Author

/backport to release/8.0-preview7

@github-actions
Copy link
Contributor

Started backporting to release/8.0-preview7: https://github.com/dotnet/runtime/actions/runs/5601208211

@@ -1,9 +1,9 @@
<Project>
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />

<ItemGroup>
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
Copy link
Member

Choose a reason for hiding this comment

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

I'm not exactly sure what the intention of that property was initially. Suppress both the meta package and the RID specific package? If yes, then the change looks good.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, we don't need these packages when building the runtime packs.

@akoeplinger akoeplinger merged commit 9343b2f into dotnet:main Jul 19, 2023
166 of 170 checks passed
@akoeplinger akoeplinger deleted the fix-official-build branch July 19, 2023 20:52
@ghost ghost locked as resolved and limited conversation to collaborators Aug 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants