Skip to content

Commit

Permalink
Fix duplicated assets in official build
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
akoeplinger authored and github-actions committed Jul 19, 2023
1 parent 9a66c8e commit cec38a8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extends:
- linux_bionic_arm64
- linux_bionic_x64
jobParameters:
buildArgs: -s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs -c $(_BuildConfig) /p:BuildNativeAOTRuntimePack=true
buildArgs: -s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs -c $(_BuildConfig) /p:BuildNativeAOTRuntimePack=true /p:SkipLibrariesNativeRuntimePackages=true
nameSuffix: AllSubsets_NativeAOT
isOfficialBuild: ${{ variables.isOfficialBuild }}
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
Expand Down
4 changes: 2 additions & 2 deletions src/installer/pkg/projects/nativeaot-packages.proj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />

<ItemGroup>
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
<Project Include="Microsoft.DotNet.ILCompiler\Microsoft.DotNet.ILCompiler.pkgproj" />
<ProjectReference Condition="'$(BuildNativeAOTRuntimePack)' != 'true'" Include="@(Project)" />
<ProjectReference Include="@(Project)" />
<ProjectReference Include="@(Project)" AdditionalProperties="PackageTargetRuntime=$(OutputRID)" />
</ItemGroup>

Expand Down

0 comments on commit cec38a8

Please sign in to comment.